Dodanie toolbara dla galerii

diff --git a/platforma/static/css/html.css b/platforma/static/css/html.css
index 3c168c1..cbf1874 100755 (executable)
--- a/platforma/static/css/html.css
+++ b/platforma/static/css/html.css
@@ -523,4 +523,5 @@
 .out-of-flow-text {
     border: 1px solid #C8B849;
     background-color: #D4CB9C;
 .out-of-flow-text {
     border: 1px solid #C8B849;
     background-color: #D4CB9C;

+    white-space: pre;

 }
\ No newline at end of file
 }
\ No newline at end of file

diff --git a/platforma/static/css/master.css b/platforma/static/css/master.css
index e3d0b9c..d7b6dc0 100755 (executable)
--- a/platforma/static/css/master.css
+++ b/platforma/static/css/master.css
@@ -28,7 +28,7 @@ body {
 #html-view {
     overflow: auto;
     position: absolute;
 #html-view {
     overflow: auto;
     position: absolute;

-    top: 27px;
+    top: 26px;

     bottom: 0;
     left: 0;
     right: 0;
     bottom: 0;
     left: 0;
     right: 0;


@@ -107,14 +107,6 @@ body {
 /*    height: 22px;*/
 }
 
 /*    height: 22px;*/
 }
 

-.toolbar select {
-    float: left;
-    margin: 2px 5px 2px 0;
-    background: none;
-    border: 1px solid #999;
-    padding: 1px;
-}
-

 .toolbar button {
     display: block;
     float: left;
 .toolbar button {
     display: block;
     float: left;


@@ -124,6 +116,20 @@ body {
     background: none;
 }
 
     background: none;
 }
 

+.toolbar select {
+    float: left;
+    margin: 1px 5px 1px 0;
+    background: none;
+    border: 1px solid #999;
+    padding: 1px;
+}
+
+.toolbar input {
+    font-size: 11px;
+    padding: 0;
+    margin: 2px 5px 0 5px;
+}
+

 .toolbar-end {
     clear: both;
 }
 .toolbar-end {
     clear: both;
 }

diff --git a/platforma/templates/wiki/document_details.html b/platforma/templates/wiki/document_details.html
index 742566d..139ade5 100644 (file)
--- a/platforma/templates/wiki/document_details.html
+++ b/platforma/templates/wiki/document_details.html
@@ -42,6 +42,11 @@
             </div>
             <div class="vsplitbar"> </div>
             <div id="sidebar">
             </div>
             <div class="vsplitbar"> </div>
             <div id="sidebar">

+                <div class="toolbar">
+                    <button>Poprzednia strona</button> <button>Następna strona</button>
+                    <input type="text" size="3" value="01" />
+                    <div class="toolbar-end"> </div>
+                </div>

                 <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
                 <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
             </div>
                 <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
                 <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
             </div>