Interaktywne błędy, gdy nie udało się wczytać HTML'a.

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

diff --git a/project/templates/explorer/editor.html b/project/templates/explorer/editor.html
index 85808f2..3c775d4 100644 (file)
--- a/project/templates/explorer/editor.html
+++ b/project/templates/explorer/editor.html
@@ -13,6 +13,7 @@
        {# Libraries #}
     <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>
        {# Libraries #}
     <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.json.js" type="text/javascript" charset="utf-8"></script>

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


@@ -58,12 +59,12 @@
                 
                <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>


@@ -122,8 +123,9 @@
                                <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) { %>

-                                               <button type="button" class="buttontoolbarview-button" 
-                                                    title="<%= buttons[i].buttons[j].key %>"
+                                               <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 %>
                                                     ui:hotkey_mod="<%= buttons[i].buttons[j].key_mod %>"
                                                     ui:groupindex="<%= i %>" ui:buttonindex="<%= j %>">
                                                        <%= buttons[i].buttons[j].label %>


@@ -140,7 +142,11 @@
 {% block breadcrumbs %}<a href="{% url file_list %}">Platforma Redakcyjna</a> &gt; {{ fileid }}{% endblock breadcrumbs %}
 
 {% block header-toolbar %}
 {% block breadcrumbs %}<a href="{% url file_list %}">Platforma Redakcyjna</a> &gt; {{ fileid }}{% endblock breadcrumbs %}
 
 {% 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 %}
 
 {% block maincontent %}
 {% endblock %}
 
 {% block maincontent %}


@@ -157,8 +163,7 @@
             <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="{{REDMINE_URL}}/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>


@@ -186,5 +191,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