fnp / redakcja.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge branch 'master' of stigma:platforma
[redakcja.git] / project / templates / explorer / editor.html
diff --git a/project/templates/explorer/editor.html b/project/templates/explorer/editor.html
index 40b5f7a..576a793 100644 (file)
--- a/project/templates/explorer/editor.html
+++ b/project/templates/explorer/editor.html
@@ -7,14 +7,23 @@
         <link rel="stylesheet" href="{{STATIC_URL}}css/autumn.css" type="text/css" media="screen" title="Autumn colors" charset="utf-8">
        
        <script type="text/javascript" charset="utf-8">
         <link rel="stylesheet" href="{{STATIC_URL}}css/autumn.css" type="text/css" media="screen" title="Autumn colors" charset="utf-8">
        
        <script type="text/javascript" charset="utf-8">
-               var fileId = '{{ fileid }}';
+            var documentInfo = {
+                docID: '{{ fileid }}',
+                userID: '{{ euser }}',
+                docURL: '{% url document_view fileid %}{% if euser %}?user={{ euser|urlencode }}{% endif %}',
+                toolbarURL: '{% url toolbar_buttons %}',
+                renderURL: '{% url api.views.render %}'
+            }          
+                
        </script>
        
        {# Libraries #}
        </script>
        
        {# Libraries #}
-    <script src="{{STATIC_URL}}js/lib/codemirror/codemirror.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.modal.js" type="text/javascript" charset="utf-8"></script>
        <script src="{{STATIC_URL}}js/lib/jquery.modal.js" type="text/javascript" charset="utf-8"></script>
+        <script src="{{STATIC_URL}}js/lib/jquery.json.js" type="text/javascript" charset="utf-8"></script>
+        
        {# Scriptlets #}
        {# Scriptlets #}
-       <script src="http://localhost:8000/api/toolbar/scriptlets" type="text/javascript" charset="utf-8"></script>
+       <script src="{{STATIC_URL}}js/button_scripts.js" type="text/javascript" charset="utf-8"></script>
        
        {# App and views #}
        <script src="{{STATIC_URL}}js/app.js" type="text/javascript" charset="utf-8"></script>
        
        {# App and views #}
        <script src="{{STATIC_URL}}js/app.js" type="text/javascript" charset="utf-8"></script>
@@ -35,6 +44,7 @@
        <script type="text/html" charset="utf-8" id="panel-container-view-template">
                <div class="panel-main-toolbar">
                 <p><select>
        <script type="text/html" charset="utf-8" id="panel-container-view-template">
                <div class="panel-main-toolbar">
                 <p><select>
+                        <option value="empty" selected="selected"> ---- </option>
                        <% for (panel in panels) { %>
                        <option value="<%= panel %>"><%= panel %></option>
                        <% }; %>
                        <% for (panel in panels) { %>
                        <option value="<%= panel %>"><%= panel %></option>
                        <% }; %>
@@ -51,14 +61,18 @@
        </script>
        
        <script type="text/html" charset="utf-8" id="html-view-template">
        </script>
        
        <script type="text/html" charset="utf-8" id="html-view-template">
+                <div class="htmlview-toolbar">
+                    <a class="html-print-link" href="print" ui:baseref="{% url file_print fileid %}" target="_new">Wersja do druku</a>
+                </div>
+                
                <div class="htmlview">
                </div>
                <div class="htmlview">
                </div>
-       </script>
+       </script>       
 
        <script type="text/html" charset="utf-8" id="flash-view-template">
                <div class="flashview">
                <% if (shownMessage) { %>
 
        <script type="text/html" charset="utf-8" id="flash-view-template">
                <div class="flashview">
                <% if (shownMessage) { %>
-                       <p style="margin: 0; padding: 0.2em 0.5em; line-height: 1.8em; background-color: yellow" class="<%= shownMessage.type %>"><%= shownMessage.text %></p>
+                       <p style="margin: 0; padding: 0.2em 0.5em; line-height: 1.8em" class="<%= shownMessage.type %>"><%= shownMessage.text %></p>
                <% } %>
                </div>
        </script>
                <% } %>
                </div>
        </script>
@@ -109,7 +123,7 @@
                <div class="buttontoolbarview panel-toolbar">
                        <div class="buttontoolbarview-tabs toolbar-tabs-container toolbar-buttons-container">
                        <% for (var i=0; i < buttons.length; i++) { %>
                <div class="buttontoolbarview panel-toolbar">
                        <div class="buttontoolbarview-tabs toolbar-tabs-container toolbar-buttons-container">
                        <% for (var i=0; i < buttons.length; i++) { %>
-                               <a href="#" class="buttontoolbarview-tab" ui:groupindex="<%= i %>"><%= buttons[i].name %></a>
+                               <button type="button" class="buttontoolbarview-tab" ui:groupindex="<%= i %>"><%= buttons[i].name %></button>
                        <% }; %>
                        </div>
                        <div class="buttontoolbarview-groups ">
                        <% }; %>
                        </div>
                        <div class="buttontoolbarview-groups ">
@@ -117,9 +131,13 @@
                                <div class="buttontoolbarview-group toolbar-buttons-container" ui:groupIndex="<%= i %>" style="display: none">
                                        <% for (var j=0; j < buttons[i].buttons.length; j++) { %>
                                                <% if (buttons[i].buttons[j].scriptlet_id) { %>
                                <div class="buttontoolbarview-group toolbar-buttons-container" ui:groupIndex="<%= i %>" style="display: none">
                                        <% for (var j=0; j < buttons[i].buttons.length; j++) { %>
                                                <% if (buttons[i].buttons[j].scriptlet_id) { %>
-                                               <a href="#" class="buttontoolbarview-button" ui:groupindex="<%= i %>" ui:buttonindex="<%= j %>">
+                                               <button type="button" class="buttontoolbarview-button"
+                                                    title="<%= buttons[i].buttons[j].tooltip %>"
+                                                    hotkey="<%= buttons[i].buttons[j].key %>"
+                                                    ui:hotkey_mod="<%= buttons[i].buttons[j].key_mod %>"
+                                                    ui:groupindex="<%= i %>" ui:buttonindex="<%= j %>">
                                                        <%= buttons[i].buttons[j].label %>
                                                        <%= buttons[i].buttons[j].label %>
-                                               </a>
+                                               </button>
                                                <% } %>
                                        <% } %>
                                </div>
                                                <% } %>
                                        <% } %>
                                </div>
@@ -129,26 +147,30 @@
        </script>
 {% endblock extrahead %}
 
        </script>
 {% endblock extrahead %}
 
-{% block breadcrumbs %}<a href="{% url file_list %}">Platforma Redakcyjna</a> &gt; {{ fileid }}{% endblock breadcrumbs %}
+{% block breadcrumbs %}<a href="{% url file_list %}">Platforma</a> &gt; {{euser}} &gt; {{ fileid }}{% endblock breadcrumbs %}
 
 {% block header-toolbar %}
 
 {% block header-toolbar %}
-       <button id="action-merge">Merge</button> <button id="action-update">Update</button> <button id="action-commit">Commit</button> <button id="action-quick-save">Quick Save</button>
+    <a href="http://stigma.nowoczesnapolska.org.pl/platforma-hg/ksiazki/log/tip/{{ fileid }}.xml" target="_new" >Historia</a>
+       <button id="action-merge">Merge</button>
+        <button id="action-update">Update</button>
+        <button id="action-commit">Commit</button>
+        <button id="action-quick-save">Quick Save</button>
 {% endblock %}
 
 {% endblock %}
 
-{% block maincontent %}
-       <div id="splitview">
-               <div id="left-panel-container" class='panel-container'></div>
-           <div id="right-panel-container" class='panel-container'></div>
-    </div>
+{% block maincontent %}    
+    
 
 
+    <div id="splitview">
+        <div id="left-panel-container" class='panel-container'></div>
+       <div id="right-panel-container" class='panel-container'></div>
+    </div>
 
     <div id="commit-dialog" class="jqmWindow" style="display:none">
 
     <div id="commit-dialog" class="jqmWindow" style="display:none">
-        <form action="{% url file_commit fileid %}" method="POST">
+        <form action="" method="POST">
             <label for="message">Commit message:</label>
             <textarea cols="60" rows="10" name="message" id="commit-dialog-message"></textarea>
             <p id="commit-dialog-error-empty-message">Wiadomość nie może być pusta.</p>                
             <label for="message">Commit message:</label>
             <textarea cols="60" rows="10" name="message" id="commit-dialog-message"></textarea>
             <p id="commit-dialog-error-empty-message">Wiadomość nie może być pusta.</p>                
-            <fieldset id="commit-dialog-related-issues" 
-                      ui:ajax-src="http://localhost:3000/publications/issues/{{fileid}}">
+            <fieldset id="commit-dialog-related-issues" ui:ajax-src="{{REDMINE_URL}}/publications/issues/{{fileid}}">
                 <legend>Related issues</legend>
                 <div class="loading-box" style="display: none;">
                     <p>Loading related issues...</p>
                 <legend>Related issues</legend>
                 <div class="loading-box" style="display: none;">
                     <p>Loading related issues...</p>
@@ -176,5 +198,5 @@
 {% endblock maincontent %}
 
 {% block extrabody %}
 {% endblock maincontent %}
 
 {% block extrabody %}
-       <div style="position: absolute; left: 35%; right: 35%; top: 0; height: 20px; z-index: 1000" id="flashview"></div>
+       <div style="position: absolute; left: 35%; right: 35%; top: 0; height: 20px; z-index: 0" id="flashview"></div>
 {% endblock %}
\ No newline at end of file
 {% endblock %}
\ No newline at end of file