From 1fb0a21d0b4156cde18b6e85d8a4aa4d7dd2f86b Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Wed, 6 Nov 2013 00:11:13 +0100 Subject: [PATCH] Some more template fixes: - Fixed #992 (Use correct countdown format) - Fixed #909 (Backend und projector template style) * Search bar with same border-radius like login button. * Projector: Fixed overlay message style. Allow HTML code (use template filter 'safe'). * Dashboard: Tooltips, Buttons and Widget fixes. - Fixed template does not exists error if custom slide is activated. - Countdown: Add css to show negative countdown in red. - Add missing translation strings to English po file (for transifex). --- extras/win32-portable/openslides.exe | Bin 31744 -> 32256 bytes .../templates/agenda/speaker_widget.html | 8 +- .../agenda/templates/agenda/widget.html | 8 +- .../templates/assignment/widget.html | 10 +- openslides/locale/en/LC_MESSAGES/django.po | 166 +++++++++++------- .../templates/mediafile/pdfs_widget.html | 20 ++- .../motion/templates/motion/widget.html | 10 +- .../templates/participant/group_widget.html | 11 +- .../templates/participant/user_widget.html | 11 +- openslides/projector/slides.py | 2 +- .../projector/static/javascript/countdown.js | 57 +++--- .../projector/static/styles/dashboard.css | 12 +- .../projector/custom_slide_widget.html | 22 ++- .../templates/projector/dashboard.html | 8 +- .../overlay_countdown_projector.html | 6 +- .../projector/overlay_countdown_widget.html | 14 +- .../projector/overlay_message_projector.html | 5 +- .../projector/overlay_message_widget.html | 6 +- openslides/templates/base.html | 4 +- 19 files changed, 229 insertions(+), 151 deletions(-) mode change 100755 => 100644 extras/win32-portable/openslides.exe diff --git a/extras/win32-portable/openslides.exe b/extras/win32-portable/openslides.exe old mode 100755 new mode 100644 index 7d1bd450fe74ab330c2696a45f2a87f949bfcba8..adc7f6a71ef9c8f192420690db370b4583503463 GIT binary patch delta 406 zcmZqp!PxMJaf2WuW6oqDMt#N&lbsl?m>3c#FBGtvyn}HA7egWg1A_w)Cv7fb(vo6S zm^@cToW+8Xfno9j84(r_7$XA8P{{x?V1Nb8U;>jBKygl>KnGM|{R|*ug(Cxlh7$wB z6NpNN3(Y_=0R+Ed3Ijt1P!1;lU#{O10wDtfjJ5}|nSq!E2tne=z+iG{sj?^!&`?I8 zQ%r!^5=^@?m`pA$3!dyyX2ER2z%^O8Op(`=A(_FDL6;$gA(f$Qa&M_KvjtGbyId7b W=4`3+?OSUY0^Mi5)w#fpuF95JcEWQ8$ diff --git a/openslides/agenda/templates/agenda/speaker_widget.html b/openslides/agenda/templates/agenda/speaker_widget.html index a0265bd70..9b6b0e7b1 100644 --- a/openslides/agenda/templates/agenda/speaker_widget.html +++ b/openslides/agenda/templates/agenda/speaker_widget.html @@ -4,11 +4,11 @@

{% trans 'Put me on the current list of speakers' %}

{% endif %} -

{% trans 'Go to current list of speakers' %}

- {% if perms.agenda.can_manage_agenda %} -
+

{% trans 'Next speaker' %} {% trans 'End speach' %} -
+

{% endif %} + +

{% trans 'Go to current list of speakers' %}...

 diff --git a/openslides/agenda/templates/agenda/widget.html b/openslides/agenda/templates/agenda/widget.html index ce9a49f5f..ad8ae6bfa 100644 --- a/openslides/agenda/templates/agenda/widget.html +++ b/openslides/agenda/templates/agenda/widget.html @@ -23,10 +23,12 @@ rel="tooltip" data-original-title="{% trans 'Show' %}">   - + - + {% trans 'No items available.' %} {% endfor %} + +

{% trans "More..." %}

 diff --git a/openslides/assignment/templates/assignment/widget.html b/openslides/assignment/templates/assignment/widget.html index 635f8e4a3..9ebe8ac2f 100644 --- a/openslides/assignment/templates/assignment/widget.html +++ b/openslides/assignment/templates/assignment/widget.html @@ -4,13 +4,16 @@ +

