Skip to content

Commit

Permalink
Add Hierarchy error view template
Browse files Browse the repository at this point in the history
and clean translations.

issue #33
  • Loading branch information
Pictor13 committed Dec 12, 2016
1 parent 69cf1c0 commit 371662b
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 10 deletions.
10 changes: 3 additions & 7 deletions app/config/translation.xml
Original file line number Diff line number Diff line change
Expand Up @@ -146,18 +146,16 @@
<ae:parameter name="menu">Menü</ae:parameter>
<ae:parameter name="go_to_dashboard">Zur Einstiegsseite…</ae:parameter>
<ae:parameter name="welcome_header">Willkommen im Honeybee CMF</ae:parameter>
<ae:parameter name="there_were_errors">There were errors</ae:parameter>
<!-- View: collection / hierarchy -->
<ae:parameter name="sort_by">Sortieren nach</ae:parameter>
<ae:parameter name="sidebar">Sidebar</ae:parameter>
<ae:parameter name="activities">Activities</ae:parameter>
<ae:parameter name="cannot_display_collection">(DE) Can't display collection</ae:parameter>
<ae:parameter name="there_were_errors">(DE) There were errors:</ae:parameter>
<ae:parameter name="cannot_display_collection">Can't display collection</ae:parameter>
<!-- View: hierarchy -->
<ae:parameter name="parent_resource">Parent resource</ae:parameter>
<ae:parameter name="child_resources">Child resources</ae:parameter>
<ae:parameter name="root_resources">Root resources</ae:parameter>
<!-- View: createinput -->
<ae:parameter name="validation_unfortunately">Unfortunately…</ae:parameter>
<!-- View: sumary -->
<ae:parameter name="summary">Summary</ae:parameter>
<ae:parameter name="summary_error">Summary/SummaryError</ae:parameter>
Expand All @@ -174,18 +172,16 @@
<ae:parameter name="menu">Menu</ae:parameter>
<ae:parameter name="go_to_dashboard">Go to the dashboard…</ae:parameter>
<ae:parameter name="welcome_header">Welcome to the Honeybee CMF</ae:parameter>
<ae:parameter name="there_were_errors">There were errors</ae:parameter>
<!-- View: collection / hierarchy -->
<ae:parameter name="sort_by">Sort by</ae:parameter>
<ae:parameter name="sidebar">Sidebar</ae:parameter>
<ae:parameter name="activities">Activities</ae:parameter>
<ae:parameter name="cannot_display_collection">Can't display collection</ae:parameter>
<ae:parameter name="there_were_errors">There were errors:</ae:parameter>
<!-- View: hierarchy -->
<ae:parameter name="parent_resource">Parent resource</ae:parameter>
<ae:parameter name="child_resources">Child resources</ae:parameter>
<ae:parameter name="root_resources">Root resources</ae:parameter>
<!-- View: createinput -->
<ae:parameter name="validation_unfortunately">Unfortunately…</ae:parameter>
<!-- View: sumary -->
<ae:parameter name="summary">Summary</ae:parameter>
<ae:parameter name="summary_error">Summary/SummaryError</ae:parameter>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% extends _layout %}

{% block toc %}
<h1>{{ _('cannot_display_collection') }}:</h1>
<h1>{{ _('cannot_display_collection') }}</h1>
{% endblock %}

{% block primary %}
Expand Down
12 changes: 12 additions & 0 deletions app/templates/html/views/Hierarchy/HierarchyError.twig
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{% extends _layout %}

{% block primary %}
<div>
{{ _('there_were_errors') }}:
<ul>
{% for error in errors %}
<li>{{ error }}</li>
{% endfor %}
</ul>
</div>
{% endblock primary %}
13 changes: 12 additions & 1 deletion app/templates/html/views/Resource/Embed/EmbedError.twig
Original file line number Diff line number Diff line change
@@ -1 +1,12 @@
{{ error_message }}
{% extends _layout %}

{% block primary %}
<div>
{{ _('there_were_errors') }}:
<ul>
{% for error in errors %}
<li>{{ error }}</li>
{% endfor %}
</ul>
</div>
{% endblock primary %}
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<ae:parameter name="files.page_title"></ae:parameter>
<ae:parameter name="files.download.page_title"></ae:parameter>
<ae:parameter name="files.upload.page_title"></ae:parameter>
<ae:parameter name="hierarchy.page_title">{{ resource }} hierarchie</ae:parameter>
<ae:parameter name="hierarchy.page_title">{{ resource }} hierarchy</ae:parameter>
<ae:parameter name="resource.page_title">{{ resource }} detail</ae:parameter>
<ae:parameter name="resource.embed.page_title"></ae:parameter>
<ae:parameter name="resource.history.page_title">{{ resource }} history</ae:parameter>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{% include "html/views/Hierarchy/HierarchyError.twig" %}

0 comments on commit 371662b

Please sign in to comment.