fnp / redakcja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3ca842c)
vsplitbar fix
authorRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Wed, 29 Sep 2010 12:39:47 +0000 (14:39 +0200)
committerRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Wed, 29 Sep 2010 12:39:47 +0000 (14:39 +0200)
redakcja/static/css/master.css patch | blob | history
redakcja/static/js/wiki/loader.js patch | blob | history
redakcja/static/js/wiki/view_annotations.js patch | blob | history
redakcja/static/js/wiki/view_gallery.js patch | blob | history
redakcja/static/js/wiki/view_search.js patch | blob | history

diff --git a/redakcja/static/css/master.css b/redakcja/static/css/master.css
index b71520f..31277d3 100644 (file)
--- a/redakcja/static/css/master.css
+++ b/redakcja/static/css/master.css
@@ -36,6 +36,8 @@ body {
 
 
 .vsplitbar p {
 
 
 .vsplitbar p {
+    font: 12px Helvetica,Verdana,sans-serif;
+
   -moz-transform: rotate(270deg);
   -moz-transform-origin: 50% 50%;
   -webkit-transform: rotate(270deg);
   -moz-transform: rotate(270deg);
   -moz-transform-origin: 50% 50%;
   -webkit-transform: rotate(270deg);
diff --git a/redakcja/static/js/wiki/loader.js b/redakcja/static/js/wiki/loader.js
index eb535a1..7e03c39 100644 (file)
--- a/redakcja/static/js/wiki/loader.js
+++ b/redakcja/static/js/wiki/loader.js
@@ -59,34 +59,28 @@ $(function()
                        function() {
                                $.wiki.state.perspectives.ScanGalleryPerspective.show = true;
                                $('#sidebar').show();
                        function() {
                                $.wiki.state.perspectives.ScanGalleryPerspective.show = true;
                                $('#sidebar').show();
-                               $(".vsplitbar-title").html("&darr;&nbsp;GALLERY&nbsp;&darr;");
                                $('.vsplitbar').css('right', 480).addClass('active');
                                $('#editor .editor').css('right', 510);
                                $(window).resize();
                                $.wiki.perspectiveForTab('#tabs-right .active').onEnter();
                        },
                        function() {
                                $('.vsplitbar').css('right', 480).addClass('active');
                                $('#editor .editor').css('right', 510);
                                $(window).resize();
                                $.wiki.perspectiveForTab('#tabs-right .active').onEnter();
                        },
                        function() {
+                           var active_right = $.wiki.perspectiveForTab('#tabs-right .active');
                                $.wiki.state.perspectives.ScanGalleryPerspective.show = false;
                                $('#sidebar').hide();
                                $('.vsplitbar').css('right', 0).removeClass('active');
                                $.wiki.state.perspectives.ScanGalleryPerspective.show = false;
                                $('#sidebar').hide();
                                $('.vsplitbar').css('right', 0).removeClass('active');
-                               if($(".vsplitbar-title").html() == "↓&nbsp;ZNAJDŹ&nbsp;I&nbsp;ZAMIEŃ&nbsp;↓"){
-                                       $(".vsplitbar-title").html("&uarr;&nbsp;ZNAJDŹ&nbsp;I&nbsp;ZAMIEŃ&nbsp;&uarr;");        
-                               } else if($(".vsplitbar-title").html() == "↓&nbsp;PRZYPISY&nbsp;↓"){
-                        $(".vsplitbar-title").html("&uarr;&nbsp;PRZYPISY&nbsp;&uarr;");        
-                } else {
-                                   $(".vsplitbar-title").html("&uarr;&nbsp;GALERIA&nbsp;&uarr;");
-                               }
+                               $(".vsplitbar-title").html("&uarr;&nbsp;" + active_right.vsplitbar + "&nbsp;&uarr;");
                                $('#editor .editor').css('right', 30);
                                $(window).resize();
                                $('#editor .editor').css('right', 30);
                                $(window).resize();
-                               $.wiki.perspectiveForTab('#tabs-right .active').onExit();
+                               active_right.onExit();
                        }
                );
 
                if($.wiki.state.perspectives.ScanGalleryPerspective.show){
             $('.vsplitbar').trigger('click');
                        }
                );
 
                if($.wiki.state.perspectives.ScanGalleryPerspective.show){
             $('.vsplitbar').trigger('click');
-            $(".vsplitbar-title").html("&darr;&nbsp;GALLERY&nbsp;&darr;");
+            $(".vsplitbar-title").html("&darr;&nbsp;GALERIA&nbsp;&darr;");
         } else {
         } else {
-            $(".vsplitbar-title").html("&uarr;&nbsp;GALLERY&nbsp;&uarr;");
+            $(".vsplitbar-title").html("&uarr;&nbsp;GALERIA&nbsp;&uarr;");
         }
         window.onbeforeunload = function(e) {
             if($.wiki.isDirty()) {
         }
         window.onbeforeunload = function(e) {
             if($.wiki.isDirty()) {
diff --git a/redakcja/static/js/wiki/view_annotations.js b/redakcja/static/js/wiki/view_annotations.js
index 3ea3aa1..7294678 100644 (file)
--- a/redakcja/static/js/wiki/view_annotations.js
+++ b/redakcja/static/js/wiki/view_annotations.js
@@ -7,6 +7,7 @@
         var old_callback = options.callback || function() { };
 
         this.noupdate_hash_onenter = true;
         var old_callback = options.callback || function() { };
 
         this.noupdate_hash_onenter = true;
+        this.vsplitbar = 'PRZYPISY';
 
         options.callback = function(){
             var self = this;
 
         options.callback = function(){
             var self = this;
@@ -102,7 +103,7 @@
         $.wiki.Perspective.prototype.onEnter.call(this);
 
         $('.vsplitbar').not('.active').trigger('click');
         $.wiki.Perspective.prototype.onEnter.call(this);
 
         $('.vsplitbar').not('.active').trigger('click');
-        $(".vsplitbar-title").html("&darr;&nbsp;PRZYPISY&nbsp;&darr;");        
+        $(".vsplitbar-title").html("&darr;&nbsp;PRZYPISY&nbsp;&darr;");
 
         this.refresh(this);
 
 
         this.refresh(this);
 
diff --git a/redakcja/static/js/wiki/view_gallery.js b/redakcja/static/js/wiki/view_gallery.js
index 9630afb..56faaa1 100644 (file)
--- a/redakcja/static/js/wiki/view_gallery.js
+++ b/redakcja/static/js/wiki/view_gallery.js
@@ -45,6 +45,7 @@
         var old_callback = options.callback || function() { };
 
                this.noupdate_hash_onenter = true;
         var old_callback = options.callback || function() { };
 
                this.noupdate_hash_onenter = true;
+        this.vsplitbar = 'GALERIA';
 
         options.callback = function(){
             var self = this;
 
         options.callback = function(){
             var self = this;
diff --git a/redakcja/static/js/wiki/view_search.js b/redakcja/static/js/wiki/view_search.js
index 15f8e2e..64a35c4 100644 (file)
--- a/redakcja/static/js/wiki/view_search.js
+++ b/redakcja/static/js/wiki/view_search.js
@@ -7,6 +7,7 @@
         var old_callback = options.callback || function() { };
 
         this.noupdate_hash_onenter = true;
         var old_callback = options.callback || function() { };
 
         this.noupdate_hash_onenter = true;
+        this.vsplitbar = 'ZNAJDŹ&nbsp;I&nbsp;ZAMIEŃ';
 
         options.callback = function(){
             var self = this;
 
         options.callback = function(){
             var self = this;