diff --git a/openslides/projector/static/javascript/projector.js b/openslides/projector/static/javascript/projector.js index c999f0e1c..c4921deac 100644 --- a/openslides/projector/static/javascript/projector.js +++ b/openslides/projector/static/javascript/projector.js @@ -27,7 +27,10 @@ function presentation_reload() { $('#scrollcontent').animate({'margin-top': data.up + 'em'}, 200); // overlays $('#overlays div').remove(); + $('#overlays span').remove(); $.each(data['overlays'], function (index, value){ + if (value[0] != "Countdown") + $('#overlays').append('') $('#overlays').append('
' + value[1] + '
'); }); setTimeout("presentation_reload()", 500); diff --git a/openslides/projector/static/styles/projector.css b/openslides/projector/static/styles/projector.css index 6714f2319..8f0e09572 100644 --- a/openslides/projector/static/styles/projector.css +++ b/openslides/projector/static/styles/projector.css @@ -63,26 +63,40 @@ body{ #currentTime.ajax_error { border-bottom: 4px solid red; } - +#overlay_transparent { + background-color: #777777; + opacity: 0.6; + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; +} #overlays div { - font-size: 4em; - font-weight: bold; - padding: 0 1em; - position: fixed; - - background: #DDD9D9; - border-bottom-left-radius: 0.75em; - border-bottom-right-radius: 0.75em; } #overlay_Countdown { + position: absolute; right: 40px; top: 0; + font-size: 4em; + font-weight: bold; + border-bottom-left-radius: 0.5em; + border-bottom-right-radius: 0.5em; + background: #DDD9D9; + padding: 0 1em; } #overlay_Message { - right: 20%; - top: 50%; + position: absolute; + top: 25%; + left: 10%; + width: 80%; + text-align: center; + border-radius: 0.2em; + background: #FFFFFF; + font-size: 3.75em; + padding: 0.2em 0; } /*** CONTENT ***/ diff --git a/openslides/projector/templates/base-projector.html b/openslides/projector/templates/base-projector.html index c7b1b7bcd..a7a5ac98b 100644 --- a/openslides/projector/templates/base-projector.html +++ b/openslides/projector/templates/base-projector.html @@ -32,9 +32,11 @@
{% for overlay in overlays %} -
{{ overlay.1 }}
+ {% if overlay.0 != "Countdown" %} + + {% endif %} +
{{ overlay.1|safe }}
{% endfor %} -