Merge branch 'issp-switch-postboard' of github.com:slr/twister-html into slr-issp-switch-postboard

Conflicts:
	js/interface_home.js

js/interface_common.js

@@ -1271,7 +1271,9 @@ function changeStyle() {
     {
         style = 'css/style.css';
         profile = 'css/profile.css';
+        $.getScript('theme_original/js/theme_option.js');
     }
+
     $('#stylecss').attr('href', style);
     $('#profilecss').attr('href', profile);
     $("<style type='text/css'> .selectable_theme:not(.theme_" + theme + ")" +

js/interface_home.js

@@ -16,31 +16,12 @@ var InterfaceFunctions = function()
         $( ".wrapper .postboard-news").click(function() {
             requestTimelineUpdate("latest",postsPerRefresh,followingUsers,promotedPostsOnly);});
 
-
-        /*$( ".promoted-posts-only").click(function() {
-            promotedPostsOnly = !promotedPostsOnly;
-            $(this).text( promotedPostsOnly ? "Switch to Normal posts" : "Switch to Promoted posts" );
-            timelineChangedUser();
-            $.MAL.getStreamPostsParent().empty();
-            requestTimelineUpdate("latestFirstTime",postsPerRefresh,followingUsers,promotedPostsOnly);
-            });*/
-
-
         // Add refresh posts for home link in menu
         $( ".userMenu-home.current a").click(function() {
             requestTimelineUpdate("latest",postsPerRefresh,followingUsers,promotedPostsOnly);});
 
-        // modified the way promoted posts are shown
         $( ".promoted-posts-only").click(function() {
             promotedPostsOnly = !promotedPostsOnly;
-            //active promoted posts tab
-            $(this).children('.promoted-posts').addClass(promotedPostsOnly ? "active" : "disabled");
-            $(this).children('.normal-posts').addClass(promotedPostsOnly ? "disabled" : "active");
-            $('#postboard-top').removeClass(promotedPostsOnly ? "show" : "hide");
-            //active normal posts
-            $(this).children('.promoted-posts').removeClass(promotedPostsOnly ? "disabled" : "active");
-            $(this).children('.normal-posts').removeClass(promotedPostsOnly ? "active" : "disabled");
-            $('#postboard-top').addClass(promotedPostsOnly ? "hide" : "show");
 
             timelineChangedUser();
             $.MAL.getStreamPostsParent().empty();

theme_nin/js/theme_option.js

@@ -1,21 +1,33 @@
 $(function(){ 
     
-	$('#closeModal').html('');
+    $('#closeModal').html('');
     $('.profile-card-main').attr('style', '');
     $('img[src$="img/tornado_avatar.png"]').attr("src","theme_nin/img/tornado_avatar.png");
     $('.userMenu-search-profiles button').html('').attr('title',polyglot.t('Follow'));
     $('.mini-profile-actions span').html('');
 
-	$('.post-context').each(function(){
+    $('.post-context').each(function(){
-    	$(this).prependTo($(this).parent());
+        $(this).prependTo($(this).parent());
-	});
+    });
 
 
-	$( '.userMenu-home.current a' ).on( 'click', function() { 
+    $( '.userMenu-home.current a' ).on( 'click', function() { 
         $('html, body').animate({scrollTop:0},300);
         return false
     });
 
+    $( ".promoted-posts-only").click(function() {
+    // modify the way promoted posts are shown
+        //active promoted posts tab
+        $(this).children('.promoted-posts').addClass(promotedPostsOnly ? "active" : "disabled");
+        $(this).children('.normal-posts').addClass(promotedPostsOnly ? "disabled" : "active");
+        $('#postboard-top').removeClass(promotedPostsOnly ? "show" : "hide");
+        //active normal posts
+        $(this).children('.promoted-posts').removeClass(promotedPostsOnly ? "disabled" : "active");
+        $(this).children('.normal-posts').removeClass(promotedPostsOnly ? "active" : "disabled");
+        $('#postboard-top').addClass(promotedPostsOnly ? "hide" : "show");
+    });
+
     $(window).scroll(function(){
         posScroll = $(document).scrollTop();
         if(posScroll >= 250)

theme_original/js/theme_option.js

@@ -0,0 +1,8 @@
+$(function(){
+
+    $( ".promoted-posts-only").click(function() {
+        $(this).text( promotedPostsOnly ? polyglot.t('Switch to Normal posts') : polyglot.t('Switch to Promoted posts') );
+    });
+
+});
+