mirror of
https://github.com/nottinghamtec/PyRIGS.git
synced 2026-01-17 13:32:15 +00:00
a01e351e89
* Add basic markdown support site wide
* Improved MD support.
Add some styling for images in MD
Add support for the bastardisation of the MD html for RML.
* Add processing for <ul> in RML
* Add OL processing to RML
* Fix a bug with squares appearing around the last page number
* Remove rml formatting in event_detail
* Improve handling of code blocks in RML
* Add MD to rigboard
Reduce MD title sizes as they were offensively large
* Add parsing of markdown when editing event items
* Improved list handling in RML
* Add tests for markdown support.
Focuses mainly on RML as that's where it will break
* Add indications of where MD support is enabled as per comment by @samozzy in #178.
Isn't quite a full description, but for the most part this should be enough for the people who know how to use it see where they can use it.
* Add failing test for markdown processing none
* Fix for failing test in e0d56e
* Add failing test for using single line breaks as per comment on #214
* Enable line break extension for single breaks in paragraphs by new lines.
Pass tests in ef3de607c3
* Enable GH flavour linebreaks in JS rendered markdown
* Made RML bullets pretty :)
* Added WYSIWYG editor. Works for notes & description, fails miserably for items :(
* Fixed for event items. Will probably fail tests because selenium can't type in simpleMDE :(
* FIX: Re-enable markdown on paperwork
Strikethrough is broken in all sorts of places for whatever reason
* FEAT: Markdown support on asset comments
* FIX: Prevent js injection through markdown fields
* Initial fixes
* Basic dark theme for simplemde
* Swap to locally delivered SimpleMDE
* Region for selenium testing of SimpleMDE
Bleh, Javascript all around
* Tests passing!
Fixed not using region for item modal, and overflow error on paperwork with really long description. Looks junk but I'm not really bothered
* Pep8 fixes
* Fallback for null HCapatcha sitekey
I.e. when we're on a branch
* Fix item description print being broken
* Actually fix sitekey problem
* Fixes for using markdown in asset comments
* Properly initialise markdown on asset comments
Co-authored-by: David Taylor <david@taylorhq.com>
Co-authored-by: FreneticScribbler <aj@aronajones.com>
77 lines
2.6 KiB
HTML
77 lines
2.6 KiB
HTML
{% extends request.is_ajax|yesno:"base_ajax.html,base_rigs.html" %}
|
|
|
|
{% load markdown_tags %}
|
|
|
|
{% block content %}
|
|
<div class="row my-3 py-3">
|
|
{% if not request.is_ajax %}
|
|
{% if perms.RIGS.view_event %}
|
|
<div class="col-sm-12 text-right">
|
|
{% include 'partials/event_detail_buttons.html' %}
|
|
</div>
|
|
{% endif %}
|
|
{% endif %}
|
|
{% if object.is_rig and perms.RIGS.view_event %}
|
|
{# only need contact details for a rig #}
|
|
<div class="col-md-6">
|
|
{% include 'partials/contact_details.html' %}
|
|
</div>
|
|
{% endif %}
|
|
<div class="col-md-6">
|
|
{% include 'partials/event_details.html' %}
|
|
</div>
|
|
{% if not event.dry_hire %}
|
|
<div class="col {% if event.is_rig %}py-3{%endif %}">
|
|
{% include 'partials/hs_details.html' %}
|
|
</div>
|
|
{% endif %}
|
|
{% if event.is_rig %}
|
|
{% if event.is_rig and event.internal and perms.RIGS.view_event %}
|
|
<div class="col-md-8 py-3">
|
|
{% include 'partials/auth_details.html' %}
|
|
</div>
|
|
{% endif %}
|
|
{% endif %}
|
|
{% if not request.is_ajax and perms.RIGS.view_event %}
|
|
<div class="col-sm-12 text-right">
|
|
{% include 'partials/event_detail_buttons.html' %}
|
|
</div>
|
|
{% endif %}
|
|
{% if event.is_rig %}
|
|
<div class="col-sm-12">
|
|
<div class="card card-default">
|
|
<div class="card-header">Event Details</div>
|
|
<div class="card-body">
|
|
{% if perms.RIGS.view_event %}
|
|
<h4>Notes</h4>
|
|
<hr>
|
|
<p class="dont-break-out">{{ event.notes|markdown }}</p>
|
|
{% endif %}
|
|
<br>
|
|
{% include 'partials/item_table.html' %}
|
|
</div>
|
|
</div>
|
|
</div>
|
|
{% if not request.is_ajax and perms.RIGS.view_event %}
|
|
<div class="col-sm-12 text-right">
|
|
{% include 'partials/event_detail_buttons.html' %}
|
|
</div>
|
|
{% endif %}
|
|
{% endif %}
|
|
{% if not request.is_ajax and perms.RIGS.view_event %}
|
|
<div class="col-sm-12 text-right">
|
|
{% include 'partials/last_edited.html' with target="event_history" %}
|
|
</div>
|
|
{% endif %}
|
|
</div>
|
|
{% endblock %}
|
|
|
|
{% if request.is_ajax %}
|
|
{% block footer %}
|
|
{% if perms.RIGS.view_event %}
|
|
{% include 'partials/last_edited.html' with target="event_history" %}
|
|
{% endif %}
|
|
<a href="{% url 'event_detail' object.pk %}" class="btn btn-primary">Open Event Page <span class="fas fa-eye"></span></a>
|
|
{% endblock %}
|
|
{% endif %}
|