Dodanie toolbara do panelu xmleditor.

diff --git a/project/static/css/master.css b/project/static/css/master.css
index 7fa5dda..8b97114 100644 (file)
--- a/project/static/css/master.css
+++ b/project/static/css/master.css
@@ -129,3 +129,79 @@ label {
     overflow-y: scroll;
 }
 
     overflow-y: scroll;
 }
 

+
+/* ==================== */
+/* = XML Editor panel = */
+/* ==================== */
+
+#toolbar {
+    height: 48px;
+    overflow: hidden;
+}
+
+#toolbar, #toolbar ol, #sidebar-toolbar, #sidebar-toolbar ol {
+/*    overflow: hidden;*/
+    display: block;
+    margin: 0;
+    padding: 0;
+    background-color: #CCC;
+    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;
+    float: left;
+    margin: 4px 0 -1px 4px;
+    padding: 2px 10px 0 10px;
+    background-color: #CCC;
+    border: 1px solid #AAA;
+    border-radius-topleft: 8px;
+    border-radius-topright: 8px;
+    -moz-border-radius-topleft: 8px;
+    -moz-border-radius-topright: 8px;
+    -webkit-border-top-left-radius: 8px;
+    -webkit-border-top-right-radius: 8px;
+}
+
+#sidebar-tabs, #toolbar-tabs {
+    height: 21px;
+    z-index: 1000;
+/*    overflow: hidden;*/
+}
+
+#sidebar-tabs li:hover, #sidebar-tabs li.active, #toolbar-tabs li:hover, #toolbar-tabs li.active {
+    cursor: default;
+    background-color: #EEE;
+    border-bottom: 1px solid #EEE;
+}
+
+#toolbar-buttons {
+    background-color: #EEE;
+    border-bottom: 1px solid #AAA;
+}
+
+#toolbar-buttons li {
+    display: block;
+    font-size: 12px;
+    padding: 1px 8px;
+    margin: 4px;
+    border-radius: 10px;
+    -moz-border-radius: 10px;
+    -webkit-border-radius: 8px;
+    float: left;
+}
+
+#toolbar-buttons li:hover {
+    background-color: #777;
+    color: #FFF;
+    cursor: default;
+}

diff --git a/project/templates/explorer/file_xml.html b/project/templates/explorer/file_xml.html
index dfbbc56..093e304 100644 (file)
--- a/project/templates/explorer/file_xml.html
+++ b/project/templates/explorer/file_xml.html
@@ -1,5 +1,4 @@
 {% extends "base.html" %}
 {% extends "base.html" %}

-{% load toolbar_tags %}

 
 {% block extrahead %}
     <script src="/static/js/jquery.lazyload.js" type="text/javascript" charset="utf-8"></script>
 
 {% block extrahead %}
     <script src="/static/js/jquery.lazyload.js" type="text/javascript" charset="utf-8"></script>


@@ -43,28 +42,7 @@
                     </div>
                     <div id="right-panel-contents" class="panel-contents">
                     </div>
                     </div>
                     <div id="right-panel-contents" class="panel-contents">
                     </div>

-                    {#  #}

                 </div>
             </div>
                 </div>
             </div>

-                        {#  #}
-                        {#     <div id="toggle-sidebar" style="float: right"></div> #}
-                        {#     <div id="whatever"> #}
-                        {#         <div id="sidebar-toolbar"> #}
-                        {#             <ol id="sidebar-tabs"> #}
-                        {#                 <li>Tab</li> #}
-                        {#                 <li>Tab 2</li> #}
-                        {#             </ol> #}
-                        {#         </div> #}
-                        {#         <div id="images-wrap"> #}
-                        {#  #}
-                        {#             <div style="clear: both; height: 0; width: 0">&nbsp;</div> #}
-                        {#             <div id="images"> #}
-                        {#                 <p>Aby zobaczyć obrazki wybierz folder poniżej:</p> #}
-                        {#                 <p>{{ image_folders_form.folders }}</p> #}
-                        {#             </div> #}
-                        {#         </div> #}
-                        {#     </div> #}
-                        {# </div> #}
-                        {# {% toolbar %} #}

         </div>
 {% endblock maincontent %}    
         </div>
 {% endblock maincontent %}    

diff --git a/project/templates/explorer/panels/xmleditor.html b/project/templates/explorer/panels/xmleditor.html
index f8d3fef..ef5976c 100644 (file)
--- a/project/templates/explorer/panels/xmleditor.html
+++ b/project/templates/explorer/panels/xmleditor.html
@@ -1,4 +1,7 @@
+{% load toolbar_tags %}
+

 <div class="panel">
 <div class="panel">

+    {% toolbar %}

     <textarea name="text" width="480px">{{ text }}</textarea>
 </div>
 <script type="text/javascript" charset="utf-8">
     <textarea name="text" width="480px">{{ text }}</textarea>
 </div>
 <script type="text/javascript" charset="utf-8">