From 03792c0b052d56a52307a8e25f0a5e08841b8d62 Mon Sep 17 00:00:00 2001 From: Oskar Hahn Date: Mon, 16 Apr 2012 17:14:39 +0200 Subject: [PATCH] put projector message in the center of the presentation --- .../projector/static/javascript/projector.js | 5 +++-- openslides/projector/static/styles/projector.css | 14 +++++++++++--- openslides/projector/templates/base-projector.html | 3 +-- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/openslides/projector/static/javascript/projector.js b/openslides/projector/static/javascript/projector.js index 53e1e941a..6ba261696 100644 --- a/openslides/projector/static/javascript/projector.js +++ b/openslides/projector/static/javascript/projector.js @@ -15,9 +15,10 @@ function presentation_reload() { $('#content li').css({'font-size': data.bigger + '%'}, 200); $('#content #sidebar').css({'font-size': '16px'}, 0); $('#content').animate({'margin-top': data.up + 'em'}, 200); - $('#overlays li').remove(); + + $('#overlays div').remove(); $.each(data['overlays'], function (index, value){ - $('#overlays ul').append('
  • ' + value[1] + '
  • '); + $('#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 40c203bd6..84bfc008e 100644 --- a/openslides/projector/static/styles/projector.css +++ b/openslides/projector/static/styles/projector.css @@ -61,18 +61,26 @@ body{ border-bottom: 4px solid red; } -#overlays ul li { +#overlays div { font-size: 4em; font-weight: bold; padding: 0 1em; position: fixed; - right: 40px; - top: 0; + background: #DDD9D9; border-bottom-left-radius: 0.75em; border-bottom-right-radius: 0.75em; } +#overlay_Countdown { + right: 40px; + top: 0; +} + +#overlay_Message { + right: 20%; + top: 50%; +} /*** CONTENT ***/ #content { diff --git a/openslides/projector/templates/base-projector.html b/openslides/projector/templates/base-projector.html index 8a0e6d268..8e279bd50 100644 --- a/openslides/projector/templates/base-projector.html +++ b/openslides/projector/templates/base-projector.html @@ -31,9 +31,8 @@
    -