Ticket 547, gallery sidebar title and styling

diff --git a/apps/wiki/templates/wiki/document_details.html b/apps/wiki/templates/wiki/document_details.html
index 8387a85..71113b1 100644 (file)
--- a/apps/wiki/templates/wiki/document_details.html
+++ b/apps/wiki/templates/wiki/document_details.html
@@ -29,6 +29,7 @@
 
 {% block splitter-extra %}
 <div class="vsplitbar" title="{% trans "Click to open/close gallery" %}">
 
 {% block splitter-extra %}
 <div class="vsplitbar" title="{% trans "Click to open/close gallery" %}">

+    <p class="vsplitbar-title"></p>

     </div>
     <div id="sidebar">
         {% include "wiki/tabs/gallery_view.html" %}
     </div>
     <div id="sidebar">
         {% include "wiki/tabs/gallery_view.html" %}


@@ -39,4 +40,4 @@
 {% block dialogs %}
        {% include "wiki/save_dialog.html" %}
        {% include "wiki/tag_dialog.html" %}
 {% block dialogs %}
        {% include "wiki/save_dialog.html" %}
        {% include "wiki/tag_dialog.html" %}

-{% endblock %}
\ No newline at end of file
+{% endblock %}

diff --git a/redakcja/static/css/master.css b/redakcja/static/css/master.css
index cbfe66a..f6266df 100644 (file)
--- a/redakcja/static/css/master.css
+++ b/redakcja/static/css/master.css
@@ -23,15 +23,27 @@ body {
     bottom: 0;
     right: 0;
     width: 26px;
     bottom: 0;
     right: 0;
     width: 26px;

-    background: #C1C1C1 url(../img/gallery.png) no-repeat scroll center center;
+    /*background: #C1C1C1 url(../img/gallery.png) no-repeat scroll center center;*/

     border-left: 2px solid #999;
     border-right: 2px solid #999;
     border-left: 2px solid #999;
     border-right: 2px solid #999;

-    cursor: pointer;
+    cursor: pointer;  
+    background: #C1C1C1; 

 }
 
 .vsplitbar:hover {
 }
 
 .vsplitbar:hover {

-       background-color: yellow;
-       border-color: orange;
+       background-color: #E6E6E6;
+}
+
+
+.vsplitbar p {
+  -moz-transform: rotate(270deg);
+  -moz-transform-origin: 50% 50%;
+  -webkit-transform: rotate(270deg);
+  -webkit-transform-origin: 50% 50%; 
+  -o-transform: rotate(-270deg);
+  -o-transform-origin:  bottom left;
+  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1);
+  margin: 250px auto;

 }
 
 .editor {
 }
 
 .editor {

diff --git a/redakcja/static/js/wiki/loader.js b/redakcja/static/js/wiki/loader.js
index 4256115..f051511 100644 (file)
--- a/redakcja/static/js/wiki/loader.js
+++ b/redakcja/static/js/wiki/loader.js
@@ -59,6 +59,7 @@ $(function()
                        function() {
                                $.wiki.state.perspectives.ScanGalleryPerspective.show = true;
                                $('#sidebar').show();
                        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();
                                $('.vsplitbar').css('right', 480).addClass('active');
                                $('#editor .editor').css('right', 510);
                                $(window).resize();


@@ -68,15 +69,23 @@ $(function()
                                $.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() == "↓ SEARCH AND REPLACE ↓"){
+                                       $(".vsplitbar-title").html("↑ SEARCH AND REPLACE ↑");        
+                               } else {
+                                   $(".vsplitbar-title").html("↑ GALLERY ↑");
+                               }

                                $('#editor .editor').css('right', 30);
                                $(window).resize();
                                $.wiki.perspectiveForTab('#tabs-right .active').onExit();
                        }
                );
 
                                $('#editor .editor').css('right', 30);
                                $(window).resize();
                                $.wiki.perspectiveForTab('#tabs-right .active').onExit();
                        }
                );
 

-               if($.wiki.state.perspectives.ScanGalleryPerspective.show)
-                       $('.vsplitbar').trigger('click');
-
+               if($.wiki.state.perspectives.ScanGalleryPerspective.show){
+            $('.vsplitbar').trigger('click');
+            $(".vsplitbar-title").html("↓ GALLERY ↓");
+        } else {
+            $(".vsplitbar-title").html("↑ GALLERY ↑");
+        }

         window.onbeforeunload = function(e) {
             if($.wiki.isDirty()) {
                                e.returnValue = "Na stronie mogą być nie zapisane zmiany.";
         window.onbeforeunload = function(e) {
             if($.wiki.isDirty()) {
                                e.returnValue = "Na stronie mogą być nie zapisane zmiany.";

diff --git a/redakcja/static/js/wiki/view_gallery.js b/redakcja/static/js/wiki/view_gallery.js
index ec486bc..4f6b8a1 100644 (file)
--- a/redakcja/static/js/wiki/view_gallery.js
+++ b/redakcja/static/js/wiki/view_gallery.js
@@ -226,7 +226,8 @@
         $.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("↓ GALLERY ↓");        
+        

         this.doc.refreshGallery({
             success: function(doc, data){
                 self.$image.show();
         this.doc.refreshGallery({
             success: function(doc, data){
                 self.$image.show();

diff --git a/redakcja/static/js/wiki/view_search.js b/redakcja/static/js/wiki/view_search.js
index 740c913..789a961 100644 (file)
--- a/redakcja/static/js/wiki/view_search.js
+++ b/redakcja/static/js/wiki/view_search.js
@@ -99,6 +99,8 @@
         self.$searchCursor = null;
 
         $('.vsplitbar').not('.active').trigger('click');
         self.$searchCursor = null;
 
         $('.vsplitbar').not('.active').trigger('click');

+        $(".vsplitbar-title").html("↓ SEARCH AND REPLACE ↓");        
+        

         if ($.wiki.activePerspective() != 'CodeMirrorPerspective')
             $.wiki.switchToTab('#CodeMirrorPerspective');
     };
         if ($.wiki.activePerspective() != 'CodeMirrorPerspective')
             $.wiki.switchToTab('#CodeMirrorPerspective');
     };


@@ -109,4 +111,4 @@
 
     $.wiki.SearchPerspective = SearchPerspective;
 
 
     $.wiki.SearchPerspective = SearchPerspective;
 

-})(jQuery);
\ No newline at end of file
+})(jQuery);