Skip to content

Commit e66a077

Browse files
caulagicaulagi
committed
- Add some _generic templates
- Change layout a bit (remove whitespace between navigation and content)
1 parent 7e39d39 commit e66a077

File tree

6 files changed

+90
-39
lines changed

6 files changed

+90
-39
lines changed

‎share/roundup/templates/jinja2/html/_generic.404.html‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{% extends 'layout/page.html' %}
2+
3+
{% block head_title %}
4+
404 - {{ i18n.gettext('page not found') }}
5+
{% endblock %}
6+
7+
{% block page_content %}
8+
<div class='container-fluid'>
9+
<h1 class='text-error'>{{ i18n.gettext('404 - page not found') }}</h1>
10+
<p style='text-align: center'>{{ i18n.gettext('What were you looking for anyways?') }}</p>
11+
</div>
12+
{% endblock %}

‎share/roundup/templates/jinja2/html/_generic.collision.html‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{% extends 'layout/page.html' %}
2+
3+
{% block head_title %}
4+
{{ i18n.gettext('Edit Collision') }} - {{ config.TRACKER_NAME }}
5+
{% endblock %}
6+
7+
{% block page_header %}
8+
{{ i18n.gettext('Edit Collision') }} - {{ config.TRACKER_NAME }}
9+
{% endblock %}
10+
11+
{% block content %}
12+
<p>
13+
{{ i18n.gettext('There has been a collision.
14+
Another user updated this node
15+
while you were editing. Please') }}
16+
<a href='{{ context }}'>{{ i18n.gettext('reload') }}</a>
17+
{{ i18n.gettext('the node and review your edits.') }}
18+
</p>
19+
</tal:block>

‎share/roundup/templates/jinja2/html/_generic.help-empty.html‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{% extends 'layout/page.html' %}
2+
3+
{% block head_title %}
4+
{{ i18n.gettext('Empty page') }}
5+
{% endblock %}
6+
7+
{% block page_content %}
8+
<p>
9+
{{ i18n.gettext('Please specify your search parameters!') }}
10+
</p>
11+
{% endblock %}

‎share/roundup/templates/jinja2/html/_generic.index.html‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,41 @@
11
{% extends 'layout/page.html' %}
22

3+
{% block head_title %}
4+
{{ context._classname.capitalize() }} {{ i18n.gettext('editing') }}
5+
{% endblock %}
6+
37
{% block page_header %}
4-
{{ context._classname.capitalize() }} editing
8+
{{ context._classname.capitalize() }} {{ i18n.gettext('editing') }}
59
{% endblock %}
610

711
{% block content %}
812

913
{% include 'layout/permission.html' %}
1014

1115
{% if context.is_view_ok %}
12-
<p class="form-help">
16+
<p class="form-help">{{ i18n.gettext('
1317
You may edit the contents of the
1418
class using this form. Commas, newlines and double quotes (") must be
1519
handled delicately. You may include commas and newlines by enclosing the
1620
values in double-quotes ("). Double quotes themselves must be quoted by
1721
doubling ("").
18-
</p>
22+
') }}</p>
1923

20-
<p class="form-help">
24+
<p class="form-help">{{ i18n.gettext('
2125
Multilink properties have their multiple values colon (":") separated
2226
(... ,"one:two:three", ...)
23-
</p>
27+
') }}</p>
2428

25-
<p class="form-help">
29+
<p class="form-help">{{ i18n.gettext('
2630
Remove entries by deleting their line. Add new entries by appending
2731
them to the table - put an X in the id column. If you wish to restore a
2832
removed item and you know its id then just put that id in the id column.
29-
</p>
30-
<form onSubmit="return submit_once()" method="POST"
31-
tal:attributes="action context/designator">
32-
<textarea rows="15" style="width:90%" name="rows" tal:content="context/csv"></textarea>
33-
<br>
34-
<input type="hidden" name="@action" value="editCSV">
35-
<input type="submit" value="Edit Items" i18n:attributes="value">
33+
') }}</p>
34+
<form method="POST" action='{{ context.designator() }}'>
35+
<textarea rows="15" style="width:90%" name="rows">{{ context.csv }}</textarea>
36+
<br>
37+
<input type="hidden" name="@action" value="{{ i18n.gettext('editCSV') }}">
38+
<input type="submit" value="{{ i18n.gettext('Edit Items') }}">
3639
</form>
3740
{% endif %}
3841

‎share/roundup/templates/jinja2/html/layout/page.html‎

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -16,35 +16,37 @@
1616
{% include 'layout/banner.html' %}
1717
{% endblock %}
1818

19-
<div class='container-fluid'>
20-
<div class='row-fluid'>
21-
<div class='span3'>
22-
{% block leftnav %}
23-
{% include 'layout/navigation.html' %}
24-
{% endblock %}
25-
</div>
19+
{% block page_content %}
20+
<div class='container-fluid'>
21+
<div class='row-fluid'>
22+
<div class='span3 navigation'>
23+
{% block leftnav %}
24+
{% include 'layout/navigation.html' %}
25+
{% endblock %}
26+
</div>
2627

27-
<div class='span8 offset1'>
28-
<div class='page-header'>
29-
<h1> {% block page_header %} {% endblock %} </h1>
30-
{% if options.error_message %}
31-
<p class='alert alert-block alert-error fade in'>
32-
{{ options.error_message }}
33-
<button type='button' class='close' data-dismiss='alert'>X</button>
34-
</p>
35-
{% endif %}
36-
{% if options.ok_message %}
37-
<p class='alert alert-block alert-success fade in'>
38-
{{ options.ok_message }}
39-
<button type='button' class='close' data-dismiss='alert'>X</button>
40-
</p>
41-
{% endif %}
42-
</div>
43-
{% block content %}
44-
{% endblock %}
28+
<div class='span9'>
29+
<div class='page-header'>
30+
<h1> {% block page_header %} {% endblock %} </h1>
31+
{% if options.error_message %}
32+
<p class='alert alert-block alert-error fade in'>
33+
{{ options.error_message }}
34+
<button type='button' class='close' data-dismiss='alert'>X</button>
35+
</p>
36+
{% endif %}
37+
{% if options.ok_message %}
38+
<p class='alert alert-block alert-success fade in'>
39+
{{ options.ok_message }}
40+
<button type='button' class='close' data-dismiss='alert'>X</button>
41+
</p>
42+
{% endif %}
43+
</div>
44+
{% block content %}
45+
{% endblock %}
46+
</div>
4547
</div>
4648
</div>
47-
</div>
49+
{% endblock %}
4850

4951
{% block footer %}
5052
{% include 'layout/footer.html' %}

‎share/roundup/templates/jinja2/static/style.css‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,3 +63,7 @@ footer {
6363
.vspace-three { margin-top: 3em; }
6464
.vspace-four { margin-top: 4em; }
6565
.vspace-five { margin-top: 5em; }
66+
67+
.navigation {
68+
border-right: 1px solid #ddd;
69+
}

0 commit comments

Comments
 (0)