{% trans "More..." %}

 diff --git a/openslides/locale/en/LC_MESSAGES/django.po b/openslides/locale/en/LC_MESSAGES/django.po index b5f1b885f..d5ae5ff5e 100644 --- a/openslides/locale/en/LC_MESSAGES/django.po +++ b/openslides/locale/en/LC_MESSAGES/django.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-06 08:56+0100\n" +"POT-Creation-Date: 2013-11-07 14:07+0100\n" "Language: en\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -87,7 +87,7 @@ msgstr "" msgid "Organizational item" msgstr "" -#: agenda/models.py:38 core/signals.py:66 mediafile/models.py:26 +#: agenda/models.py:38 core/signals.py:67 mediafile/models.py:26 #: mediafile/templates/mediafile/mediafile_list.html:18 motion/forms.py:26 #: motion/models.py:533 participant/models.py:33 participant/views.py:195 #: participant/templates/participant/overview.html:48 projector/models.py:116 @@ -340,24 +340,24 @@ msgid "Show agenda item" msgstr "" #: agenda/templates/agenda/item_row.html:16 -#: agenda/templates/agenda/view.html:73 agenda/templates/agenda/widget.html:34 +#: agenda/templates/agenda/view.html:73 agenda/templates/agenda/widget.html:36 msgid "Show list of speakers" msgstr "" #: agenda/templates/agenda/item_row.html:21 -#: agenda/templates/agenda/widget.html:26 +#: agenda/templates/agenda/widget.html:27 #: assignment/templates/assignment/assignment_detail.html:174 #: assignment/templates/assignment/assignment_list.html:65 -#: assignment/templates/assignment/widget.html:10 +#: assignment/templates/assignment/widget.html:12 #: mediafile/templates/mediafile/mediafile_list.html:37 #: motion/templates/motion/category_list.html:30 #: motion/templates/motion/motion_list.html:83 -#: motion/templates/motion/widget.html:10 +#: motion/templates/motion/widget.html:12 #: participant/templates/participant/group_overview.html:54 -#: participant/templates/participant/group_widget.html:10 +#: participant/templates/participant/group_widget.html:12 #: participant/templates/participant/overview.html:116 -#: participant/templates/participant/user_widget.html:9 -#: projector/templates/projector/custom_slide_widget.html:26 +#: participant/templates/participant/user_widget.html:11 +#: projector/templates/projector/custom_slide_widget.html:31 msgid "Edit" msgstr "" @@ -371,7 +371,7 @@ msgstr "" #: motion/templates/motion/motion_list.html:86 #: participant/templates/participant/group_overview.html:58 #: participant/templates/participant/overview.html:121 -#: projector/templates/projector/custom_slide_widget.html:23 +#: projector/templates/projector/custom_slide_widget.html:27 msgid "Delete" msgstr "" @@ -380,7 +380,7 @@ msgid "Change status (open/closed)" msgstr "" #: agenda/templates/agenda/item_row.html:35 -#: agenda/templates/agenda/widget.html:40 +#: agenda/templates/agenda/widget.html:42 msgid "Show summary for this item" msgstr "" @@ -445,7 +445,7 @@ msgstr "" #: motion/templates/motion/motion_list.html:24 #: participant/templates/participant/group_overview.html:22 #: participant/templates/participant/overview.html:23 -#: projector/templates/projector/custom_slide_widget.html:39 +#: projector/templates/projector/custom_slide_widget.html:44 msgid "New" msgstr "" @@ -499,8 +499,8 @@ msgid "Show agenda" msgstr "" #: agenda/templates/agenda/overview.html:125 -#: agenda/templates/agenda/widget.html:51 -#: projector/templates/projector/custom_slide_widget.html:34 +#: agenda/templates/agenda/widget.html:53 +#: projector/templates/projector/custom_slide_widget.html:40 msgid "No items available." msgstr "" @@ -508,19 +508,19 @@ msgstr "" msgid "Put me on the current list of speakers" msgstr "" -#: agenda/templates/agenda/speaker_widget.html:7 -msgid "Go to current list of speakers" -msgstr "" - -#: agenda/templates/agenda/speaker_widget.html:11 +#: agenda/templates/agenda/speaker_widget.html:9 msgid "Next speaker" msgstr "" -#: agenda/templates/agenda/speaker_widget.html:12 +#: agenda/templates/agenda/speaker_widget.html:10 #: agenda/templates/agenda/view.html:125 msgid "End speach" msgstr "" +#: agenda/templates/agenda/speaker_widget.html:14 +msgid "Go to current list of speakers" +msgstr "" + #: agenda/templates/agenda/view.html:27 msgid "Show item" msgstr "" @@ -584,8 +584,9 @@ msgstr "" #: agenda/templates/agenda/view.html:155 #: assignment/templates/assignment/assignment_detail.html:113 #: assignment/templates/assignment/poll_view.html:87 +#: mediafile/templates/mediafile/pdfs_widget.html:32 #: motion/templates/motion/poll_form.html:70 -#: projector/templates/projector/overlay_message_widget.html:9 +#: projector/templates/projector/overlay_message_widget.html:10 #: templates/formbuttons_saveapply.html:7 msgid "Apply" msgstr "" @@ -597,29 +598,38 @@ msgstr "" #: agenda/templates/agenda/widget.html:8 #: agenda/templates/agenda/widget.html:23 -#: assignment/templates/assignment/widget.html:7 +#: assignment/templates/assignment/widget.html:8 #: mediafile/templates/mediafile/mediafile_list.html:40 -#: mediafile/templates/mediafile/pdfs_widget.html:38 +#: mediafile/templates/mediafile/pdfs_widget.html:43 #: motion/templates/motion/motion_detail.html:136 -#: motion/templates/motion/widget.html:7 -#: participant/templates/participant/group_widget.html:7 -#: participant/templates/participant/user_widget.html:6 -#: projector/templates/projector/custom_slide_widget.html:6 -#: projector/templates/projector/custom_slide_widget.html:19 +#: motion/templates/motion/widget.html:8 +#: participant/templates/participant/group_widget.html:8 +#: participant/templates/participant/user_widget.html:7 +#: projector/templates/projector/custom_slide_widget.html:7 +#: projector/templates/projector/custom_slide_widget.html:22 msgid "Show" msgstr "" #: agenda/templates/agenda/widget.html:11 -#: agenda/templates/agenda/widget.html:29 -#: assignment/templates/assignment/widget.html:13 -#: motion/templates/motion/widget.html:13 -#: participant/templates/participant/group_widget.html:13 -#: participant/templates/participant/user_widget.html:12 -#: projector/templates/projector/custom_slide_widget.html:9 -#: projector/templates/projector/custom_slide_widget.html:29 +#: agenda/templates/agenda/widget.html:31 +#: assignment/templates/assignment/widget.html:16 +#: motion/templates/motion/widget.html:16 +#: participant/templates/participant/group_widget.html:16 +#: participant/templates/participant/user_widget.html:15 +#: projector/templates/projector/custom_slide_widget.html:11 +#: projector/templates/projector/custom_slide_widget.html:35 msgid "Preview" msgstr "" +#: agenda/templates/agenda/widget.html:57 +#: assignment/templates/assignment/widget.html:26 +#: mediafile/templates/mediafile/pdfs_widget.html:52 +#: motion/templates/motion/widget.html:29 +#: participant/templates/participant/group_widget.html:24 +#: participant/templates/participant/user_widget.html:25 +msgid "More..." +msgstr "" + #: assignment/forms.py:14 assignment/models.py:51 assignment/views.py:357 #: assignment/templates/assignment/assignment_detail.html:279 #: assignment/templates/assignment/slide.html:10 @@ -838,7 +848,7 @@ msgstr "" msgid "Ballot was successfully deleted." msgstr "" -#: assignment/views.py:332 assignment/templates/assignment/widget.html:19 +#: assignment/views.py:332 assignment/templates/assignment/widget.html:22 msgid "No assignments available." msgstr "" @@ -1121,99 +1131,99 @@ msgstr "" msgid "Configuration" msgstr "" -#: core/signals.py:25 +#: core/signals.py:26 msgid "Event name" msgstr "" -#: core/signals.py:30 +#: core/signals.py:31 msgid "Presentation and assembly system" msgstr "" -#: core/signals.py:33 +#: core/signals.py:34 msgid "Short description of event" msgstr "" -#: core/signals.py:42 +#: core/signals.py:43 msgid "Event date" msgstr "" -#: core/signals.py:50 +#: core/signals.py:51 msgid "Event location" msgstr "" -#: core/signals.py:58 +#: core/signals.py:59 msgid "Event organizer" msgstr "" -#: core/signals.py:63 +#: core/signals.py:64 msgid "Welcome to OpenSlides" msgstr "" -#: core/signals.py:71 +#: core/signals.py:73 msgid "[Place for your welcome text.]" msgstr "" -#: core/signals.py:74 +#: core/signals.py:76 msgid "Welcome text" msgstr "" -#: core/signals.py:81 +#: core/signals.py:83 msgid "Allow access for anonymous guest users" msgstr "" -#: core/signals.py:90 +#: core/signals.py:92 msgid "System URL" msgstr "" -#: core/signals.py:91 +#: core/signals.py:93 msgid "Used for QRCode in PDF of access data." msgstr "" -#: core/signals.py:99 participant/views.py:274 +#: core/signals.py:101 participant/views.py:274 msgid "WLAN name (SSID)" msgstr "" -#: core/signals.py:100 core/signals.py:109 core/signals.py:118 +#: core/signals.py:102 core/signals.py:111 core/signals.py:120 msgid "Used for WLAN QRCode in PDF of access data." msgstr "" -#: core/signals.py:108 participant/views.py:278 +#: core/signals.py:110 participant/views.py:278 msgid "WLAN password" msgstr "" -#: core/signals.py:117 participant/views.py:282 +#: core/signals.py:119 participant/views.py:282 msgid "WLAN encryption" msgstr "" -#: core/signals.py:120 +#: core/signals.py:122 msgid "---------" msgstr "" -#: core/signals.py:121 +#: core/signals.py:123 msgid "WEP" msgstr "" -#: core/signals.py:122 +#: core/signals.py:124 msgid "WPA/WPA2" msgstr "" -#: core/signals.py:123 +#: core/signals.py:125 msgid "No encryption" msgstr "" -#: core/signals.py:126 +#: core/signals.py:128 msgid "Event" msgstr "" -#: core/signals.py:130 +#: core/signals.py:132 msgid "Welcome Widget" msgstr "" -#: core/signals.py:134 +#: core/signals.py:136 msgid "System" msgstr "" -#: core/signals.py:138 +#: core/signals.py:140 msgid "General" msgstr "" @@ -1309,7 +1319,27 @@ msgstr "" msgid "No files available." msgstr "" -#: mediafile/templates/mediafile/pdfs_widget.html:43 +#: mediafile/templates/mediafile/pdfs_widget.html:7 +msgid "First page" +msgstr "" + +#: mediafile/templates/mediafile/pdfs_widget.html:11 +msgid "Previous page" +msgstr "" + +#: mediafile/templates/mediafile/pdfs_widget.html:15 +msgid "Next page" +msgstr "" + +#: mediafile/templates/mediafile/pdfs_widget.html:22 +msgid "Fullscreen" +msgstr "" + +#: mediafile/templates/mediafile/pdfs_widget.html:28 +msgid "Page" +msgstr "" + +#: mediafile/templates/mediafile/pdfs_widget.html:48 msgid "No PDFs available." msgstr "" @@ -1500,7 +1530,7 @@ msgstr "" msgid "Categories" msgstr "" -#: motion/pdf.py:249 motion/templates/motion/widget.html:22 +#: motion/pdf.py:249 motion/templates/motion/widget.html:25 msgid "No motions available." msgstr "" @@ -2497,7 +2527,7 @@ msgstr "" msgid "The participant has not logged in yet." msgstr "" -#: participant/templates/participant/user_widget.html:18 +#: participant/templates/participant/user_widget.html:21 msgid "No participants available." msgstr "" @@ -2610,19 +2640,19 @@ msgctxt "seconds" msgid "s" msgstr "" -#: projector/templates/projector/overlay_countdown_widget.html:9 +#: projector/templates/projector/overlay_countdown_widget.html:10 msgid "Save time as default" msgstr "" -#: projector/templates/projector/overlay_countdown_widget.html:13 +#: projector/templates/projector/overlay_countdown_widget.html:15 msgid "Reset countdown" msgstr "" -#: projector/templates/projector/overlay_countdown_widget.html:16 +#: projector/templates/projector/overlay_countdown_widget.html:19 msgid "Start countdown" msgstr "" -#: projector/templates/projector/overlay_countdown_widget.html:19 +#: projector/templates/projector/overlay_countdown_widget.html:24 msgid "Stop countdown" msgstr "" @@ -2630,7 +2660,7 @@ msgstr "" msgid "Message" msgstr "" -#: projector/templates/projector/overlay_message_widget.html:12 +#: projector/templates/projector/overlay_message_widget.html:14 msgid "Clean message" msgstr "" diff --git a/openslides/mediafile/templates/mediafile/pdfs_widget.html b/openslides/mediafile/templates/mediafile/pdfs_widget.html index 6c0d15897..fbfc3a36c 100644 --- a/openslides/mediafile/templates/mediafile/pdfs_widget.html +++ b/openslides/mediafile/templates/mediafile/pdfs_widget.html @@ -3,28 +3,33 @@
