entrouvert
/
chrono
14
1
Fork 0
Code Issues Pull Requests 5 Releases Wiki Activity

manager: include object identifiers in page content (#13141)

This commit is contained in:
Frédéric Péters 2016-09-11 11:55:55 +02:00
parent b26f51e36c
commit d83cf15f47
4 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
chrono/manager/static/css/style.css
View File

@ -16,3 +16,13 @@
li.full {
background: #f8f8fe;
}
li span.identifier {
font-size: 80%;
opacity: 0.6;
}
h2 span.identifier {
font-size: 1rem;
opacity: 0.6;
}

5
chrono/manager/templates/chrono/manager_agenda_view.html
View File

@ -2,7 +2,9 @@
{% load i18n %}
{% block appbar %}
<h2>{{ object.label }}</h2>
<h2>{{ object.label }}
<span class="identifier">[{% trans "identifier:" %} {{object.id}}]</span></h2>
</h2>
<a rel="popup" href="{% url 'chrono-manager-agenda-delete' pk=object.id %}">{% trans 'Delete' %}</a>
<a rel="popup" href="{% url 'chrono-manager-agenda-edit' pk=object.id %}">{% trans 'Rename' %}</a>
{% if object.kind == "events" %}
@ -76,6 +78,7 @@
{% for meeting_type in object.meetingtype_set.all %}
<li><a href="{% url 'chrono-manager-meeting-type-edit' pk=meeting_type.id %}">
{{meeting_type.label}}
<span class="identifier">[{% trans "identifier:" %} {{meeting_type.id}}]</span></h2>
</a>
</li>
{% endfor %}

2
chrono/manager/templates/chrono/manager_home.html
View File

@ -12,7 +12,7 @@
<div>
<ul class="objects-list single-links">
{% for object in object_list %}
<li><a href="{% url 'chrono-manager-agenda-view' pk=object.id %}">{{ object.label }}</a></li>
<li><a href="{% url 'chrono-manager-agenda-view' pk=object.id %}">{{ object.label }}</li>
{% endfor %}
</ul>
</div>

6
tests/test_manager.py
View File

@ -81,7 +81,7 @@ def test_add_agenda(app, admin_user):
agenda = Agenda.objects.get(label='Foo bar')
assert resp.location == 'http://localhost:80/manage/agendas/%s/' % agenda.id
resp = resp.follow()
assert '<h2>Foo bar</h2>' in resp.body
assert '<h2>Foo bar' in resp.body
def test_rename_agenda(app, admin_user):
agenda = Agenda(label=u'Foo bar')
@ -95,7 +95,7 @@ def test_rename_agenda(app, admin_user):
resp = resp.form.submit()
assert resp.location == 'http://localhost:80/manage/agendas/%s/' % agenda.id
resp = resp.follow()
assert '<h2>Foo baz</h2>' in resp.body
assert '<h2>Foo baz' in resp.body
def test_delete_agenda(app, admin_user):
agenda = Agenda(label=u'Foo bar')
@ -208,7 +208,7 @@ def test_add_meetings_agenda(app, admin_user):
agenda = Agenda.objects.get(label='Foo bar')
assert resp.location == 'http://localhost:80/manage/agendas/%s/' % agenda.id
resp = resp.follow()
assert '<h2>Foo bar</h2>' in resp.body
assert '<h2>Foo bar' in resp.body
assert 'Meeting Types' in resp.body
agenda = Agenda.objects.get(label='Foo bar')
assert agenda.kind == 'meetings'