{% trans "Election" %}: {{ assignment }}
+{{ assignment }}
+
+
+ {% trans "Election" %}
+
+
+
{% if not assignment.candidates %}
{{ assignment.description|linebreaks }}
diff --git a/openslides/core/templatetags/tags.py b/openslides/core/templatetags/tags.py
index 6dd6ac7a2..6e1f342fa 100644
--- a/openslides/core/templatetags/tags.py
+++ b/openslides/core/templatetags/tags.py
@@ -46,17 +46,21 @@ def model_url(object, link='view'):
@register.filter
-def absolute_url(model, link='detail'):
+def absolute_url(model, link=None):
"""
Returns the absolute_url to a model. The 'link' argument decides which url
will be returned. See get_absolute_url() in the model.
Example: {{ motion|absolute_url:'delete' }}
"""
- try:
- return model.get_absolute_url(link)
- except ValueError:
- return ''
+ if link is None:
+ url = model.get_absolute_url()
+ else:
+ try:
+ url = model.get_absolute_url(link)
+ except ValueError:
+ url = ''
+ return url
@register.filter
diff --git a/openslides/motion/static/styles/motion.css b/openslides/motion/static/styles/motion.css
index 5bba51dbb..262fd5b0e 100644
--- a/openslides/motion/static/styles/motion.css
+++ b/openslides/motion/static/styles/motion.css
@@ -46,3 +46,6 @@ td.diff_header {
margin-top: 5px;
margin-bottom: 15px;
}
+#motion-vote-results img {
+ margin-top: -4px;
+}
diff --git a/openslides/motion/templates/motion/category_list.html b/openslides/motion/templates/motion/category_list.html
index 924709948..88472c5ba 100644
--- a/openslides/motion/templates/motion/category_list.html
+++ b/openslides/motion/templates/motion/category_list.html
@@ -25,12 +25,12 @@
{% for category in category_list %}
{% trans group.name %}
-
-
+{{ group.user_set.all.count }} {% trans "participants" %}
- -
+ {% trans group.name %}
+
+
+
+{{ group.user_set.all.count }} {% trans "participants" %}
diff --git a/openslides/participant/templates/participant/import.html b/openslides/participant/templates/participant/import.html
index cc1e21470..34b7661ef 100644
--- a/openslides/participant/templates/participant/import.html
+++ b/openslides/participant/templates/participant/import.html
@@ -25,7 +25,7 @@
{% trans 'Delegate' %} (3), {% trans 'Staff' %} (4)
{{ shown_user.committee }}
+ +
+ {{ shown_user.clean_name }}
+ {{ shown_user.structure_level }}
+
+
+
+{% if shown_user.committee %}
+ {{ shown_user.committee }}
+{% endif %} + +
+ {% if shown_user.groups.all %}
+ {% for group in shown_user.groups.all %}
+ {% trans group.name %}{% if not forloop.last %}
{% endif %}
+ {% endfor %}
{% endif %}
-
- {% if shown_user.groups.all %} - {% for group in shown_user.groups.all %} - {% trans group.name %}{% if not forloop.last %}, {% endif %} - {% endfor %} - {% endif %} -
- - + diff --git a/openslides/participant/templates/participant/user_widget.html b/openslides/participant/templates/participant/user_widget.html index 16a9e25ff..af7fd7156 100644 --- a/openslides/participant/templates/participant/user_widget.html +++ b/openslides/participant/templates/participant/user_widget.html @@ -6,7 +6,7 @@ - + diff --git a/openslides/projector/static/img/presentation-header-bg.png b/openslides/projector/static/img/presentation-header-bg.png deleted file mode 100644 index b3d666cda..000000000 Binary files a/openslides/projector/static/img/presentation-header-bg.png and /dev/null differ diff --git a/openslides/projector/static/styles/projector.css b/openslides/projector/static/styles/projector.css index 58d2d246d..940f05bec 100644 --- a/openslides/projector/static/styles/projector.css +++ b/openslides/projector/static/styles/projector.css @@ -6,50 +6,32 @@ */ body{ - margin : 0px; - padding-top: 0px; - padding-left : 0px; - font-family: 'Lucida Grande',"Trebuchet MS",Verdana,sans-serif; - font-size : 20px; - background-color: #FAFAFB; + font-size: 20px !important; + line-height: 24px !important; overflow: hidden; } /*** HEADER ***/ #header { - position:relative; - background:url("../img/presentation-header-bg.png") repeat-x scroll center top #3D3020; - height:100px; + background-color: #333333; + background-image: -moz-linear-gradient(top, #444444, #222222); + background-image: -ms-linear-gradient(top, #444444, #222222); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#222222)); + background-image: -webkit-linear-gradient(top, #444444, #222222); + background-image: -o-linear-gradient(top, #444444, #222222); + background-image: linear-gradient(top, #444444, #222222); + box-shadow: 0 0 7px rgba(0,0,0,0.6); + height: 70px; + margin-bottom: 20px; + padding: 7px 20px 0; + position: relative; } #logo { - position:absolute; - top: 15px; - left: 100px; -} -.event_name { - position:absolute; - text-align:right; - top: 10px; - right: 40px; - font-size:42px; - font-weight:bold; - color: #ffffff; -} -.event_description { - position:absolute; - text-align:right; - top:60px; - right:40px; - font-size:17px; - color: #cfcfcf; -} -#ajaxswitcher { - height: 20px; - padding: 5px; - position: fixed; - z-index: 100; - display: none; + position: absolute; + top: 8px; + left: 75px; } + #currentTime { border:0 solid #000000; font-size:24px; @@ -58,12 +40,82 @@ body{ top:110px; right:40px; padding-left:30px; - background: url(../img/glyphicons_054_clock_big.png) no-repeat scroll 0px 4px; + background: url(../img/glyphicons_054_clock_big.png) no-repeat scroll 0px 0px; } -#currentTime.ajax_error { - border-bottom: 4px solid red; +/*** FOOTER ***/ +#footer { + color: #999999; + font-size: 16px; + clear: both; + margin-top: 50px; + position: fixed; + left: 0px; + right: 0; + bottom: 0px; + height: 30px; + padding-top: 10px; + background-color: #333333; + background-image: -moz-linear-gradient(top, #444444, #222222); + background-image: -ms-linear-gradient(top, #444444, #222222); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#222222)); + background-image: -webkit-linear-gradient(top, #444444, #222222); + background-image: -o-linear-gradient(top, #444444, #222222); + background-image: linear-gradient(top, #444444, #222222); + box-shadow: 0 0 7px rgba(0,0,0,0.6); + border-top: 1px solid #999999; + } +.event_name_description { + left: 75px; + float: left; + position: absolute; + width: 50%; +} +.event_date_location { + text-align: right; + right: 40px; + position: absolute; + width: 40%; +} + +/*** CONTENT ***/ +#content { + position: absolute; + left: 75px; + top: 150px; + right: 40px; + z-index: -1; +} +h1 { + font-size: 45px !important; + margin-bottom: 40px !important; +} +#sidebar { + width: 255px; + float: right; + margin: 0 0 20px 10px; +} +.well h4 { + margin: 20px 0 2px 0; +} +.well h4 .first { + margin-top: 0; +} + +.well .results { + line-height: 30px; +} +.well .results hr { + margin: 5px 0 !important; +} + +hr { + margin: 10px 0 !important; +} + + +/*** OVERLAY ***/ #overlay_transparent { background-color: #777777; opacity: 0.6; @@ -74,71 +126,16 @@ body{ height: 100%; } -/*** CONTENT ***/ -#contentwrapper { - position:absolute; - left:100px; - top:150px; - right:40px; - z-index: -1; -} -#scrollcontentcontainer { - position: relative; - margin-top: -11px; - overflow: hidden; -} -.title -{ - position: absolute; - top: 58px; - left: 100px; - font-size: 30px; - letter-spacing:4px; - color: #FAFAFB; -} -#sidebar { - width: 255px; - float: right; - margin: 0 0 20px 10px; -} -.box { - border:1px solid #808080; - padding: 0px 10px 10px 10px; -} -.box h4 { - margin-bottom: 5px; - margin-top: 10px; - color: #333333; - font-weight: normal; - text-transform: uppercase; -} -.box .results { - font-size: 120%; - margin-top: -12px; -} - -/*** Items *** / -/* item title centered */ -.item_fullscreen +/*** Agenda Items ***/ +.itemlist { - position: relative; - top: 110px; - right:30px; - font-size:230%; - font-weight:bold; - text-align: center; + margin-top: 20px; } -.item_fullscreen span -{ - font-size: 50%; font-weight:normal; -} - -/* items in a list*/ .itemlist li { font-size:130%; - padding-bottom: 15px; + padding-bottom: 20px; list-style-type: none; } .itemlist .closed diff --git a/openslides/projector/templates/projector.html b/openslides/projector/templates/projector.html index 2c8214016..8f57a347d 100644 --- a/openslides/projector/templates/projector.html +++ b/openslides/projector/templates/projector.html @@ -5,15 +5,15 @@ - - -
- 
- 
+
{% get_config 'event_name' %}
- {% get_config 'event_description' %}
+
+
@@ -23,6 +23,17 @@
{{ content }}
+
+