fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Zamiana skryptu edytora z editArea na CodeMirror.
[redakcja.git]
/
project
/
templates
/
explorer
/
file_xml.html
diff --git
a/project/templates/explorer/file_xml.html
b/project/templates/explorer/file_xml.html
index
f203829
..
b408cc5
100644
(file)
--- a/
project/templates/explorer/file_xml.html
+++ b/
project/templates/explorer/file_xml.html
@@
-3,8
+3,9
@@
{% block extrahead %}
<script src="/static/js/jquery.fieldselection.js" type="text/javascript" charset="utf-8"></script>
<script src="/static/js/jquery.lazyload.js" type="text/javascript" charset="utf-8"></script>
{% block extrahead %}
<script src="/static/js/jquery.fieldselection.js" type="text/javascript" charset="utf-8"></script>
<script src="/static/js/jquery.lazyload.js" type="text/javascript" charset="utf-8"></script>
- <script src="/static/js/edit_area_full.js" type="text/javascript" charset="utf-8"></script>
- <script type="text/javascript" charset="utf-8">
+ <script src="/static/js/codemirror/codemirror.js" type="text/javascript" charset="utf-8"></script>
+ <!-- <script src="/static/js/edit_area_full.js" type="text/javascript" charset="utf-8"></script>-->
+ <script type="text/javascript" charset="utf-8">
function addEditorButton(label, fn) {
$('<button type="button">' + label + '</button>').click(function(event) {
var text = $('#id_text').getSelection().text;
function addEditorButton(label, fn) {
$('<button type="button">' + label + '</button>').click(function(event) {
var text = $('#id_text').getSelection().text;
@@
-20,15
+21,12
@@
});
});
});
});
- editAreaLoader.init({
- id: "id_text",
- start_highlight: true,
- allow_toggle: false,
- language: "pl",
- syntax: "xml",
-
- // show_line_colors: true
- });
+ var editor = CodeMirror.fromTextArea("id_text", {
+ parserfile: 'parsexml.js',
+ path: "/static/js/codemirror/",
+ stylesheet: "/static/css/xmlcolors.css",
+ parserConfig: {useHTMLKludges: false}
+ });
addEditorButton('utwór', function(text) { return '<utwor>' + text + '</utwor>'; });
addEditorButton('akap', function(text) { return '<akap>' + text + '</akap>'; });
addEditorButton('utwór', function(text) { return '<utwor>' + text + '</utwor>'; });
addEditorButton('akap', function(text) { return '<akap>' + text + '</akap>'; });
@@
-38,7
+36,7
@@
</script>
{% endblock extrahead %}
</script>
{% endblock extrahead %}
-{% block breadcrumbs %}<a href="
/
">Platforma Redakcyjna</a> ❯ plik {{ hash }}{% endblock breadcrumbs %}
+{% block breadcrumbs %}<a href="
{% url file_list %}
">Platforma Redakcyjna</a> ❯ plik {{ hash }}{% endblock breadcrumbs %}
{% block maincontent %}
<div id="tabs"><a href="{% url file_xml hash %}" class="active">Źródło</a><a href="{% url file_html hash %}">HTML</a> <div style="padding: 3px; margin-left: 10px">{{ image_folders_form.folders }}</div><div style="clear: both; height: 0; width: 0"> </div></div>
{% block maincontent %}
<div id="tabs"><a href="{% url file_xml hash %}" class="active">Źródło</a><a href="{% url file_html hash %}">HTML</a> <div style="padding: 3px; margin-left: 10px">{{ image_folders_form.folders }}</div><div style="clear: both; height: 0; width: 0"> </div></div>
@@
-47,8
+45,8
@@
<p>Aby zobaczyć obrazki wybierz folder z obrazkami powyżej.</p>
</div>
<form action="." method="post" accept-charset="utf-8">
<p>Aby zobaczyć obrazki wybierz folder z obrazkami powyżej.</p>
</div>
<form action="." method="post" accept-charset="utf-8">
- <div id="buttons"></div>
- <textarea id="id_text" name="text" style="
height: 500px; width: 500px;
">{{ form.text.field.initial }}</textarea>
+ {# <div id="buttons"></div> #}
+ <textarea id="id_text" name="text" style="
width:50%; height:480px
">{{ form.text.field.initial }}</textarea>
{{ form.user.errors }}
<p>Użytkownik: {{ form.user }}</p>
{{ form.commit_message.errors }}
{{ form.user.errors }}
<p>Użytkownik: {{ form.user }}</p>
{{ form.commit_message.errors }}