ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Agenda orga items and time scheduling: Formatting improved. Use permission 'can_see_orga_items' also to show/hide duration column and agenda time scheduling. (via Emanuel)

Browse Source
This commit is contained in:
Stefan Frauenknecht 2013-02-01 14:41:52 +01:00
commit c595701597
7 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openslides/agenda/forms.py
View File

@ -64,7 +64,7 @@ class ItemOrderForm(forms.Form, CssClassMixin):
class ConfigForm(forms.Form, CssClassMixin): class ConfigForm(forms.Form, CssClassMixin):
agenda_start_event_time = forms.TimeField( agenda_start_event_time = forms.TimeField(
widget=forms.TimeInput(format='%H:%M'), widget=forms.TimeInput(format='%H:%M'),
input_formats=('%H:%M', '%H:%M:%S'), input_formats=['%H:%M'],
required=False, required=False,
label=_("Begin of event (hh:mm)"), label=_("Begin of event (hh:mm)"),
) )

6
openslides/agenda/static/styles/agenda.css
View File

@ -25,6 +25,10 @@ table#menu-overview {
table#agendatime { table#agendatime {
float: right; float: right;
width: 15%; width: 25%;
margin-bottom: 1em; margin-bottom: 1em;
} }
table#agendatime td {
padding: 5px;
}

2
openslides/agenda/templates/agenda/item_row.html
View File

@ -20,7 +20,7 @@
{% if perms.agenda.can_manage_agenda %} {% if perms.agenda.can_manage_agenda %}
<div class="dragcell"></div> <div class="dragcell"></div>
{% endif %} {% endif %}
<a href="{% model_url item 'view' %}">{{ item }}</a> <a href="{% model_url item 'view' %}">{% if item.type == "org" %}<i>[{% endif %}{{ item }}{% if item.type == "org" %}]</i>{% endif %}</a>
{{ item.get_title_supplement|safe }} {{ item.get_title_supplement|safe }}
</td> </td>
{% if perms.agenda.can_manage_agenda %} {% if perms.agenda.can_manage_agenda %}

2
openslides/agenda/templates/agenda/widget.html
View File

@ -39,7 +39,7 @@
{% for p in item.get_ancestors %} {% for p in item.get_ancestors %}
<span class="indentation">&nbsp;</span> <span class="indentation">&nbsp;</span>
{% endfor %} {% endfor %}
<a href="{% model_url item 'view' %}">{{ item }}</a> <a href="{% model_url item 'view' %}">{% if item.type == "org" %}<i>[{% endif %}{{ item }}{% if item.type == "org" %}]</i>{% endif %}</a>
{{ item.get_title_supplement|safe }} {{ item.get_title_supplement|safe }}
</li> </li>
{% empty %} {% empty %}

BIN
openslides/locale/de/LC_MESSAGES/django.mo
View File

Binary file not shown.

20
openslides/locale/de/LC_MESSAGES/django.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: OpenSlides 1.x\n" "Project-Id-Version: OpenSlides 1.x\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-01-31 20:14+0100\n" "POT-Creation-Date: 2013-01-30 21:40+0100\n"
"PO-Revision-Date: 2012-07-28 11:07+0200\n" "PO-Revision-Date: 2012-07-28 11:07+0200\n"
"Last-Translator: Emanuel Schuetze <emanuel@intevation.de>\n" "Last-Translator: Emanuel Schuetze <emanuel@intevation.de>\n"
"Language-Team: support@openslides.de\n" "Language-Team: support@openslides.de\n"
@ -35,11 +35,11 @@ msgstr "Elternelement"
#: agenda/forms.py:34 agenda/models.py:49 #: agenda/forms.py:34 agenda/models.py:49
msgid "Duration (hh:mm)" msgid "Duration (hh:mm)"
msgstr "Dauer (ss:mm)" msgstr "Dauer (hh:mm)"
#: agenda/forms.py:69 #: agenda/forms.py:69
msgid "Begin of event (hh:mm)" msgid "Begin of event (hh:mm)"
msgstr "Beginn der Veranstaltung (ss:mm)" msgstr "Beginn der Veranstaltung (hh:mm)"
#: agenda/models.py:35 #: agenda/models.py:35
msgid "Agenda item" msgid "Agenda item"
@ -93,7 +93,7 @@ msgstr "Darf die Tagesordung verwalten"
#: agenda/models.py:184 #: agenda/models.py:184
msgid "Can see orga items and time scheduling of agenda" msgid "Can see orga items and time scheduling of agenda"
msgstr "Darf Organisationspunkte und Zeitmanagement der Tagesordnung sehen " msgstr "Darf Organisationspunkte und Tagesordnung-Zeitplan sehen"
#: agenda/models.py:192 agenda/slides.py:20 agenda/views.py:219 #: agenda/models.py:192 agenda/slides.py:20 agenda/views.py:219
#: agenda/views.py:220 agenda/views.py:257 agenda/views.py:271 #: agenda/views.py:220 agenda/views.py:257 agenda/views.py:271
@ -2420,15 +2420,3 @@ msgstr "undefinierter-dateiname"
#: utils/jsonfield/fields.py:22 #: utils/jsonfield/fields.py:22
msgid "Enter valid JSON" msgid "Enter valid JSON"
msgstr "Gebe valides JSON ein" msgstr "Gebe valides JSON ein"
#~ msgid "Can see orga items"
#~ msgstr "Darf Organisationspunkte sehen"
#~ msgid "Visible to all"
#~ msgstr "Für alle sichtbar"
#~ msgid "Moderators only"
#~ msgstr "Nur für Moderatoren"
#~ msgid "Visibility"
#~ msgstr "Sichtbarkeit"

1
openslides/static/styles/base.css
View File

@ -318,6 +318,7 @@ input[type="submit"], input[type="button"] {
} }
#id_permissions, #id_users { #id_permissions, #id_users {
height: 310px; height: 310px;
width: 412px;
} }
.button { .button {
border: 1px solid #D3D3D3; border: 1px solid #D3D3D3;