From: Łukasz Rekucki <lrekucki@gmail.com>
Date: Wed, 26 Aug 2009 11:43:40 +0000 (+0200)
Subject: Merge branch 'master' of git@stigma:platforma
X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/09444838209cb9fd08f799553889ff04a015e8ad?ds=sidebyside;hp=--cc

Merge branch 'master' of git@stigma:platforma
---

09444838209cb9fd08f799553889ff04a015e8ad
diff --cc project/templates/explorer/editor.html
index 805f59c4,00000000..94f9e011
mode 100644,000000..100644
--- a/project/templates/explorer/editor.html
+++ b/project/templates/explorer/editor.html
@@@ -1,47 -1,0 +1,47 @@@
 +{% extends "base.html" %}
 +
 +{% block extrahead %}
 +    <script src="/static/js/jquery.lazyload.js" type="text/javascript" charset="utf-8"></script>
 +    <script src="/static/js/codemirror/codemirror.js" type="text/javascript" charset="utf-8"></script>
 +    <script src="/static/js/jquery.autoscroll.js" type="text/javascript" charset="utf-8"></script>
 +    <script src="/static/js/jquery.wtooltip.js" type="text/javascript" charset="utf-8"></script>
 +    <script src="/static/js/jquery.hpanel.js" type="text/javascript" charset="utf-8"></script>
 +    <script src="/static/js/editor.js" type="text/javascript" charset="utf-8"></script>
 +{% endblock extrahead %}
 +
 +{% block breadcrumbs %}<a href="{% url file_list %}">Platforma Redakcyjna</a> ❯ plik {{ hash }}{% endblock breadcrumbs %}
 +
 +{% block header-toolbar %}
 +	<button type="button" class="toolbar-button" id="toolbar-button-save">Zapisz</button>
 +{% endblock %}
 +{% block maincontent %}
 +        <div id="panels">
 +            <div id="left-panel-wrap" class="panel-wrap">
 +               <div id="left-panel-toolbar" class="panel-toolbar">
 +                    <label for="select-left-panel">Lewy panel:</label>
 +                    <select name="select-left-panel" id="select-left-panel">
 +                        <option value="{% url xmleditor_panel hash %}">Edytor XML</option>
 +                        <option value="{% url htmleditor_panel hash %}">Edytor HTML</option>
 +                        <option value="{% url gallery_panel hash %}">Galeria skanów</option>
 +                        <option value="{% url dceditor_panel hash %}">Edytor DublinCore</option>
 +                    </select>
 +                    <strong class="change-notification" style="display: none">Widok nieaktualny!</strong>
 +               </div>
 +               <div id="left-panel-content" class="panel-content"></div>
-                <button type="button" class="panel-slider" id="slider01">&nbsp;</button>
++               <button type="button" class="panel-slider" id="slider01"></button>
 +            </div>
 +            <div id="right-panel-wrap" class="panel-wrap last-panel">
 +                <div id="right-panel-toolbar" class="panel-toolbar">
 +                    <label for="select-right-panel">Prawy panel:</label>
 +                    <select name="select-right-panel" id="select-right-panel">
 +                        <option value="{% url xmleditor_panel hash %}">Edytor XML</option>
 +                        <option value="{% url htmleditor_panel hash %}">Edytor HTML</option>
 +                        <option value="{% url gallery_panel hash %}">Galeria skanów</option>
 +                        <option value="{% url dceditor_panel hash %}">Edytor DublinCore</option>
 +                    </select>
 +                    <strong class="change-notification" style="display: none">Widok nieaktualny!</strong>
 +                 </div>
 +                 <div id="right-panel-content" class="panel-content"></div>
 +            </div>
 +        </div>
 +{% endblock maincontent %}