From 9f979033640e55e9eaf62d1f1ae8dca634bdd6e2 Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Wed, 29 Sep 2010 14:39:47 +0200 Subject: [PATCH 1/1] vsplitbar fix --- redakcja/static/css/master.css | 2 ++ redakcja/static/js/wiki/loader.js | 16 +++++----------- redakcja/static/js/wiki/view_annotations.js | 3 ++- redakcja/static/js/wiki/view_gallery.js | 1 + redakcja/static/js/wiki/view_search.js | 1 + 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/redakcja/static/css/master.css b/redakcja/static/css/master.css index b71520f4..31277d32 100644 --- a/redakcja/static/css/master.css +++ b/redakcja/static/css/master.css @@ -36,6 +36,8 @@ body { .vsplitbar p { + font: 12px Helvetica,Verdana,sans-serif; + -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 eb535a16..7e03c396 100644 --- 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(); - $(".vsplitbar-title").html("↓ GALLERY ↓"); $('.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'); - if($(".vsplitbar-title").html() == "↓ ZNAJDŹ I ZAMIEѠ↓"){ - $(".vsplitbar-title").html("↑ ZNAJDŹ I ZAMIEŃ ↑"); - } else if($(".vsplitbar-title").html() == "↓ PRZYPISY â†“"){ - $(".vsplitbar-title").html("↑ PRZYPISY ↑"); - } else { - $(".vsplitbar-title").html("↑ GALERIA ↑"); - } + $(".vsplitbar-title").html("↑ " + active_right.vsplitbar + " ↑"); $('#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'); - $(".vsplitbar-title").html("↓ GALLERY ↓"); + $(".vsplitbar-title").html("↓ GALERIA ↓"); } else { - $(".vsplitbar-title").html("↑ GALLERY ↑"); + $(".vsplitbar-title").html("↑ GALERIA ↑"); } 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 3ea3aa1e..72946789 100644 --- 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; + this.vsplitbar = 'PRZYPISY'; options.callback = function(){ var self = this; @@ -102,7 +103,7 @@ $.wiki.Perspective.prototype.onEnter.call(this); $('.vsplitbar').not('.active').trigger('click'); - $(".vsplitbar-title").html("↓ PRZYPISY ↓"); + $(".vsplitbar-title").html("↓ PRZYPISY ↓"); this.refresh(this); diff --git a/redakcja/static/js/wiki/view_gallery.js b/redakcja/static/js/wiki/view_gallery.js index 9630afb5..56faaa10 100644 --- 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; + this.vsplitbar = 'GALERIA'; 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 15f8e2e0..64a35c44 100644 --- 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; + this.vsplitbar = 'ZNAJDŹ I ZAMIEŃ'; options.callback = function(){ var self = this; -- 2.20.1