From f02b9f60518805daed701834903e4f8e82fee778 Mon Sep 17 00:00:00 2001 From: zuber <marek@stepniowski.com> Date: Wed, 20 Jan 2010 18:09:39 +0100 Subject: [PATCH] =?utf8?q?Usuni=C4=99cie=20nieu=C5=BCywanych=20szablon?= =?utf8?q?=C3=B3w.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- platforma/templates/explorer/editor.html | 259 ------------------ platforma/templates/explorer/file_list.html | 43 --- .../templates/explorer/file_tree_part.html | 13 - platforma/templates/explorer/file_upload.html | 17 -- .../templates/explorer/folder_images.html | 3 - platforma/templates/explorer/split.html | 26 -- .../templates/explorer/split_success.html | 3 - platforma/templates/html4print.html | 13 - platforma/templates/manager/pull_request.html | 102 ------- platforma/urls.py | 2 +- 10 files changed, 1 insertion(+), 480 deletions(-) delete mode 100755 platforma/templates/explorer/editor.html delete mode 100644 platforma/templates/explorer/file_list.html delete mode 100644 platforma/templates/explorer/file_tree_part.html delete mode 100755 platforma/templates/explorer/file_upload.html delete mode 100644 platforma/templates/explorer/folder_images.html delete mode 100755 platforma/templates/explorer/split.html delete mode 100755 platforma/templates/explorer/split_success.html delete mode 100644 platforma/templates/html4print.html delete mode 100644 platforma/templates/manager/pull_request.html diff --git a/platforma/templates/explorer/editor.html b/platforma/templates/explorer/editor.html deleted file mode 100755 index a2ec61f4..00000000 --- a/platforma/templates/explorer/editor.html +++ /dev/null @@ -1,259 +0,0 @@ -{% extends "base.html" %} -{% load i18n %} - -{% block extrahead %} - <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 documentInfo = { - docID: '{{ fileid }}', - userID: '{{ euser }}', - docURL: '{% url document_view fileid %}{% if euser %}?user={{ euser|urlencode }}{% endif %}', - toolbarURL: '{% url toolbar_buttons %}', - staticURL: '{{ STATIC_URL }}' - } - - </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> - - {# App and views #} - <script src="{{STATIC_URL}}js/app.js" type="text/javascript" charset="utf-8"></script> - <script src="{{STATIC_URL}}js/messages.js" type="text/javascript" charset="utf-8"></script> - <script src="{{STATIC_URL}}js/views/view.js" type="text/javascript" charset="utf-8"></script> - <script src="{{STATIC_URL}}js/views/flash.js" type="text/javascript" charset="utf-8"></script> - <script src="{{STATIC_URL}}js/views/editor.js" type="text/javascript" charset="utf-8"></script> - <script src="{{STATIC_URL}}js/views/button_toolbar.js" type="text/javascript" charset="utf-8"></script> - <script src="{{STATIC_URL}}js/views/split.js" type="text/javascript" charset="utf-8"></script> - <script src="{{STATIC_URL}}js/views/xml.js" type="text/javascript" charset="utf-8"></script> - <script src="{{STATIC_URL}}js/views/html.js" type="text/javascript" charset="utf-8"></script> - <script src="{{STATIC_URL}}js/views/gallery.js" type="text/javascript" charset="utf-8"></script> - <script src="{{STATIC_URL}}js/views/panel_container.js" type="text/javascript" charset="utf-8"></script> - - <script src="{{STATIC_URL}}js/models.js" type="text/javascript" charset="utf-8"></script> - - {# JavaScript templates #} - <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> - <% }; %> - </select> <button class="refresh">{% trans "Refresh panel" %}</button></p> - </div> - <div class="content-view"></div> - </script> - - <script type="text/html" charset="utf-8" id="xml-view-template"> - <div class="xmlview-toolbar"></div> - <div class="xmlview"> - - </div> - </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">{% trans "Print version" %}</a> - <button class="html-add-theme" type="button">Oznacz fragment motywem</button> - <button class="html-add-annotation" type="button">Dodaj przypis</button> - </div> - - <div class="htmlview"> - </div> - </script> - - <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" class="<%= shownMessage.type %>"><%= shownMessage.text %></p> - <% } %> - </div> - </script> - - <script type="text/html" charset="utf-8" id="image-gallery-view-template"> - <div class="image-gallery-view-template"> - - <div class="image-gallery-header"> - <p> - <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="5" value="<%= (currentPage + 1) %>" /> - - - <button type="button" class="image-gallery-next-button"> - <img alt="{% trans 'Next page' %}" src="{{STATIC_URL}}/icons/go-next.png" width="16" height="16" /> - </button> - - <button type="button" class="image-gallery-zoom-in"> - <img alt="{% trans 'Zoom in' %}" src="{{STATIC_URL}}/icons/zoom_in.png" width="16" height="16" /> - </button> - <button type="button" class="image-gallery-zoom-out"> - <img alt="{% trans 'Zoom out' %}" src="{{STATIC_URL}}/icons/zoom_out.png" width="16" height="16" /> - </button> - <button type="button" class="image-gallery-zoom-reset"> - <img alt="{% trans 'Reset zoom' %}" 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] %>" - ui:width="480" - ui:height="752" - ></div> - <% }; %> - </div> - - </div> - </script> - - <script type="text/html" charset="utf-8" id="image-gallery-empty-template"> - <div class="image-gallery-empty-template"> - <div class="empty-gallery-info">Galeria dla tego dokumentu nie istnieje i/lub jest pusta.</div> - - {% if user.is_superuser %} - <div class="choose-gallery"> - <p>DoÅÄ cz galeriÄ do dokumentu:</p> - <p>{{ gallery_form.subpath }} <input class="choose-gallery-button" type="submit" value="DoÅÄ cz"></p> - </div> - {% endif %} - </div> - </script> - - <script type="text/html" charset="utf-8" id="button-toolbar-view-template"> - <div class="buttontoolbarview panel-toolbar"> - <div class="buttontoolbarview-tabs toolbar-tabs-container toolbar-buttons-container"> - <% for (var i=0; i < buttons.length; i++) { %> - <button type="button" class="buttontoolbarview-tab" ui:groupindex="<%= i %>"><%= buttons[i].name %></button> - <% }; %> - </div> - <div class="buttontoolbarview-groups "> - <% for (var i=0; i < buttons.length; i++) { %> - <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].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 %> - </button> - <% } %> - <% } %> - </div> - <% }; %> - </div> - </div> - </script> -{% endblock extrahead %} - -{% block breadcrumbs %}<a href="{% url file_list %}">Platforma</a> > {{euser}} > {{ fileid }}{% endblock breadcrumbs %} - -{% block header-toolbar %} - <a href="http://stigma.nowoczesnapolska.org.pl/platforma-hg/ksiazki/log/tip/{{ fileid }}.xml" target="_new" >{% trans 'History' %}</a> - <button id="action-merge">{% trans 'Push' %}</button> - <button id="action-update">{% trans 'Pull' %}</button> - <button id="action-commit">{% trans 'Save' %}</button> - <button id="action-quick-save">{% trans '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> - - <div id="commit-dialog" class="jqmWindow" style="display:none"> - <form action="" method="POST"> - <label for="message">Commit message:</label> - - <textarea cols="60" rows="10" name="message" class="commit-message"></textarea> - <div class="error-messages-box"> </div> - - <fieldset class="related-issues-fields" > - <legend>Related issues</legend> - <div class="loading-box" style="display: none;"> - <p>Loading related issues...</p> - </div> - <div class="container-box">No related issues.</div> - </fieldset> - <p> - <input type="button" value="Save" class="save-button" /> - <input type="button" value="Cancel" class="cancel-button" /> - </p> - </form> - </div> - - <div id="theme-edit-dialog" class="jqmWindow" style="display:none"> - <div class="data-area"> - <table class="theme-multi-list"> - <tbody class="unknown-themes"> - <tr class="header"><th colspan="5">Unknown themes</th></tr> - </tbody> - - <tbody> - <tr><th colspan="5">Themes in the database</th></tr> - {% regroup available_themes by first_letter as grouped_themes %} - - {% for letter in grouped_themes %} - <tr><th colspan="5" class="letter-heading">{{ letter.grouper }}</th></tr> - - {% for theme in letter.list %} - {% if forloop.first %} - <tr> - {% else %} - {% if forloop.counter0|divisibleby:"5" %} - </tr><tr> - {% endif %} - {% endif %} - <td width="18%"><label><input class="theme-list-item" type="checkbox" value="{{theme.name}}"/>{{ theme.name }}</label></td> - {% if forloop.last %} - </tr> - {% endif %} - {% endfor %} - - {% endfor %} - </tbody> - </table> - </div> - <p class="action-area"> - <input type="button" value="Accept" class="save-button" /> - <input type="button" value="Cancel" class="cancel-button" /> - <span class="error-messages-inline-box"></span> - </p> - </div> - - <div id="split-dialog" class="jqmWindow" style="display:none"> - <div class="container-box"> </div> - <div class="loading-box" style="display: none;"> - <p>Loading dialog contents...</p> - <!-- <p><button type="button" class="dialog-close-button">Close</button></p> --> - </div> - <div class="fatal-error-box" style="display: none;"> - <p>Server error, while loading dialog :(</p> - <p><button type="button" class="dialog-close-button">Close</button></p> - </div> - </div> -{% endblock maincontent %} - -{% block extrabody %} - <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 diff --git a/platforma/templates/explorer/file_list.html b/platforma/templates/explorer/file_list.html deleted file mode 100644 index 5bc53e87..00000000 --- a/platforma/templates/explorer/file_list.html +++ /dev/null @@ -1,43 +0,0 @@ -{% extends "base.html" %} - -{% block extrahead %} -<link rel="stylesheet" href="{{ STATIC_URL }}css/filelist.css" type="text/css" /> -<script src="{{ STATIC_URL }}js/slugify.js" type="text/javascript" charset="utf-8"></script> -<script type="text/javascript" charset="utf-8"> -$(function() { - function search(event) { - event.preventDefault(); - - var expr = new RegExp(slugify($('#file-list-filter').val()), 'i'); - - $('#file-list p').hide().filter(function(index) { - console.log(expr.test($(this).attr('title'))) - return expr.test(slugify($('a', this).html())); - }).show(); - } - - $('#file-list-find-button').click(search).hide(); - $('#file-list-filter').bind('keyup change DOMAttrModified', search); -}); -</script> -{% endblock extrahead %} - -{% block maincontent %} -<div id="main-page-widgets"> - -<div class="file-list-widget"> - <form action="#" method="GET"> - <p><input autocomplete="off" name="filter" id="file-list-filter" type="text" size="60" /> - <input type="submit" value="Znajdź" id="file-list-find-button"/> - <input type="reset" value="WyczyÅÄ" id="file-list-reset-button"/> - </p> - </form> - <div id="file-list"> - {% for file in document_list %} - <p><a href="{% url wiki.views.document_detail file|urlencode %}">{{ file }}</a></p> - {% endfor %} - </div> -</div> - -</div> -{% endblock maincontent %} diff --git a/platforma/templates/explorer/file_tree_part.html b/platforma/templates/explorer/file_tree_part.html deleted file mode 100644 index f65cf28a..00000000 --- a/platforma/templates/explorer/file_tree_part.html +++ /dev/null @@ -1,13 +0,0 @@ -{% load explorer_tags %} - -<li class="file-tree-entry" title="{{document.name|bookname}}"> - <a href="{% url editor_view document.name %}">{{ document.name|bookname }}</a> - {% if document.parts %} - <ul class="file-tree-part"> - {% for part in document.parts %} - {% tree_part part %} - {% endfor %} - </ul> - {% endif %} -</li> - diff --git a/platforma/templates/explorer/file_upload.html b/platforma/templates/explorer/file_upload.html deleted file mode 100755 index 1deedac4..00000000 --- a/platforma/templates/explorer/file_upload.html +++ /dev/null @@ -1,17 +0,0 @@ -{% extends "base.html" %} - -{% block maincontent %} -<h2>Dodawanie nowego utworu:</h2> - -{% if errors %} -<div class="errorlist"> -{% for error in errors %} -<p>{{ error }}: {{ error.errors }}</p> -{% endfor %} -</div> -{% endif %} -<form action="{% url file_upload %}" method="POST" enctype="multipart/form-data"> - {{ bookform.as_p }} - <p><button type="submit">Dodaj ksiÄ Å¼kÄ</button></p> -</form> -{% endblock maincontent %} diff --git a/platforma/templates/explorer/folder_images.html b/platforma/templates/explorer/folder_images.html deleted file mode 100644 index 8f5f600f..00000000 --- a/platforma/templates/explorer/folder_images.html +++ /dev/null @@ -1,3 +0,0 @@ -{% for image in images %} - <div class="image-box" src="{{ image }}" style="width: 480px; height: 640px;">{{ image }}</div> -{% endfor %} \ No newline at end of file diff --git a/platforma/templates/explorer/split.html b/platforma/templates/explorer/split.html deleted file mode 100755 index 8d3b67bb..00000000 --- a/platforma/templates/explorer/split.html +++ /dev/null @@ -1,26 +0,0 @@ -<form action="{% url explorer.views.split_text fileid %}" method="POST"> - <fieldset> - <legend>Split options</legend> - {% for field in splitform %} - {% if field.is_hidden %} - {{ field}} - {% else %} - {{ field.errors }} - {% ifequal field.html_name 'splitform-autoxml' %} - <p><label>{{ field }} {{ field.label }}</label></p> - {% else %} - <p><label>{{ field.label }}: {{ field }}</label></p> - {% endifequal %} - {% endif %} - {% endfor %} - </fieldset> - - <fieldset id="split-form-dc-subform" style="display: none;"> - <legend>Dublin Core</legend> - {{ dcform.as_p }} - </fieldset> - <p> - <button type="submit" id="split-dialog-button-accept">Split</button> - <button type="button" id="split-dialog-button-close">Close</button> - </p> -</form> diff --git a/platforma/templates/explorer/split_success.html b/platforma/templates/explorer/split_success.html deleted file mode 100755 index 4f3a57b8..00000000 --- a/platforma/templates/explorer/split_success.html +++ /dev/null @@ -1,3 +0,0 @@ -<p>Split successful. You can edit the new part here: -<a href="{% url editor_view cfileid %}" target="_new">{% url editor_view cfileid %}</a></p> -<p><button type="button" id="split-dialog-button-dismiss">Close</button></p> \ No newline at end of file diff --git a/platforma/templates/html4print.html b/platforma/templates/html4print.html deleted file mode 100644 index 1b4ef319..00000000 --- a/platforma/templates/html4print.html +++ /dev/null @@ -1,13 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> - <head> - <title>{{docid}}</title> - <link rel="stylesheet" href="{{STATIC_URL}}css/html_print.css" type="text/css" charset="utf-8"> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - </head> - <body> - <div class="htmlview"> - {{ output|safe }} - </div> - </body> -</html> diff --git a/platforma/templates/manager/pull_request.html b/platforma/templates/manager/pull_request.html deleted file mode 100644 index a44b1ede..00000000 --- a/platforma/templates/manager/pull_request.html +++ /dev/null @@ -1,102 +0,0 @@ -{% extends 'base.html' %} - -{% block bodyid %}management{% endblock %} - -{% block extrahead %} -<link rel="stylesheet" href="{{ STATIC_URL }}css/managment.css" type="text/css" /> -<link rel="stylesheet" href="{{ STATIC_URL }}css/pygments.css" type="text/css" /> -<script type="text/javascript"> - - - $(function() { - - function refreshRow(id) { - var row = $('#request-' +id); - - $.ajax({ - url: '{% url pullrequest_list %}/'+id, - dataType: 'json', - type: 'GET', - success: function(data) { - row.removeClass('status-N'); - row.removeClass('status-R'); - row.removeClass('status-A'); - row.addClass('status-'+ data.status); - - $('.column-doc', row).html(data.document); - $('.column-status', row).html(data.status); - - alert('Merge accepted.'); - } - }); - - } - - $('.accept-button').click(function() - { - var id = parseInt($(this).attr('title')); - - $.ajax({ - url: '{% url pullrequest_list %}/'+id, - data: {action: 'accept'}, - dataType: 'json', - type: 'PUT', - success: function(data) { - refreshRow(id); - } - }); - - }); - - $('.show-diff').click(function() { - var button = $(this); - - if (button.attr('disabled') != 'disabled') { - button.attr('disabled', 'disabled'); - var id = parseInt(button.attr('title')); - var docid = $('h2', button.parents('.pull-request')).html(); - var diffUrl = button.parents('.pull-request').attr('data-diff-url'); - var revision = $('.pull-request-revision', button.parents('.pull-request')).html(); - - $('.diff').slideUp(function() { $(this).remove() }); - $('<div class="diff"></div>') - .hide() - .appendTo($(this).parents('.pull-request')) - .slideDown('slow') - .load(diffUrl + '?revision=' + revision, null, function() { - button.attr('disabled', null); - }); - } - }); - - }); -</script> -{% endblock %} - -{% block maincontent %} -{% if objects %} - {% for pullreq in objects %} - <div class="status-{{ pullreq.status }} pull-request" id="request-{{ pullreq.id }}" data-diff-url="{% url diff_resource pullreq.document %}"> - <h2>{{ pullreq.document }}</h2> - <ul class="request-info"> - <li>commiter: {{ pullreq.comitter }}</li> - <li>revision: <span class="pull-request-revision">{{ pullreq.source_revision }}</span></li> - <li>status: {{ pullreq.status }}</li> - <li>data: {{ pullreq.timestamp }}</li> - </ul> - <p class="comment">{{ pullreq.comment }}</p> - {% ifnotequal pullreq.status 'A' %} - <p class="buttons"> - <button type="button" class="awesome button green accept-button" title="{{pullreq.id}}">Akceptuj</button> - <button type="button" class="awesome button show-diff" title="{{pullreq.id}}">Zmiany</button> - <a class="awesome button" href="{% url editor_view pullreq.document %}?user=$prq-{{pullreq.id}}">Zobacz</a> - </p> - {% endifnotequal %} - </div> - {% endfor %} -{% else %} - {# <tr><td colspan="6">Brak Å¼Ä daÅ</td></tr> #} -{% endif %} -{# </table> #} - -{% endblock %} diff --git a/platforma/urls.py b/platforma/urls.py index 8d58e0e6..19dfc03d 100755 --- a/platforma/urls.py +++ b/platforma/urls.py @@ -21,7 +21,7 @@ urlpatterns = patterns('', # url(r'^file/(?P<docid>[^/]+)/print$', 'explorer.views.print_html', name="file_print"), - url(r'^$', 'wiki.views.document_list', {'template_name': 'explorer/file_list.html'}), + url(r'^$', 'wiki.views.document_list'), # Admin panel (r'^admin/filebrowser/', include('filebrowser.urls')), -- 2.20.1