Poprawienie wyglądu tytułu dokumentu w document_details.html.

[redakcja.git] / platforma / templates / wiki / document_details.html

diff --git a/platforma/templates/wiki/document_details.html b/platforma/templates/wiki/document_details.html
index e4c69ed..64fc89a 100644 (file)
--- a/platforma/templates/wiki/document_details.html
+++ b/platforma/templates/wiki/document_details.html
@@ -1,21 +1,28 @@
 {% extends "base.html" %}
 {% extends "base.html" %}

+{% load toolbar_tags %}

 
 {% block extrahead %}
 
 {% block extrahead %}

+    <link rel="stylesheet" href="{{STATIC_URL}}css/html.css" type="text/css" media="screen" charset="utf-8">

     <script src="{{STATIC_URL}}js/lib/codemirror/codemirror.js" type="text/javascript" charset="utf-8"></script>
     <script src="{{STATIC_URL}}js/lib/jquery.splitter.js" type="text/javascript" charset="utf-8"></script>
     <script src="{{STATIC_URL}}js/lib/jquery.form.js" type="text/javascript" charset="utf-8"></script>
     <script src="{{STATIC_URL}}js/lib/codemirror/codemirror.js" type="text/javascript" charset="utf-8"></script>
     <script src="{{STATIC_URL}}js/lib/jquery.splitter.js" type="text/javascript" charset="utf-8"></script>
     <script src="{{STATIC_URL}}js/lib/jquery.form.js" type="text/javascript" charset="utf-8"></script>

+    <script src="{{STATIC_URL}}js/button_scripts.js" type="text/javascript" charset="utf-8"></script>

     <script type="text/javascript" charset="utf-8">
     
         function serialize(element) {
     <script type="text/javascript" charset="utf-8">
     
         function serialize(element) {

-            if (element.nodeType == 3) {
+            if (element.nodeType == 3) { // tekst

                 return [$.trim(element.nodeValue)];
                 return [$.trim(element.nodeValue)];

+            } else if (element.nodeType != 1) { // pomijamy węzły nie będące elementami XML ani tekstem
+                return [];

             }
             
             var result = [];
             }
             
             var result = [];

+            var hasContent = false;

             
             result.push('<');
             result.push(element.tagName);
             
             
             result.push('<');
             result.push(element.tagName);
             

+            // Mozilla nie uważa deklaracji namespace za atrybuty

             var ns = element.tagName.indexOf(':');
             if (ns != -1 && $.browser.mozilla) {
                 result.push(' xmlns:');
             var ns = element.tagName.indexOf(':');
             if (ns != -1 && $.browser.mozilla) {
                 result.push(' xmlns:');


@@ -33,21 +40,25 @@
                     result.push('="');
                     result.push(attr.value);
                     result.push('"');
                     result.push('="');
                     result.push(attr.value);
                     result.push('"');

+                    hasContent = true;

                 }
             }
             
                 }
             }
             

-            result.push('>');
+            if (element.childNodes.length == 0) {
+                result.push(' />');
+            } else {
+                result.push('>');

     
     

-            for (var i=0; i < element.childNodes.length; i++) {
-                var child = element.childNodes[i];
-                result = result.concat(serialize(child));
-            }
-    
-            result.push('</');
-            result.push(element.tagName);
-            result.push('>');
+                for (var i=0; i < element.childNodes.length; i++) {
+                    result = result.concat(serialize(element.childNodes[i]));
+                }

     
     

-            if (element.tagName == 'akap') {
+                result.push('</');
+                result.push(element.tagName);
+                result.push('>');
+            }
+            
+            if (element.tagName == 'akap' || element.tagName == 'akap_dialog' || element.tagName == 'akap_cd') {

                 result.push('\n\n\n');
             } else if (element.tagName == 'rdf:RDF') {
                 result.push('\n\n\n\n\n');
                 result.push('\n\n\n');
             } else if (element.tagName == 'rdf:RDF') {
                 result.push('\n\n\n\n\n');


@@ -146,6 +157,7 @@
                         doc = serializer.serializeToString($('#simple-editor div').get(0))
                         doc = parser.parseFromString(doc, 'text/xml');
                         console.log('xml',doc, doc.documentElement);
                         doc = serializer.serializeToString($('#simple-editor div').get(0))
                         doc = parser.parseFromString(doc, 'text/xml');
                         console.log('xml',doc, doc.documentElement);

+                        // TODO: Sprawdzenie błędów

                         doc = xsl.transformToDocument(doc);
                         console.log('after transform', doc, doc.documentElement);
                         doc = serialize(doc.documentElement).join('');
                         doc = xsl.transformToDocument(doc);
                         console.log('after transform', doc, doc.documentElement);
                         doc = serialize(doc.documentElement).join('');


@@ -166,6 +178,9 @@
             });
             
             $('#simple-view-tab').click(function() {
             });
             
             $('#simple-view-tab').click(function() {

+                if ($(this).hasClass('active')) {
+                    return;
+                }

                 $(this).addClass('active');
                 $('#source-view-tab').removeClass('active');
                 $('#source-editor').hide();
                 $(this).addClass('active');
                 $('#source-view-tab').removeClass('active');
                 $('#source-editor').hide();


@@ -174,12 +189,30 @@
             });
             
             $('#source-view-tab').click(function() {
             });
             
             $('#source-view-tab').click(function() {

+                if ($(this).hasClass('active')) {
+                    return;
+                }

                 $(this).addClass('active');
                 $('#simple-view-tab').removeClass('active');
                 $('#simple-editor').hide();
                 $('#source-editor').show();
                 reverseTransform();
             });
                 $(this).addClass('active');
                 $('#simple-view-tab').removeClass('active');
                 $('#simple-editor').hide();
                 $('#source-editor').show();
                 reverseTransform();
             });

