Replace md editor with ckeditor

This commit is contained in:
2022-08-23 17:54:58 +02:00
parent 7cc917d9f7
commit ca459c467b
23 changed files with 97 additions and 112 deletions

View File

@@ -1,6 +1,5 @@
{% load static %}
{% load solo_tags %}
{% load markdown %}
{% load show_menu %}
{% get_solo 'portal.SiteConfiguration' as site_conf %}

View File

@@ -1,5 +1,4 @@
{% extends "base.html" %}
{% load markdown %}
{% block header %}
<h1 class="fw-light">Companies</h1>

View File

@@ -1,5 +1,4 @@
{% extends "base.html" %}
{% load markdown %}
{% block header %}
<h1 class="fw-light">{{ consist }}</h1>

View File

@@ -1,5 +1,4 @@
{% extends "base.html" %}
{% load markdown %}
{% block header %}
<h1 class="fw-light">Consists</h1>

View File

@@ -1,5 +1,4 @@
{% extends 'base.html' %}
{% load markdown %}
{% block header %}
<h1 class="fw-light">{{ flatpage.name }}</h1>
@@ -9,7 +8,7 @@
<section class="py-4 text-start container">
<div class="row">
<div class="mx-auto">
<div>{{ flatpage.content | markdown | safe }} </div>
<div>{{ flatpage.content | safe }} </div>
<div class="d-grid gap-2 d-md-flex justify-content-md-end">
{% if request.user.is_staff %}<a class="btn btn-sm btn-outline-danger" href="{% url 'admin:portal_flatpage_change' flatpage.pk %}">Edit</a>{% endif %}
</div>

View File

@@ -1,9 +1,8 @@
{% extends "base.html" %}
{% load markdown %}
{% block header %}
{% if site_conf.about %}<h1 class="fw-light">About</h1>{% endif %}
<p class="lead text-muted">{{ site_conf.about | markdown | safe }}</p>
<p class="lead text-muted">{{ site_conf.about | safe }}</p>
{% endblock %}
{% block pagination %}

View File

@@ -1,15 +1,13 @@
{% load markdown %}
<footer class="text-muted py-4">
<div class="container">
<p class="float-end mb-1">
<a href="#">Back to top</a>
</p>
<div id="footer" class="mb-1">
<p>&copy; {% now "Y" %}</p> {{ site_conf.footer | markdown | safe }}
<p>&copy; {% now "Y" %}</p> {{ site_conf.footer | safe }}
</div>
<div id="footer_extended" class="mb-0">
{{ site_conf.footer_extended | markdown | safe }}
{{ site_conf.footer_extended | safe }}
</div>
</div>

View File

@@ -1,5 +1,4 @@
{% extends 'base.html' %}
{% load markdown %}
{% block header %}
<h1 class="fw-light">{{ rolling_stock }}</h1>
@@ -258,7 +257,7 @@
</table>
</div>
<div class="tab-pane fade" id="nav-notes" role="tabpanel" aria-labelledby="nav-notes-tab">
{{ rolling_stock.notes | markdown | safe }}
{{ rolling_stock.notes | safe }}
</div>
<div class="tab-pane fade" id="nav-documents" role="tabpanel" aria-labelledby="nav-documents-tab">
<table class="table table-striped">

View File

@@ -1,5 +1,4 @@
{% extends "base.html" %}
{% load markdown %}
{% block header %}
<h1 class="fw-light">Scales</h1>