X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/b0773e2054ab6bc6305142fdd28799e0f41616c9..39f73cadff6a44915f4c59985076be1acda652ed:/project/templates/explorer/editor.html?ds=sidebyside diff --git a/project/templates/explorer/editor.html b/project/templates/explorer/editor.html index 23641f9f..b338e6d3 100644 --- a/project/templates/explorer/editor.html +++ b/project/templates/explorer/editor.html @@ -1,8 +1,10 @@ {% extends "base.html" %} {% block extrahead %} - <link rel="stylesheet" href="{{STATIC_URL}}css/jquery.modal.css" type="text/css" media="screen" title="no title" charset="utf-8"> - <link rel="stylesheet" href="{{STATIC_URL}}css/html.css" type="text/css" media="screen" title="no title" charset="utf-8"> + <link rel="stylesheet" href="{{STATIC_URL}}css/jquery.modal.css" type="text/css" media="screen" charset="utf-8"> + <link rel="stylesheet" href="{{STATIC_URL}}css/html.css" type="text/css" charset="utf-8"> + <link rel="stylesheet" href="{{STATIC_URL}}css/toolbar.css" type="text/css" 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 }}'; @@ -11,8 +13,9 @@ {# 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="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> @@ -31,11 +34,14 @@ {# JavaScript templates #} <script type="text/html" charset="utf-8" id="panel-container-view-template"> - <select> + <div class="panel-main-toolbar"> + <p><select> + <option value="empty" selected="selected"> ---- </option> <% for (panel in panels) { %> <option value="<%= panel %>"><%= panel %></option> <% }; %> - </select> + </select> <button class="refresh">OdÅwież panel</button></p> + </div> <div class="content-view"></div> </script> @@ -47,12 +53,16 @@ </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> + </script> <script type="text/html" charset="utf-8" id="flash-view-template"> - <div class="flashview" style="position: relative; margin-left: auto; margin-right: auto; width: 400px; background-color: yellow"> + <div class="flashview"> <% if (shownMessage) { %> <p style="margin: 0; padding: 0.2em 0.5em; line-height: 1.8em" class="<%= shownMessage.type %>"><%= shownMessage.text %></p> <% } %> @@ -64,28 +74,37 @@ <div class="image-gallery-header"> <p> - <button type="button" class="image-gallery-prev-button">Previous</button> + <button type="button" class="image-gallery-prev-button"> + <img alt="PPrevious" src="{{STATIC_URL}}/icons/go-previous.png" width="16" height="16" /> + </button> + <input type="input" class="image-gallery-current-page" - size="6" - value="<%= (currentPage + 1) %>" /> - <button type="button" class="image-gallery-jump-button">Go</button> - <button type="button" class="image-gallery-next-button">Next</button> + size="5" value="<%= (currentPage + 1) %>" /> - <button type="button" class="image-gallery-zoom-in">+</button> - <select class="image-gallery-current-zoom"> - <option>50%</option> - <option selected="selected">100%</option> - <option>150%</option> - <option>200%</option> - </select> - <button type="button" class="image-gallery-zoom-out">-</button> + + <button type="button" class="image-gallery-next-button"> + <img alt="Next" src="{{STATIC_URL}}/icons/go-next.png" width="16" height="16" /> + </button> + + <button type="button" class="image-gallery-zoom-in"> + <img alt="Zoom in" src="{{STATIC_URL}}/icons/zoom_in.png" width="16" height="16" /> + </button> + <button type="button" class="image-gallery-zoom-out"> + <img alt="Zoom out" src="{{STATIC_URL}}/icons/zoom_out.png" width="16" height="16" /> + </button> + <button type="button" class="image-gallery-zoom-reset"> + <img alt="Zoom reset" src="{{STATIC_URL}}/icons/zoom.png" width="16" height="16" /> + </button> </p> </div> <div class="image-gallery-page-list"> <% for(var i=0; i < model.data.length; i++) { %> - <div class="image-gallery-page-container" ui:model="<%= model.data[i] %>"> - </div> + <div class="image-gallery-page-container" + ui:model="<%= model.data[i] %>" + ui:width="480" + ui:height="752" + ></div> <% }; %> </div> @@ -93,20 +112,23 @@ </script> <script type="text/html" charset="utf-8" id="button-toolbar-view-template"> - <div class="buttontoolbarview"> - <div class="buttontoolbarview-tabs"> + <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 class="buttontoolbarview-groups "> <% for (var i=0; i < buttons.length; i++) { %> - <div class="buttontoolbarview-group" ui:groupIndex="<%= i %>" style="display: none"> + <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 %> - </a> + </button> <% } %> <% } %> </div> @@ -118,38 +140,29 @@ {% block breadcrumbs %}<a href="{% url file_list %}">Platforma Redakcyjna</a> > {{ fileid }}{% endblock breadcrumbs %} -{% block message-box %} - <div class="msg-info" id="save-waiting"><p>ZapisujÄ dane na serwerze.</p><p class="data"></p></div> - <div class="msg-success" id="save-successful"><p>Zapisano :)</p><p class="data"></p></div> - <div class="msg-warning" id="save-warn"><p>Zapisano. Uwagi: (</p><p class="data"></p></div> - <div class="msg-error" id="save-error"><p>BÅÄ d przy zapisie.</p> <p class="data"></p></div> - - <div class="msg-success" id="generic-yes"><p class="data"></p></div> - <div class="msg-info" id="generic-info"><p class="data"></p></div> - <div class="msg-error" id="generic-error"><p class="data"></p></div> - - <div class="msg-warning" id="not-implemented"><p>Tej funkcji jeszcze nie ma :(</p><p class="data"></p></div> - -{% endblock %} - {% 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 %} - <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"> - <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" - 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> @@ -177,5 +190,5 @@ {% endblock maincontent %} {% block extrabody %} - <div style="position: absolute; left: 0; right: 0; 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