+            
+            $('.toolbar button').click(function(event) {
+                event.preventDefault();
+                var params = eval("(" + $(this).attr('ui:action-params') + ")");
+                scriptletCenter.scriptlets[$(this).attr('ui:action')](editor, params);
+            });
+            
+            $('.toolbar select').change(function() {
+                var slug = $(this).val();
+                
+                $('.toolbar-buttons-container').hide().filter('[data-group=' + slug + ']').show();
+            });
+            
+            $('.toolbar-buttons-container').hide();
+            $('.toolbar select').change();

         });
     </script>
     
         });
     </script>
     


@@ -189,6 +222,7 @@
             margin: 0;
             overflow: hidden;
             padding: 0;
             margin: 0;
             overflow: hidden;
             padding: 0;

+            min-width: 960px;

         }
         
         .vsplitbar {
         }
         
         .vsplitbar {


@@ -209,7 +243,7 @@
         
         #sidebar {
             overflow: auto;
         
         #sidebar {
             overflow: auto;

-            padding: 5px;
+/*            padding: 5px; */

         }
         
         #header {
         }
         
         #header {


@@ -229,6 +263,7 @@
             float: left;
             padding: 3px 6px 2px 6px;
             color: #222;
             float: left;
             padding: 3px 6px 2px 6px;
             color: #222;

+            line-height: 20px;

         }
         
         #tabs {
         }
         
         #tabs {


@@ -262,11 +297,55 @@
         }
         
         #tabs li.active {
         }
         
         #tabs li.active {

-            background-color: #FFF;
+            background-color: #FEFCDF;

             background-image: none;
 /*            background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0.25, #C1C1C1), to(#FFFFFF));            */
             background-image: none;
 /*            background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0.25, #C1C1C1), to(#FFFFFF));            */

-            border-bottom: 1px solid #FFF;
+            border-bottom: 1px solid #FEFCDF;
+        }
+        
+        .toolbar {
+            border-bottom: 1px solid #777;
+            background-color: #FEFCDF;
+            margin: 0;
+            padding: 2px;
+        }
+        
+        .toolbar select {
+            float: left;
+            margin: 2px 5px 2px 0;
+            background: none;
+            border: 1px solid #999;
+            padding: 1px;
+        }
+        
+        .toolbar button {
+            display: block;
+            float: left;
+            margin: 4px 0 2px 0;
+            padding: 0 5px 2px 5px;
+            border: none;
+            background: none;

         }
         }

+        
+        .toolbar-end {
+            clear: both;
+        }
+        
+        .toolbar button:hover, .toolbar button:active {
+            background: #A2A2A2;
+            color: #FFF;
+            -webkit-border-radius: 10px;
+            -moz-border-radius: 10px;
+            border-radius: 10px;
+        }
+        
+        /* Remove extra padding in Firefox */
+        button::-moz-focus-inner { 
+            border: 0;
+            padding: 0;
+        }
+        
+        p { margin: 0;}

     </style>
 {% endblock %}
 
     </style>
 {% endblock %}
 


@@ -284,13 +363,14 @@
         <div id="splitter">
             <div id="editor">
                 <div id="source-editor">
         <div id="splitter">
             <div id="editor">
                 <div id="source-editor">

+                    {% toolbar %}

                     {{ form.text }}
                     <input type="hidden" name="name" value="{{ document.name }}" />
                     <input type="hidden" name="author" value="annonymous" />
                     <input type="hidden" name="comment" value="no comment" />
                     <input type="hidden" name="revision" value="{{ document.revision }}" />
                 </div>
                     {{ form.text }}
                     <input type="hidden" name="name" value="{{ document.name }}" />
                     <input type="hidden" name="author" value="annonymous" />
                     <input type="hidden" name="comment" value="no comment" />
                     <input type="hidden" name="revision" value="{{ document.revision }}" />
                 </div>

-                <div id="simple-editor" style="display: none">
+                <div id="simple-editor" class="htmlview" style="display: none">

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