From 1cbea56ba9228bb67eb5838e2bab7b0f58610fc1 Mon Sep 17 00:00:00 2001
From: Patrick Jentsch <p.jentsch@uni-bielefeld.de>
Date: Wed, 12 Feb 2020 15:57:31 +0100
Subject: [PATCH] Change title settings
---
app/jobs/views.py | 3 +--
app/templates/jobs/job.html.j2 | 1 +
app/templates/nopaque.html.j2 | 10 +++++++++-
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/app/jobs/views.py b/app/jobs/views.py
index d84e77ea..a5bbe723 100644
--- a/app/jobs/views.py
+++ b/app/jobs/views.py
@@ -14,8 +14,7 @@ def job(job_id):
job = Job.query.get_or_404(job_id)
if not (job.creator == current_user or current_user.is_administrator()):
abort(403)
- return render_template('jobs/job.html.j2', job=job,
- title='<i class="material-icons left service" data-service="{service}" style="font-size: inherit;"></i>Job'.format(service=job.service))
+ return render_template('jobs/job.html.j2', job=job, title='Job')
@jobs.route('/<int:job_id>/delete')
diff --git a/app/templates/jobs/job.html.j2 b/app/templates/jobs/job.html.j2
index f288032b..674a566f 100644
--- a/app/templates/jobs/job.html.j2
+++ b/app/templates/jobs/job.html.j2
@@ -2,6 +2,7 @@
{% set full_width = False %}
{% set roadmap = False %}
+{% set title_override = '<i class="material-icons left service" data-service="{service}" style="font-size: inherit;"></i>Job'.format(service=job.service) %}
{% block page_content %}
<div class="col s12 m4">
diff --git a/app/templates/nopaque.html.j2 b/app/templates/nopaque.html.j2
index 880e1738..18a8e518 100644
--- a/app/templates/nopaque.html.j2
+++ b/app/templates/nopaque.html.j2
@@ -94,7 +94,15 @@
{% endif %}
<div class="row">
<div class="col s12">
- <h2>{% if title %}{{ title }}{% else %}Unnamed page{% endif %}</h2>
+ <h2>
+ {% if title_override %}
+ {{ title_override }}
+ {% elif title %}
+ {{ title }}
+ {% else %}
+ Unnamed page
+ {% endif %}
+ </h2>
</div>
{% if roadmap %}
<div class="col s12 m9 l10">
--
GitLab