From 9aed1f764d1794b9bc15f56bae279a826e99008c Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Tue, 19 Nov 2013 20:50:51 +0100 Subject: [PATCH] Fixed a lot of template bugs. - agenda overview: Text align right for duration column. - item summary slide: Show 'get_title_supplement' after each related agenda item. - item detail view: Add ":" in button after item content_type - projector: Show
below title/subtitle line. - motion view: Check manage permission for delete version button in version history table. - motion detail view: Update version authorized badges and go to buttons. - motion list: Link warning icon to newest version. - assignment detail view: Added ballot paper pdf button. - Group slide and overview: Show members. - Use dynamic title column width in participants pdf. - Fixed missing translations in user settings form. - IE8/9 fix for projector template style. - Style linebreak and border in h1 title with css. --- .../agenda/static/styles/agenda_sort.css | 4 +- .../agenda/templates/agenda/item_slide.html | 1 - .../agenda/item_slide_list_of_speaker.html | 12 +++--- .../templates/agenda/item_slide_summary.html | 9 +++- .../agenda/templates/agenda/overview.html | 22 +++++----- openslides/agenda/templates/agenda/view.html | 2 +- .../assignment/assignment_detail.html | 15 +++---- .../templates/assignment/slide.html | 2 - .../templates/motion/motion_detail.html | 42 +++++++++++-------- .../motion/templates/motion/motion_list.html | 9 +++- openslides/motion/templates/motion/slide.html | 2 - openslides/participant/forms.py | 7 ++-- openslides/participant/pdf.py | 1 - .../templates/participant/group_overview.html | 4 ++ .../templates/participant/group_slide.html | 10 ++++- .../templates/participant/user_slide.html | 1 - .../projector/static/styles/projector.css | 4 ++ openslides/projector/templates/projector.html | 1 + .../templates/projector/default_slide.html | 5 ++- .../projector/projectorslide_slide.html | 5 ++- 20 files changed, 93 insertions(+), 65 deletions(-) diff --git a/openslides/agenda/static/styles/agenda_sort.css b/openslides/agenda/static/styles/agenda_sort.css index 0f34e06a9..39866ec2d 100644 --- a/openslides/agenda/static/styles/agenda_sort.css +++ b/openslides/agenda/static/styles/agenda_sort.css @@ -54,7 +54,7 @@ ol.agenda_list { } .agenda_list .openclose { width: 40px; float: left; min-height: 1px; } -.agenda_list .duration { width: 92px; float: right; min-height: 1px; padding-left: 5px; } +.agenda_list .duration { width: 92px; float: right; min-height: 1px; padding-right: 25px; text-align: right; } .agenda_list .manage { width: 200px; float: right; min-height: 1px; padding-left: 5px; } .agenda_list .title { float: left; padding-left: 5px;} .agenda_list .optional { float: left; } @@ -63,7 +63,7 @@ ol.agenda_list { .agenda_list .optional { float: right; width: 208px; padding-left: 8px;} #menu-overview .manage { width: 200px; } -#menu-overview .duration { width: 75px; } +#menu-overview .duration { width: 65px; text-align: right; padding-right: 19px;} #menu-overview .optional { width: 200px; } @media screen and (max-width: 1000px) { diff --git a/openslides/agenda/templates/agenda/item_slide.html b/openslides/agenda/templates/agenda/item_slide.html index 5ebbd3e26..200d324c2 100644 --- a/openslides/agenda/templates/agenda/item_slide.html +++ b/openslides/agenda/templates/agenda/item_slide.html @@ -2,7 +2,6 @@

{{ item }} -

{% if item.text %} diff --git a/openslides/agenda/templates/agenda/item_slide_list_of_speaker.html b/openslides/agenda/templates/agenda/item_slide_list_of_speaker.html index 6f281588e..670f9c4f9 100644 --- a/openslides/agenda/templates/agenda/item_slide_list_of_speaker.html +++ b/openslides/agenda/templates/agenda/item_slide_list_of_speaker.html @@ -15,11 +15,13 @@ margin-bottom: 0.5em;} -

{{ title }}

-

- {% trans 'List of speakers' %} - {% if item.speaker_list_closed %}({% trans 'closed' %}){% endif %} -

+

+ {{ title }} + + {% trans 'List of speakers' %} + {% if item.speaker_list_closed %}({% trans 'closed' %}){% endif %} + +

{% if list_of_speakers %}