From: Łukasz Rekucki <lrekucki@gmail.com>
Date: Tue, 25 Aug 2009 16:08:23 +0000 (+0200)
Subject: Merge branch 'master' of git@stigma:platforma
X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/96647893c5a1e2c675fc2b1bf1d7ca16fe3253b8?ds=inline;hp=-c

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

96647893c5a1e2c675fc2b1bf1d7ca16fe3253b8
diff --combined project/templates/explorer/file_xml.html
index 33e88028,23be7c3a..fe7e0c0e
--- a/project/templates/explorer/file_xml.html
+++ b/project/templates/explorer/file_xml.html
@@@ -7,7 -7,7 +7,7 @@@
      <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/panels.js" type="text/javascript" charset="utf-8"></script>
 -    <script src="/static/js/save-commit.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 %}
@@@ -23,7 -23,8 +23,8 @@@
                      <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 gallery_panel hash %}">Galeria skanów</option>
+                         <option value="{% url dceditor_panel hash %}">Edytor DublinCore</option>
                      </select>
                      <strong class="change-notification" style="display: none">Zmieniono!</strong>
                 </div>
@@@ -37,6 -38,7 +38,7 @@@
                          <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">Zmieniono!</strong>
                   </div>