Reverted CM to version 0.63 with 2 patches:

[redakcja.git] / project / templates / explorer / editor.html

diff --git a/project/templates/explorer/editor.html b/project/templates/explorer/editor.html
index 40b5f7a..85808f2 100644 (file)
--- a/project/templates/explorer/editor.html
+++ b/project/templates/explorer/editor.html
@@ -14,7 +14,7 @@
     <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>
        {# Scriptlets #}
     <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>
        {# 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 +35,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,6 +52,10 @@
        </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>
        </script>
                <div class="htmlview">
                </div>
        </script>


@@ -109,7 +114,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 +122,12 @@
                                <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].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>


@@ -136,19 +144,21 @@
 {% endblock %}
 
 {% block maincontent %}
 {% 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>
+    <p style="display: none;" id="api-base-url">{% url document_list_view %}</p>
+    <p style="display: none;" id="api-toolbar-url">{% url toolbar_buttons %}</p>

 
 

+    <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>                
             <fieldset id="commit-dialog-related-issues" 
             <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}}">
+                      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>