- + - + - +
- +
- Page: + {% trans "Page" %}: -
@@ -43,3 +48,6 @@
  • {% trans 'No PDFs available.' %}
    • {% endfor %} + +

    {% trans "More..." %}

     + diff --git a/openslides/motion/templates/motion/widget.html b/openslides/motion/templates/motion/widget.html index 7fc9265c8..e968994a2 100644 --- a/openslides/motion/templates/motion/widget.html +++ b/openslides/motion/templates/motion/widget.html @@ -4,13 +4,16 @@ +

    {% trans "More..." %}

     diff --git a/openslides/participant/templates/participant/group_widget.html b/openslides/participant/templates/participant/group_widget.html index b5ddcd108..32f1c3c16 100644 --- a/openslides/participant/templates/participant/group_widget.html +++ b/openslides/participant/templates/participant/group_widget.html @@ -4,16 +4,21 @@ + +

    {% trans "More..." %}

     diff --git a/openslides/participant/templates/participant/user_widget.html b/openslides/participant/templates/participant/user_widget.html index af7fd7156..c0b081e22 100644 --- a/openslides/participant/templates/participant/user_widget.html +++ b/openslides/participant/templates/participant/user_widget.html @@ -3,13 +3,16 @@
      {% for user in users %}
    • - +   - + - + {{ user }} @@ -18,3 +21,5 @@
    • {% trans 'No participants available.' %}
      • {% endfor %}
    + +

    {% trans "More..." %}

     diff --git a/openslides/projector/slides.py b/openslides/projector/slides.py index d24f3232a..54c0e8775 100644 --- a/openslides/projector/slides.py +++ b/openslides/projector/slides.py @@ -4,4 +4,4 @@ from openslides.projector.api import register_slide_model from .models import ProjectorSlide -register_slide_model(ProjectorSlide, 'projector/slide_projectorslide.html') +register_slide_model(ProjectorSlide, 'projector/projectorslide_slide.html') diff --git a/openslides/projector/static/javascript/countdown.js b/openslides/projector/static/javascript/countdown.js index 9a52631df..7715926cc 100644 --- a/openslides/projector/static/javascript/countdown.js +++ b/openslides/projector/static/javascript/countdown.js @@ -1,51 +1,44 @@ function update_countdown() { var time = projector.get_server_time().getTime() / 1000; - var seconds; - var minutes_digit; - var seconds_digit; - var hours_digit; + var totalseconds; + var min; + var sec; + var negative; var start = projector.projector_countdown_start; var duration = projector.projector_countdown_duration; var pause = projector.projector_countdown_pause; switch (projector.projector_countdown_state) { case 'active': - seconds = start + duration - time; + totalseconds = start + duration - time; break; case 'paused': - seconds = start + duration - pause; + totalseconds = start + duration - pause; break; case 'inactive': - seconds = duration; + totalseconds = duration; break; } - if (seconds > 60) { - hours_digit = Math.floor(seconds / 3600); - minutes_digit = Math.floor((seconds - (hours_digit * 3600)) / 60); - seconds_digit = Math.floor(seconds - (hours_digit * 3600) - (minutes_digit * 60)); - minutes_digit = normalise(minutes_digit); - seconds_digit = normalise(seconds_digit); - if (hours_digit > 0) { - hours_digit = normalise(hours_digit); - seconds = hours_digit + ":" + minutes_digit + ":" + seconds_digit; - } else { - seconds = minutes_digit + ":" + seconds_digit; - } - } else { - seconds = Math.max(0, Math.floor(seconds)); + totalseconds = Math.floor(totalseconds); + if (totalseconds < 0 ) { + totalseconds = -totalseconds; + negative = true; } + min = Math.floor(totalseconds / 60); + sec = Math.floor(totalseconds - (min * 60)); + if (sec < 10) { + sec = "0" + sec; + } + if (negative) { + min = "-" + min; + $('#overlay_countdown_inner').addClass('negative'); + } + else { + $('#overlay_countdown_inner').removeClass('negative'); + } + if(totalseconds !== undefined) { + $('#overlay_countdown_inner').html(min + ":" + sec); - if(seconds !== undefined) { - $('#overlay_countdown_inner').html(seconds); } } - setInterval('update_countdown()', 200); - -function normalise(i) { - if(i < 10) { - i = "0" + i; - } - return i; -} - diff --git a/openslides/projector/static/styles/dashboard.css b/openslides/projector/static/styles/dashboard.css index 020f7a103..56313cbe6 100644 --- a/openslides/projector/static/styles/dashboard.css +++ b/openslides/projector/static/styles/dashboard.css @@ -55,7 +55,6 @@ .widget-header .icon-pushpin { background-image: url("../img/glyphicons_335_pushpin.png"); background-position: 0 center; - margin-left:4px !important; } .widget-content { padding: 0px 15px 0px 13px; @@ -65,6 +64,9 @@ -moz-border-radius: 0 0 5px 5px; -webkit-border-radius: 0 0 5px 5px; } +.widget-content-inner { + margin-top: 10px; +} .widget-content li { padding: 4px 0; } @@ -128,3 +130,11 @@ display: block; z-index: 1; } + +.custom-btn-mini { + width: 20px; +} +.custom-btn-mini i { + -moz-margin-start: 4px !important; + margin-left: -6px; +} diff --git a/openslides/projector/templates/projector/custom_slide_widget.html b/openslides/projector/templates/projector/custom_slide_widget.html index fe0062ec3..a979e2fc7 100644 --- a/openslides/projector/templates/projector/custom_slide_widget.html +++ b/openslides/projector/templates/projector/custom_slide_widget.html @@ -3,10 +3,12 @@
    • - +   - + {% get_config 'welcome_title' %} @@ -16,17 +18,21 @@ -

      - + {% trans 'New' %} -

      diff --git a/openslides/projector/templates/projector/dashboard.html b/openslides/projector/templates/projector/dashboard.html index 6e12bd2c9..d2a41d157 100644 --- a/openslides/projector/templates/projector/dashboard.html +++ b/openslides/projector/templates/projector/dashboard.html @@ -36,7 +36,7 @@ _
      -
      @@ -44,7 +44,7 @@
      -
      {{ widget.html }}
      +
      {{ widget.html }}
      {% endif %} @@ -65,7 +65,7 @@ _
      -
      @@ -73,7 +73,7 @@
      -
      {{ widget.html }}
      +
      {{ widget.html }}
      {% endif %} diff --git a/openslides/projector/templates/projector/overlay_countdown_projector.html b/openslides/projector/templates/projector/overlay_countdown_projector.html index 0dc98ef1c..1fb23ae67 100644 --- a/openslides/projector/templates/projector/overlay_countdown_projector.html +++ b/openslides/projector/templates/projector/overlay_countdown_projector.html @@ -11,7 +11,9 @@ text-align: center; border-radius: 0 0 0.2em 0.2em; } +#overlay_countdown_inner.negative { + color: #CC0000; +} -
      -
      +
      diff --git a/openslides/projector/templates/projector/overlay_countdown_widget.html b/openslides/projector/templates/projector/overlay_countdown_widget.html index 22152373e..09d1a92ed 100644 --- a/openslides/projector/templates/projector/overlay_countdown_widget.html +++ b/openslides/projector/templates/projector/overlay_countdown_widget.html @@ -6,17 +6,23 @@
      {% trans "s" context "seconds" %} -
      - + - - diff --git a/openslides/projector/templates/projector/overlay_message_projector.html b/openslides/projector/templates/projector/overlay_message_projector.html index 20a7616cf..80328a242 100644 --- a/openslides/projector/templates/projector/overlay_message_projector.html +++ b/openslides/projector/templates/projector/overlay_message_projector.html @@ -5,15 +5,16 @@ left: 10%; width: 80%; text-align: center; - border-radius: 0.2em; + border-radius: 0.5em; background: #FFFFFF; font-size: 2.75em; padding: 0.2em 0; + line-height: normal !important; }
      - {{ message }} + {{ message|safe }}
      diff --git a/openslides/projector/templates/projector/overlay_message_widget.html b/openslides/projector/templates/projector/overlay_message_widget.html index fff6b0d22..ce658a77d 100644 --- a/openslides/projector/templates/projector/overlay_message_widget.html +++ b/openslides/projector/templates/projector/overlay_message_widget.html @@ -6,10 +6,12 @@ {% csrf_token %}
      - -
      diff --git a/openslides/templates/base.html b/openslides/templates/base.html index a8c256f30..40fcb0584 100644 --- a/openslides/templates/base.html +++ b/openslides/templates/base.html @@ -29,9 +29,9 @@ {% block loginbutton %}
      - +
      - +