Show path on template and manage folder pages

So the page headings stay consistent as you click around, and make it
easy to get back where you came from.
This commit is contained in:
Chris Hill-Scott
2018-11-16 14:09:14 +00:00
parent d49622c5dc
commit 738043c5c4
7 changed files with 51 additions and 18 deletions

View File

@@ -352,6 +352,12 @@ class Service():
folder,
]
def get_template_path(self, template):
return [
self.get_template_folder(template['folder']),
template,
]
def get_template_folders_and_templates(self, template_type, template_folder_id):
return (
self.get_templates(template_type, template_folder_id) +

View File

@@ -46,7 +46,7 @@
{% else %}
<div class="grid-row bottom-gutter-2-3">
<div class="grid-row {% if current_service.all_template_folders %}bottom-gutter-1-2{% else %}bottom-gutter-2-3{% endif %}">
<div class="column-two-thirds">
{{ folder_path(
folders=template_folder_path,

View File

@@ -1,26 +1,24 @@
{% extends "withnav_template.html" %}
{% from "components/folder-path.html" import folder_path, page_title_folder_path %}
{% from "components/textbox.html" import textbox %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
{% block service_page_title %}
Templates
{% for folder in template_folder_path %}
/
{{ folder.name }}
{% endfor %}
- Manage folder
{{ page_title_folder_path(template_folder_path) }}
{% endblock %}
{% block maincolumn_content %}
<h1 class="heading-large">
<a href="{{ url_for('.choose_template', service_id=current_service.id, template_type=template_type) }}">Templates</a>
{% for folder in template_folder_path %}
/
<a href="{{ url_for('.choose_template', service_id=current_service.id, template_type=template_type, template_folder_id=folder.id) }}">{{ folder.name }}</a>
{% endfor %}
</h1>
<div class="grid-row bottom-gutter-1-2">
<div class="column-whole">
{{ folder_path(
folders=template_folder_path,
service_id=current_service.id,
template_type='all',
) }}
</div>
</div>
{% if not delete_folder %}
{% call form_wrapper() %}
@@ -33,7 +31,6 @@ Templates
template_folder_id=template_folder_id
),
delete_link_text="Delete this folder") }}
{% endcall %}
{% else %}
<a href="{{url_for('.manage_template_folder', service_id=current_service.id, template_folder_id=template_folder_id)}}">Back to manage folder page</a>

View File

@@ -1,5 +1,6 @@
{% extends "withnav_template.html" %}
{% from "components/banner.html" import banner_wrapper %}
{% from "components/folder-path.html" import folder_path %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/textbox.html" import textbox %}
{% from "components/api-key.html" import api_key %}
@@ -28,7 +29,17 @@
{% endcall %}
</div>
{% else %}
<h1 class="heading-large">{{ template.name }}</h1>
<div class="grid-row bottom-gutter-1-2">
<div class="column-whole">
{{ folder_path(
folders=current_service.get_template_path(template._template),
service_id=current_service.id,
template_type='all',
fallback_page_title=template.name,
show_fallback_page_title=not current_service.all_template_folders
) }}
</div>
</div>
{% endif %}
<div class="grid-row">