Merge branch 'master' of git@stigma.nowoczesnapolska.org.pl:platforma

diff --git a/apps/toolbar/templates/toolbar/toolbar.html b/apps/toolbar/templates/toolbar/toolbar.html
index dcc64a9..c508929 100644 (file)
--- a/apps/toolbar/templates/toolbar/toolbar.html
+++ b/apps/toolbar/templates/toolbar/toolbar.html
@@ -10,7 +10,7 @@
         {% for group in groups %}
         <ol id="{{ group.slug }}" {% if not forloop.first %}style="display:none"{% endif %}>
             {% for button in group.button_set.all %}
-            <li p:tag="{{ button.tag }}" {% if button.key %}p:key="{{ button.key|keycode }}" title="Ctrl+{{ button.key }}"{% endif %}>{{ button.label }}</li>
+            <li p:tag="{{ button.tag }}" {% if button.key %}p:key="{{ button.key|keycode }}" title="Alt+{{ button.key|upper }}"{% endif %}>{{ button.label }}</li>
             {% endfor %}
         </ol>
         {% endfor %}

diff --git a/project/static/css/master.css b/project/static/css/master.css
index 1efa2d6..1a726a8 100644 (file)
--- a/project/static/css/master.css
+++ b/project/static/css/master.css
@@ -5,7 +5,7 @@ body {
 }
 
 #breadcrumbs {
-    padding: 5px 10px;
+    padding: 2px 10px;
     background-color: #CDCDCD;
     border-bottom: 1px solid #858585;
 }
@@ -133,32 +133,28 @@ p {
     border-top: 1px solid #DDD;
 }
 
-#toolbar, #toolbar ol {
-    display: block;
-    margin: 0;
-    padding: 0;
-    background-color: #CCC;
-    border-top: 1px solid #AAA;
-}
-
 #toolbar {
+    height: 48px;
     overflow: hidden;
-    width: 400%;
 }
 
-#sidebar-toolbar, #sidebar-toolbar ol {
-    overflow: hidden;
+#toolbar, #toolbar ol, #sidebar-toolbar, #sidebar-toolbar ol {
+/*    overflow: hidden;*/
     display: block;
     margin: 0;
     padding: 0;
     background-color: #CCC;
-    border-bottom: 1px solid #AAA;
+    border-top: 1px solid #AAA;
 }
 
 #sidebar-toolbar {
     width: 0;
 }
 
+#sidebar-toolbar, #sidebar-toolbar ol {
+    overflow: hidden;
+}
+
 #sidebar-tabs li, #toolbar-tabs li {
     font-size: 14px;
     display: block;

diff --git a/project/templates/explorer/file_xml.html b/project/templates/explorer/file_xml.html
index 54583e5..53d536a 100644 (file)
--- a/project/templates/explorer/file_xml.html
+++ b/project/templates/explorer/file_xml.html
@@ -17,9 +17,9 @@
             
             function resizePanels() {
                 $('iframe').width($(window).width() - $('#sidebar').outerWidth());
-                $('iframe').height($(window).height() - $('#breadcrumbs').height() - $('toolbar').height());
-                $('#toggle-sidebar').height($(window).height() - $('#breadcrumbs').height());
-                $('#images-wrap').height($(window).height() - $('#breadcrumbs').height() - $('#sidebar-toolbar').height())
+                $('iframe').height($(window).height() - $('iframe').position().top);
+                $('#toggle-sidebar').height($(window).height() - $('#toggle-sidebar').position().top);
+                $('#images-wrap').height($(window).height() - $('#images-wrap').position().top);
                 $('#images-wrap, #sidebar-toolbar').width($('#sidebar').width() - 10);
             }
             
@@ -75,7 +75,7 @@
                             keys[event.keyCode]();
                         }
                     }, function(event) {
-                        return event.ctrlKey && keys[event.keyCode];
+                        return event.altKey && keys[event.keyCode];
                     });
 
                     $('#sidebar').bind('resizable:resize', resizePanels)
@@ -129,14 +129,14 @@
             <textarea id="id_text" name="text" width="480px">{{ form.text.field.initial }}</textarea>
         </div>
         
-        <div id="status-bar">
-            {{ form.user.errors }} {{ form.commit_message.errors }}
-            <p>
-                Użytkownik: {{ form.user }}
-                Opis zmian: {{ form.commit_message }}
-                <input type="submit" value="Zapisz"/>
-                <a href="#" class="toggleAutoscroll" style="float: right">Nie synchronizuj przewijania</a>
-            </p>
-        </div>
+        {# <div id="status-bar"> #}
+        {#     {{ form.user.errors }} {{ form.commit_message.errors }} #}
+        {#     <p> #}
+        {#         Użytkownik: {{ form.user }} #}
+        {#         Opis zmian: {{ form.commit_message }} #}
+        {#         <input type="submit" value="Zapisz"/> #}
+        {#         <a href="#" class="toggleAutoscroll" style="float: right">Nie synchronizuj przewijania</a> #}
+        {#     </p> #}
+        {# </div> #}
     </form>
 {% endblock maincontent %}