diff options
| -rw-r--r-- | pydis_site/static/js/wiki/load_editor.js | 4 | ||||
| -rw-r--r-- | pydis_site/templates/wiki/edit.html | 237 |
2 files changed, 120 insertions, 121 deletions
diff --git a/pydis_site/static/js/wiki/load_editor.js b/pydis_site/static/js/wiki/load_editor.js index 95aa3d65..a9f78e65 100644 --- a/pydis_site/static/js/wiki/load_editor.js +++ b/pydis_site/static/js/wiki/load_editor.js @@ -1,10 +1,8 @@ (function() { - window.editors = {}; + window.editors = {}; // So that other scripts can get at 'em let elements = document.getElementsByClassName("simple-mde"); - console.log(elements); - for (let element of elements) { window.editors[element.id] = new SimpleMDE({ "element": element, diff --git a/pydis_site/templates/wiki/edit.html b/pydis_site/templates/wiki/edit.html index aa9ee032..fc5955e9 100644 --- a/pydis_site/templates/wiki/edit.html +++ b/pydis_site/templates/wiki/edit.html @@ -2,138 +2,139 @@ {% load wiki_tags i18n sekizai_tags %} -{% block wiki_pagetitle %}{% trans "Edit" %}: {{ article.current_revision.title }}{% endblock %} +{% block wiki_pagetitle %} + Edit: {{ article.current_revision.title }} +{% endblock %} {% block wiki_contents_tab %} -{% if not user.is_authenticated %} -<p class="alert alert-warning"> -{% trans "<strong>Warning:</strong> You are not logged in. Your IP address will be logged." %} -<a href="{% url 'wiki:login' %}?next={% url 'wiki:edit' article_id=article.id path=urlpath.path %}">{% trans "Click here to log in" %} »</a> -</p> -{% endif %} - -<div class="row"> - - <div class="col-lg-8"> - <form method="POST" class="form-horizontal" id="article_edit_form"> - {% with edit_form as form %} - {% include "wiki/includes/editor.html" %} - {% endwith %} - - <div class="form-group form-actions"> - <div class="col-lg-12"> - <div class="col-lg-offset-2"> - <button class="btn btn-default" type="submit" name="preview" value="1" id="id_preview" - formaction="{% url 'wiki:preview' path=urlpath.path article_id=article.id %}" - formtarget="previewWindow" - > - <span class="fa fa-eye"></span> - {% trans "Preview" %} - </button> - <button class="btn btn-primary" type="submit" name="save" value="1" id="id_save"> - <span class="fa fa-check"></span> - {% trans "Save changes" %} - </button> - - <div class="btn-toolbar pull-right"> - {% if user.is_authenticated and urlpath.path %} - <a href="{% url 'wiki:move' path=urlpath.path article_id=article.id %}" class="btn btn-warning "> - <span class="fa fa-random"></span> - {% trans "Move article" %} - </a> - {% endif %} - {% if article|can_delete:user %} - <a href="{% url 'wiki:delete' path=urlpath.path article_id=article.id %}" class="btn btn-danger"> - <span class="fa fa-trash-o"></span> - {% trans "Delete article" %} - </a> - {% endif %} + {% if not user.is_authenticated %} + <p class="alert alert-warning"> + {% trans "<strong>Warning:</strong> You are not logged in. Your IP address will be logged." %} + <a href="{% url 'wiki:login' %}?next={% url 'wiki:edit' article_id=article.id path=urlpath.path %}">{% trans "Click here to log in" %} »</a> + </p> + {% endif %} + + <div class="row"> + + <div class="col-lg-8"> + <form method="POST" class="form-horizontal" id="article_edit_form"> + {% with edit_form as form %} + {% include "wiki/includes/editor.html" %} + {% endwith %} + + <div class="form-group form-actions"> + <div class="col-lg-12"> + <div class="col-lg-offset-2"> + <button class="btn btn-default" type="submit" name="preview" value="1" id="id_preview" + formaction="{% url 'wiki:preview' path=urlpath.path article_id=article.id %}" + formtarget="previewWindow" + > + <span class="fa fa-eye"></span> + {% trans "Preview" %} + </button> + <button class="btn btn-primary" type="submit" name="save" value="1" id="id_save"> + <span class="fa fa-check"></span> + {% trans "Save changes" %} + </button> + + <div class="btn-toolbar pull-right"> + {% if user.is_authenticated and urlpath.path %} + <a href="{% url 'wiki:move' path=urlpath.path article_id=article.id %}" class="btn btn-warning "> + <span class="fa fa-random"></span> + {% trans "Move article" %} + </a> + {% endif %} + {% if article|can_delete:user %} + <a href="{% url 'wiki:delete' path=urlpath.path article_id=article.id %}" class="btn btn-danger"> + <span class="fa fa-trash-o"></span> + {% trans "Delete article" %} + </a> + {% endif %} + </div> </div> </div> </div> - </div> - </form> - </div> + </form> + </div> - <div class="col-lg-4" id="wiki-edit-sidebar"> - {% include "wiki/includes/editor_sidebar.html" %} - </div> + <div class="col-lg-4" id="wiki-edit-sidebar"> + {% include "wiki/includes/editor_sidebar.html" %} + </div> -</div> + </div> -<div style="clear: both"></div> + <div style="clear: both"></div> -{% include "wiki/includes/modals.html" %} + {% include "wiki/includes/modals.html" %} -<div class="modal fade wiki-modal" id="previewModal"> - <div class="modal-dialog"> - <div class="modal-content"> - <div class="modal-body"> - <iframe name="previewWindow" frameborder="0"></iframe> - </div> - <div class="modal-footer"> - <a href="#" class="btn btn-default btn-lg" data-dismiss="modal"> - <span class="fa fa-arrow-circle-left"></span> - {% trans "Back to editor" %} - </a> - <a class="btn btn-lg btn-primary" id="id_preview_save_changes" href="#"> - <span class="fa fa-check"></span> - {% trans "Save changes" %} - </a> + <div class="modal fade wiki-modal" id="previewModal"> + <div class="modal-dialog"> + <div class="modal-content"> + <div class="modal-body"> + <iframe name="previewWindow" frameborder="0"></iframe> + </div> + <div class="modal-footer"> + <a href="#" class="btn btn-default btn-lg" data-dismiss="modal"> + <span class="fa fa-arrow-circle-left"></span> + {% trans "Back to editor" %} + </a> + <a class="btn btn-lg btn-primary" id="id_preview_save_changes" href="#"> + <span class="fa fa-check"></span> + {% trans "Save changes" %} + </a> + </div> </div> </div> </div> -</div> - -{% addtoblock "js" %} -<script language="javascript"> - $(document).ready(function() { - $("#article_edit_form :input").change(function() { - $("#article_edit_form").data("changed",true); - }); - if ($("#article_edit_form").find(".alert-danger").length > 0 || $("#article_edit_form").find(".has-error").length > 0 ) { - // Set the forms status as "changed" if there was a submission error - $("#article_edit_form").data("changed",true); - } - window.onbeforeunload = confirmOnPageExit; - var click_time = 0; - $("#article_edit_form").on("submit", function (ev) { - now = Date.now(); - elapsed = now-click_time; - click_time = now; - if (elapsed < 3000) - ev.preventDefault(); - window.onbeforeunload = null; - return true; - }); - $("#id_preview").on("click", function () { - $("#previewModal").modal("show"); - return true; - }); - $("#id_preview_save_changes").on("click", function (ev) { - ev.preventDefault(); - $("#id_save").trigger("click"); - }); - }); - -var confirmOnPageExit = function (e) { - if ($("#article_edit_form").data("changed")) { - e = e || window.event; - var message = "You have unsaved changes!"; - // For IE6-8 and Firefox prior to version 4 - if (e) { - e.returnValue = message; - } - // For Chrome, Safari, IE8+ and Opera 12+ - return message; - } else { - // If the form hasn't been changed, don't display the pop-up - return; - } -}; -</script> -{% endaddtoblock %} + {% addtoblock "js" %} + <script language="javascript"> + $(document).ready(function() { + $("#article_edit_form :input").change(function() { + $("#article_edit_form").data("changed",true); + }); + if ($("#article_edit_form").find(".alert-danger").length > 0 || $("#article_edit_form").find(".has-error").length > 0 ) { + // Set the forms status as "changed" if there was a submission error + $("#article_edit_form").data("changed",true); + } + window.onbeforeunload = confirmOnPageExit; + var click_time = 0; + $("#article_edit_form").on("submit", function (ev) { + now = Date.now(); + elapsed = now-click_time; + click_time = now; + if (elapsed < 3000) + ev.preventDefault(); + window.onbeforeunload = null; + return true; + }); + $("#id_preview").on("click", function () { + $("#previewModal").modal("show"); + return true; + }); + $("#id_preview_save_changes").on("click", function (ev) { + ev.preventDefault(); + $("#id_save").trigger("click"); + }); + }); + + var confirmOnPageExit = function (e) { + if ($("#article_edit_form").data("changed")) { + e = e || window.event; + var message = "You have unsaved changes!"; + // For IE6-8 and Firefox prior to version 4 + if (e) { + e.returnValue = message; + } + // For Chrome, Safari, IE8+ and Opera 12+ + return message; + } else { + // If the form hasn't been changed, don't display the pop-up + return; + } + }; + </script> + {% endaddtoblock %} {% endblock %} |