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)

openslides/agenda/forms.py

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

openslides/agenda/static/styles/agenda.css

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

openslides/agenda/templates/agenda/item_row.html

@@ -20,7 +20,7 @@
         {% if perms.agenda.can_manage_agenda %}
             <div class="dragcell"></div>
         {% 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 }}
     </td>
     {% if perms.agenda.can_manage_agenda %}

openslides/agenda/templates/agenda/widget.html

@@ -39,7 +39,7 @@
         {% for p in item.get_ancestors %}
             <span class="indentation">&nbsp;</span>
         {% 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 }}
     </li>
 {% empty %}

openslides/locale/de/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenSlides 1.x\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"
 "Last-Translator: Emanuel Schuetze <emanuel@intevation.de>\n"
 "Language-Team: support@openslides.de\n"
@@ -35,11 +35,11 @@ msgstr "Elternelement"
 
 #: agenda/forms.py:34 agenda/models.py:49
 msgid "Duration (hh:mm)"
-msgstr "Dauer (ss:mm)"
+msgstr "Dauer (hh:mm)"
 
 #: agenda/forms.py:69
 msgid "Begin of event (hh:mm)"
-msgstr "Beginn der Veranstaltung (ss:mm)"
+msgstr "Beginn der Veranstaltung (hh:mm)"
 
 #: agenda/models.py:35
 msgid "Agenda item"
@@ -93,7 +93,7 @@ msgstr "Darf die Tagesordung verwalten"
 
 #: agenda/models.py:184
 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/views.py:220 agenda/views.py:257 agenda/views.py:271
@@ -2420,15 +2420,3 @@ msgstr "undefinierter-dateiname"
 #: utils/jsonfield/fields.py:22
 msgid "Enter valid JSON"
 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"

openslides/static/styles/base.css

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