From 198eefbfdd77abd351e8c7d85a8352edb848e05f Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Wed, 4 Jul 2012 02:43:26 +0200
Subject: [PATCH] rewrote projector overlay widget

---
 openslides/locale/de/LC_MESSAGES/django.mo    |  Bin 33713 -> 33715 bytes
 openslides/locale/de/LC_MESSAGES/django.po    |    2 +-
 .../static/javascript/jquery.form.js          | 1076 +++++++++++++++++
 .../static/javascript/projector-control.js    |  112 +-
 .../static/styles/projector-control.css       |   58 +-
 .../templates/projector/control.html          |  184 +--
 .../projector/control_countdown.html          |   19 +
 .../projector/control_overlay_message.html    |   14 +
 openslides/projector/urls.py                  |   29 +-
 openslides/projector/views.py                 |   37 +-
 10 files changed, 1311 insertions(+), 220 deletions(-)
 create mode 100644 openslides/projector/static/javascript/jquery.form.js
 create mode 100644 openslides/projector/templates/projector/control_countdown.html
 create mode 100644 openslides/projector/templates/projector/control_overlay_message.html

diff --git a/openslides/locale/de/LC_MESSAGES/django.mo b/openslides/locale/de/LC_MESSAGES/django.mo
index 652062190e2b428b67c534925cd9f085ed381477..5004ec853acea3ce296b3e4a6bc1f5a0edf1d5ad 100644
GIT binary patch
delta 75
zcmdnk&a}CmX~Q0AU1kObhQwwD1|cAw3Z!{}bOn$W2hy!TniojV1=8$5diCa)(sd?G
TMh2TR1AZDYrDjh~YW4>JZ^{x5

delta 72
zcmdno&a|<eX~Q0AT}B25hQwwD1|cAw45WF0bQzEq2hz<zniojV2GZ<6dgbPq(sd?G
QhUS|y1AZD!PHFZB06Sk1H~;_u

diff --git a/openslides/locale/de/LC_MESSAGES/django.po b/openslides/locale/de/LC_MESSAGES/django.po
index 775b1bc87..91dbcfdaa 100644
--- a/openslides/locale/de/LC_MESSAGES/django.po
+++ b/openslides/locale/de/LC_MESSAGES/django.po
@@ -2105,7 +2105,7 @@ msgstr "Einblendungen"
 
 #: projector/templates/projector/control.html:193
 msgid "sec"
-msgstr "s"
+msgstr "sek"
 
 #: projector/templates/projector/control.html:194
 msgid "Save as default"
diff --git a/openslides/projector/static/javascript/jquery.form.js b/openslides/projector/static/javascript/jquery.form.js
new file mode 100644
index 000000000..796db12fb
--- /dev/null
+++ b/openslides/projector/static/javascript/jquery.form.js
@@ -0,0 +1,1076 @@
+/*!
+ * jQuery Form Plugin
+ * version: 3.09 (16-APR-2012)
+ * @requires jQuery v1.3.2 or later
+ *
+ * Examples and documentation at: http://malsup.com/jquery/form/
+ * Project repository: https://github.com/malsup/form
+ * Dual licensed under the MIT and GPL licenses:
+ *    http://malsup.github.com/mit-license.txt
+ *    http://malsup.github.com/gpl-license-v2.txt
+ */
+/*global ActiveXObject alert */
+;(function($) {
+"use strict";
+
+/*
+    Usage Note:
+    -----------
+    Do not use both ajaxSubmit and ajaxForm on the same form.  These
+    functions are mutually exclusive.  Use ajaxSubmit if you want
+    to bind your own submit handler to the form.  For example,
+
+    $(document).ready(function() {
+        $('#myForm').on('submit', function(e) {
+            e.preventDefault(); // <-- important
+            $(this).ajaxSubmit({
+                target: '#output'
+            });
+        });
+    });
+
+    Use ajaxForm when you want the plugin to manage all the event binding
+    for you.  For example,
+
+    $(document).ready(function() {
+        $('#myForm').ajaxForm({
+            target: '#output'
+        });
+    });
+    
+    You can also use ajaxForm with delegation (requires jQuery v1.7+), so the
+    form does not have to exist when you invoke ajaxForm:
+
+    $('#myForm').ajaxForm({
+        delegation: true,
+        target: '#output'
+    });
+    
+    When using ajaxForm, the ajaxSubmit function will be invoked for you
+    at the appropriate time.
+*/
+
+/**
+ * Feature detection
+ */
+var feature = {};
+feature.fileapi = $("<input type='file'/>").get(0).files !== undefined;
+feature.formdata = window.FormData !== undefined;
+
+/**
+ * ajaxSubmit() provides a mechanism for immediately submitting
+ * an HTML form using AJAX.
+ */
+$.fn.ajaxSubmit = function(options) {
+    /*jshint scripturl:true */
+
+    // fast fail if nothing selected (http://dev.jquery.com/ticket/2752)
+    if (!this.length) {
+        log('ajaxSubmit: skipping submit process - no element selected');
+        return this;
+    }
+    
+    var method, action, url, $form = this;
+
+    if (typeof options == 'function') {
+        options = { success: options };
+    }
+
+    method = this.attr('method');
+    action = this.attr('action');
+    url = (typeof action === 'string') ? $.trim(action) : '';
+    url = url || window.location.href || '';
+    if (url) {
+        // clean url (don't include hash vaue)
+        url = (url.match(/^([^#]+)/)||[])[1];
+    }
+
+    options = $.extend(true, {
+        url:  url,
+        success: $.ajaxSettings.success,
+        type: method || 'GET',
+        iframeSrc: /^https/i.test(window.location.href || '') ? 'javascript:false' : 'about:blank'
+    }, options);
+
+    // hook for manipulating the form data before it is extracted;
+    // convenient for use with rich editors like tinyMCE or FCKEditor
+    var veto = {};
+    this.trigger('form-pre-serialize', [this, options, veto]);
+    if (veto.veto) {
+        log('ajaxSubmit: submit vetoed via form-pre-serialize trigger');
+        return this;
+    }
+
+    // provide opportunity to alter form data before it is serialized
+    if (options.beforeSerialize && options.beforeSerialize(this, options) === false) {
+        log('ajaxSubmit: submit aborted via beforeSerialize callback');
+        return this;
+    }
+
+    var traditional = options.traditional;
+    if ( traditional === undefined ) {
+        traditional = $.ajaxSettings.traditional;
+    }
+    
+    var elements = [];
+    var qx, a = this.formToArray(options.semantic, elements);
+    if (options.data) {
+        options.extraData = options.data;
+        qx = $.param(options.data, traditional);
+    }
+
+    // give pre-submit callback an opportunity to abort the submit
+    if (options.beforeSubmit && options.beforeSubmit(a, this, options) === false) {
+        log('ajaxSubmit: submit aborted via beforeSubmit callback');
+        return this;
+    }
+
+    // fire vetoable 'validate' event
+    this.trigger('form-submit-validate', [a, this, options, veto]);
+    if (veto.veto) {
+        log('ajaxSubmit: submit vetoed via form-submit-validate trigger');
+        return this;
+    }
+
+    var q = $.param(a, traditional);
+    if (qx) {
+        q = ( q ? (q + '&' + qx) : qx );
+    }    
+    if (options.type.toUpperCase() == 'GET') {
+        options.url += (options.url.indexOf('?') >= 0 ? '&' : '?') + q;
+        options.data = null;  // data is null for 'get'
+    }
+    else {
+        options.data = q; // data is the query string for 'post'
+    }
+
+    var callbacks = [];
+    if (options.resetForm) {
+        callbacks.push(function() { $form.resetForm(); });
+    }
+    if (options.clearForm) {
+        callbacks.push(function() { $form.clearForm(options.includeHidden); });
+    }
+
+    // perform a load on the target only if dataType is not provided
+    if (!options.dataType && options.target) {
+        var oldSuccess = options.success || function(){};
+        callbacks.push(function(data) {
+            var fn = options.replaceTarget ? 'replaceWith' : 'html';
+            $(options.target)[fn](data).each(oldSuccess, arguments);
+        });
+    }
+    else if (options.success) {
+        callbacks.push(options.success);
+    }
+
+    options.success = function(data, status, xhr) { // jQuery 1.4+ passes xhr as 3rd arg
+        var context = options.context || options;    // jQuery 1.4+ supports scope context 
+        for (var i=0, max=callbacks.length; i < max; i++) {
+            callbacks[i].apply(context, [data, status, xhr || $form, $form]);
+        }
+    };
+
+    // are there files to upload?
+    var fileInputs = $('input:file:enabled[value]', this); // [value] (issue #113)
+    var hasFileInputs = fileInputs.length > 0;
+    var mp = 'multipart/form-data';
+    var multipart = ($form.attr('enctype') == mp || $form.attr('encoding') == mp);
+
+    var fileAPI = feature.fileapi && feature.formdata;
+    log("fileAPI :" + fileAPI);
+    var shouldUseFrame = (hasFileInputs || multipart) && !fileAPI;
+
+    // options.iframe allows user to force iframe mode
+    // 06-NOV-09: now defaulting to iframe mode if file input is detected
+    if (options.iframe !== false && (options.iframe || shouldUseFrame)) {
+        // hack to fix Safari hang (thanks to Tim Molendijk for this)
+        // see:  http://groups.google.com/group/jquery-dev/browse_thread/thread/36395b7ab510dd5d
+        if (options.closeKeepAlive) {
+            $.get(options.closeKeepAlive, function() {
+                fileUploadIframe(a);
+            });
+        }
+          else {
+            fileUploadIframe(a);
+          }
+    }
+    else if ((hasFileInputs || multipart) && fileAPI) {
+        fileUploadXhr(a);
+    }
+    else {
+        $.ajax(options);
+    }
+
+    // clear element array
+    for (var k=0; k < elements.length; k++)
+        elements[k] = null;
+
+    // fire 'notify' event
+    this.trigger('form-submit-notify', [this, options]);
+    return this;
+
+     // XMLHttpRequest Level 2 file uploads (big hat tip to francois2metz)
+    function fileUploadXhr(a) {
+        var formdata = new FormData();
+
+        for (var i=0; i < a.length; i++) {
+            formdata.append(a[i].name, a[i].value);
+        }
+
+        if (options.extraData) {
+            for (var p in options.extraData)
+                if (options.extraData.hasOwnProperty(p))
+                    formdata.append(p, options.extraData[p]);
+        }
+
+        options.data = null;
+
+        var s = $.extend(true, {}, $.ajaxSettings, options, {
+            contentType: false,
+            processData: false,
+            cache: false,
+            type: 'POST'
+        });
+        
+        if (options.uploadProgress) {
+            // workaround because jqXHR does not expose upload property
+            s.xhr = function() {
+                var xhr = jQuery.ajaxSettings.xhr();
+                if (xhr.upload) {
+                    xhr.upload.onprogress = function(event) {
+                        var percent = 0;
+                        var position = event.loaded || event.position; /*event.position is deprecated*/
+                        var total = event.total;
+                        if (event.lengthComputable) {
+                            percent = Math.ceil(position / total * 100);
+                        }
+                        options.uploadProgress(event, position, total, percent);
+                    };
+                }
+                return xhr;
+            };
+        }
+
+        s.data = null;
+          var beforeSend = s.beforeSend;
+          s.beforeSend = function(xhr, o) {
+              o.data = formdata;
+            if(beforeSend)
+                beforeSend.call(o, xhr, options);
+        };
+        $.ajax(s);
+    }
+
+    // private function for handling file uploads (hat tip to YAHOO!)
+    function fileUploadIframe(a) {
+        var form = $form[0], el, i, s, g, id, $io, io, xhr, sub, n, timedOut, timeoutHandle;
+        var useProp = !!$.fn.prop;
+
+        if ($(':input[name=submit],:input[id=submit]', form).length) {
+            // if there is an input with a name or id of 'submit' then we won't be
+            // able to invoke the submit fn on the form (at least not x-browser)
+            alert('Error: Form elements must not have name or id of "submit".');
+            return;
+        }
+        
+        if (a) {
+            // ensure that every serialized input is still enabled
+            for (i=0; i < elements.length; i++) {
+                el = $(elements[i]);
+                if ( useProp )
+                    el.prop('disabled', false);
+                else
+                    el.removeAttr('disabled');
+            }
+        }
+
+        s = $.extend(true, {}, $.ajaxSettings, options);
+        s.context = s.context || s;
+        id = 'jqFormIO' + (new Date().getTime());
+        if (s.iframeTarget) {
+            $io = $(s.iframeTarget);
+            n = $io.attr('name');
+            if (!n)
+                 $io.attr('name', id);
+            else
+                id = n;
+        }
+        else {
+            $io = $('<iframe name="' + id + '" src="'+ s.iframeSrc +'" />');
+            $io.css({ position: 'absolute', top: '-1000px', left: '-1000px' });
+        }
+        io = $io[0];
+
+
+        xhr = { // mock object
+            aborted: 0,
+            responseText: null,
+            responseXML: null,
+            status: 0,
+            statusText: 'n/a',
+            getAllResponseHeaders: function() {},
+            getResponseHeader: function() {},
+            setRequestHeader: function() {},
+            abort: function(status) {
+                var e = (status === 'timeout' ? 'timeout' : 'aborted');
+                log('aborting upload... ' + e);
+                this.aborted = 1;
+                $io.attr('src', s.iframeSrc); // abort op in progress
+                xhr.error = e;
+                if (s.error)
+                    s.error.call(s.context, xhr, e, status);
+                if (g)
+                    $.event.trigger("ajaxError", [xhr, s, e]);
+                if (s.complete)
+                    s.complete.call(s.context, xhr, e);
+            }
+        };
+
+        g = s.global;
+        // trigger ajax global events so that activity/block indicators work like normal
+        if (g && 0 === $.active++) {
+            $.event.trigger("ajaxStart");
+        }
+        if (g) {
+            $.event.trigger("ajaxSend", [xhr, s]);
+        }
+
+        if (s.beforeSend && s.beforeSend.call(s.context, xhr, s) === false) {
+            if (s.global) {
+                $.active--;
+            }
+            return;
+        }
+        if (xhr.aborted) {
+            return;
+        }
+
+        // add submitting element to data if we know it
+        sub = form.clk;
+        if (sub) {
+            n = sub.name;
+            if (n && !sub.disabled) {
+                s.extraData = s.extraData || {};
+                s.extraData[n] = sub.value;
+                if (sub.type == "image") {
+                    s.extraData[n+'.x'] = form.clk_x;
+                    s.extraData[n+'.y'] = form.clk_y;
+                }
+            }
+        }
+        
+        var CLIENT_TIMEOUT_ABORT = 1;
+        var SERVER_ABORT = 2;
+
+        function getDoc(frame) {
+            var doc = frame.contentWindow ? frame.contentWindow.document : frame.contentDocument ? frame.contentDocument : frame.document;
+            return doc;
+        }
+        
+        // Rails CSRF hack (thanks to Yvan Barthelemy)
+        var csrf_token = $('meta[name=csrf-token]').attr('content');
+        var csrf_param = $('meta[name=csrf-param]').attr('content');
+        if (csrf_param && csrf_token) {
+            s.extraData = s.extraData || {};
+            s.extraData[csrf_param] = csrf_token;
+        }
+
+        // take a breath so that pending repaints get some cpu time before the upload starts
+        function doSubmit() {
+            // make sure form attrs are set
+            var t = $form.attr('target'), a = $form.attr('action');
+
+            // update form attrs in IE friendly way
+            form.setAttribute('target',id);
+            if (!method) {
+                form.setAttribute('method', 'POST');
+            }
+            if (a != s.url) {
+                form.setAttribute('action', s.url);
+            }
+
+            // ie borks in some cases when setting encoding
+            if (! s.skipEncodingOverride && (!method || /post/i.test(method))) {
+                $form.attr({
+                    encoding: 'multipart/form-data',
+                    enctype:  'multipart/form-data'
+                });
+            }
+
+            // support timout
+            if (s.timeout) {
+                timeoutHandle = setTimeout(function() { timedOut = true; cb(CLIENT_TIMEOUT_ABORT); }, s.timeout);
+            }
+            
+            // look for server aborts
+            function checkState() {
+                try {
+                    var state = getDoc(io).readyState;
+                    log('state = ' + state);
+                    if (state && state.toLowerCase() == 'uninitialized')
+                        setTimeout(checkState,50);
+                }
+                catch(e) {
+                    log('Server abort: ' , e, ' (', e.name, ')');
+                    cb(SERVER_ABORT);
+                    if (timeoutHandle)
+                        clearTimeout(timeoutHandle);
+                    timeoutHandle = undefined;
+                }
+            }
+
+            // add "extra" data to form if provided in options
+            var extraInputs = [];
+            try {
+                if (s.extraData) {
+                    for (var n in s.extraData) {
+                        if (s.extraData.hasOwnProperty(n)) {
+                            extraInputs.push(
+                                $('<input type="hidden" name="'+n+'">').attr('value',s.extraData[n])
+                                    .appendTo(form)[0]);
+                        }
+                    }
+                }
+
+                if (!s.iframeTarget) {
+                    // add iframe to doc and submit the form
+                    $io.appendTo('body');
+                    if (io.attachEvent)
+                        io.attachEvent('onload', cb);
+                    else
+                        io.addEventListener('load', cb, false);
+                }
+                setTimeout(checkState,15);
+                form.submit();
+            }
+            finally {
+                // reset attrs and remove "extra" input elements
+                form.setAttribute('action',a);
+                if(t) {
+                    form.setAttribute('target', t);
+                } else {
+                    $form.removeAttr('target');
+                }
+                $(extraInputs).remove();
+            }
+        }
+
+        if (s.forceSync) {
+            doSubmit();
+        }
+        else {
+            setTimeout(doSubmit, 10); // this lets dom updates render
+        }
+
+        var data, doc, domCheckCount = 50, callbackProcessed;
+
+        function cb(e) {
+            if (xhr.aborted || callbackProcessed) {
+                return;
+            }
+            try {
+                doc = getDoc(io);
+            }
+            catch(ex) {
+                log('cannot access response document: ', ex);
+                e = SERVER_ABORT;
+            }
+            if (e === CLIENT_TIMEOUT_ABORT && xhr) {
+                xhr.abort('timeout');
+                return;
+            }
+            else if (e == SERVER_ABORT && xhr) {
+                xhr.abort('server abort');
+                return;
+            }
+
+            if (!doc || doc.location.href == s.iframeSrc) {
+                // response not received yet
+                if (!timedOut)
+                    return;
+            }
+            if (io.detachEvent)
+                io.detachEvent('onload', cb);
+            else    
+                io.removeEventListener('load', cb, false);
+
+            var status = 'success', errMsg;
+            try {
+                if (timedOut) {
+                    throw 'timeout';
+                }
+
+                var isXml = s.dataType == 'xml' || doc.XMLDocument || $.isXMLDoc(doc);
+                log('isXml='+isXml);
+                if (!isXml && window.opera && (doc.body === null || !doc.body.innerHTML)) {
+                    if (--domCheckCount) {
+                        // in some browsers (Opera) the iframe DOM is not always traversable when
+                        // the onload callback fires, so we loop a bit to accommodate
+                        log('requeing onLoad callback, DOM not available');
+                        setTimeout(cb, 250);
+                        return;
+                    }
+                    // let this fall through because server response could be an empty document
+                    //log('Could not access iframe DOM after mutiple tries.');
+                    //throw 'DOMException: not available';
+                }
+
+                //log('response detected');
+                var docRoot = doc.body ? doc.body : doc.documentElement;
+                xhr.responseText = docRoot ? docRoot.innerHTML : null;
+                xhr.responseXML = doc.XMLDocument ? doc.XMLDocument : doc;
+                if (isXml)
+                    s.dataType = 'xml';
+                xhr.getResponseHeader = function(header){
+                    var headers = {'content-type': s.dataType};
+                    return headers[header];
+                };
+                // support for XHR 'status' & 'statusText' emulation :
+                if (docRoot) {
+                    xhr.status = Number( docRoot.getAttribute('status') ) || xhr.status;
+                    xhr.statusText = docRoot.getAttribute('statusText') || xhr.statusText;
+                }
+
+                var dt = (s.dataType || '').toLowerCase();
+                var scr = /(json|script|text)/.test(dt);
+                if (scr || s.textarea) {
+                    // see if user embedded response in textarea
+                    var ta = doc.getElementsByTagName('textarea')[0];
+                    if (ta) {
+                        xhr.responseText = ta.value;
+                        // support for XHR 'status' & 'statusText' emulation :
+                        xhr.status = Number( ta.getAttribute('status') ) || xhr.status;
+                        xhr.statusText = ta.getAttribute('statusText') || xhr.statusText;
+                    }
+                    else if (scr) {
+                        // account for browsers injecting pre around json response
+                        var pre = doc.getElementsByTagName('pre')[0];
+                        var b = doc.getElementsByTagName('body')[0];
+                        if (pre) {
+                            xhr.responseText = pre.textContent ? pre.textContent : pre.innerText;
+                        }
+                        else if (b) {
+                            xhr.responseText = b.textContent ? b.textContent : b.innerText;
+                        }
+                    }
+                }
+                else if (dt == 'xml' && !xhr.responseXML && xhr.responseText) {
+                    xhr.responseXML = toXml(xhr.responseText);
+                }
+
+                try {
+                    data = httpData(xhr, dt, s);
+                }
+                catch (e) {
+                    status = 'parsererror';
+                    xhr.error = errMsg = (e || status);
+                }
+            }
+            catch (e) {
+                log('error caught: ',e);
+                status = 'error';
+                xhr.error = errMsg = (e || status);
+            }
+
+            if (xhr.aborted) {
+                log('upload aborted');
+                status = null;
+            }
+
+            if (xhr.status) { // we've set xhr.status
+                status = (xhr.status >= 200 && xhr.status < 300 || xhr.status === 304) ? 'success' : 'error';
+            }
+
+            // ordering of these callbacks/triggers is odd, but that's how $.ajax does it
+            if (status === 'success') {
+                if (s.success)
+                    s.success.call(s.context, data, 'success', xhr);
+                if (g)
+                    $.event.trigger("ajaxSuccess", [xhr, s]);
+            }
+            else if (status) {
+                if (errMsg === undefined)
+                    errMsg = xhr.statusText;
+                if (s.error)
+                    s.error.call(s.context, xhr, status, errMsg);
+                if (g)
+                    $.event.trigger("ajaxError", [xhr, s, errMsg]);
+            }
+
+            if (g)
+                $.event.trigger("ajaxComplete", [xhr, s]);
+
+            if (g && ! --$.active) {
+                $.event.trigger("ajaxStop");
+            }
+
+            if (s.complete)
+                s.complete.call(s.context, xhr, status);
+
+            callbackProcessed = true;
+            if (s.timeout)
+                clearTimeout(timeoutHandle);
+
+            // clean up
+            setTimeout(function() {
+                if (!s.iframeTarget)
+                    $io.remove();
+                xhr.responseXML = null;
+            }, 100);
+        }
+
+        var toXml = $.parseXML || function(s, doc) { // use parseXML if available (jQuery 1.5+)
+            if (window.ActiveXObject) {
+                doc = new ActiveXObject('Microsoft.XMLDOM');
+                doc.async = 'false';
+                doc.loadXML(s);
+            }
+            else {
+                doc = (new DOMParser()).parseFromString(s, 'text/xml');
+            }
+            return (doc && doc.documentElement && doc.documentElement.nodeName != 'parsererror') ? doc : null;
+        };
+        var parseJSON = $.parseJSON || function(s) {
+            /*jslint evil:true */
+            return window['eval']('(' + s + ')');
+        };
+
+        var httpData = function( xhr, type, s ) { // mostly lifted from jq1.4.4
+
+            var ct = xhr.getResponseHeader('content-type') || '',
+                xml = type === 'xml' || !type && ct.indexOf('xml') >= 0,
+                data = xml ? xhr.responseXML : xhr.responseText;
+
+            if (xml && data.documentElement.nodeName === 'parsererror') {
+                if ($.error)
+                    $.error('parsererror');
+            }
+            if (s && s.dataFilter) {
+                data = s.dataFilter(data, type);
+            }
+            if (typeof data === 'string') {
+                if (type === 'json' || !type && ct.indexOf('json') >= 0) {
+                    data = parseJSON(data);
+                } else if (type === "script" || !type && ct.indexOf("javascript") >= 0) {
+                    $.globalEval(data);
+                }
+            }
+            return data;
+        };
+    }
+};
+
+/**
+ * ajaxForm() provides a mechanism for fully automating form submission.
+ *
+ * The advantages of using this method instead of ajaxSubmit() are:
+ *
+ * 1: This method will include coordinates for <input type="image" /> elements (if the element
+ *    is used to submit the form).
+ * 2. This method will include the submit element's name/value data (for the element that was
+ *    used to submit the form).
+ * 3. This method binds the submit() method to the form for you.
+ *
+ * The options argument for ajaxForm works exactly as it does for ajaxSubmit.  ajaxForm merely
+ * passes the options argument along after properly binding events for submit elements and
+ * the form itself.
+ */
+$.fn.ajaxForm = function(options) {
+    options = options || {};
+    options.delegation = options.delegation && $.isFunction($.fn.on);
+    
+    // in jQuery 1.3+ we can fix mistakes with the ready state
+    if (!options.delegation && this.length === 0) {
+        var o = { s: this.selector, c: this.context };
+        if (!$.isReady && o.s) {
+            log('DOM not ready, queuing ajaxForm');
+            $(function() {
+                $(o.s,o.c).ajaxForm(options);
+            });
+            return this;
+        }
+        // is your DOM ready?  http://docs.jquery.com/Tutorials:Introducing_$(document).ready()
+        log('terminating; zero elements found by selector' + ($.isReady ? '' : ' (DOM not ready)'));
+        return this;
+    }
+
+    if ( options.delegation ) {
+        $(document)
+            .off('submit.form-plugin', this.selector, doAjaxSubmit)
+            .off('click.form-plugin', this.selector, captureSubmittingElement)
+            .on('submit.form-plugin', this.selector, options, doAjaxSubmit)
+            .on('click.form-plugin', this.selector, options, captureSubmittingElement);
+        return this;
+    }
+
+    return this.ajaxFormUnbind()
+        .bind('submit.form-plugin', options, doAjaxSubmit)
+        .bind('click.form-plugin', options, captureSubmittingElement);
+};
+
+// private event handlers    
+function doAjaxSubmit(e) {
+    /*jshint validthis:true */
+    var options = e.data;
+    if (!e.isDefaultPrevented()) { // if event has been canceled, don't proceed
+        e.preventDefault();
+        $(this).ajaxSubmit(options);
+    }
+}
+    
+function captureSubmittingElement(e) {
+    /*jshint validthis:true */
+    var target = e.target;
+    var $el = $(target);
+    if (!($el.is(":submit,input:image"))) {
+        // is this a child element of the submit el?  (ex: a span within a button)
+        var t = $el.closest(':submit');
+        if (t.length === 0) {
+            return;
+        }
+        target = t[0];
+    }
+    var form = this;
+    form.clk = target;
+    if (target.type == 'image') {
+        if (e.offsetX !== undefined) {
+            form.clk_x = e.offsetX;
+            form.clk_y = e.offsetY;
+        } else if (typeof $.fn.offset == 'function') {
+            var offset = $el.offset();
+            form.clk_x = e.pageX - offset.left;
+            form.clk_y = e.pageY - offset.top;
+        } else {
+            form.clk_x = e.pageX - target.offsetLeft;
+            form.clk_y = e.pageY - target.offsetTop;
+        }
+    }
+    // clear form vars
+    setTimeout(function() { form.clk = form.clk_x = form.clk_y = null; }, 100);
+}
+
+
+// ajaxFormUnbind unbinds the event handlers that were bound by ajaxForm
+$.fn.ajaxFormUnbind = function() {
+    return this.unbind('submit.form-plugin click.form-plugin');
+};
+
+/**
+ * formToArray() gathers form element data into an array of objects that can
+ * be passed to any of the following ajax functions: $.get, $.post, or load.
+ * Each object in the array has both a 'name' and 'value' property.  An example of
+ * an array for a simple login form might be:
+ *
+ * [ { name: 'username', value: 'jresig' }, { name: 'password', value: 'secret' } ]
+ *
+ * It is this array that is passed to pre-submit callback functions provided to the
+ * ajaxSubmit() and ajaxForm() methods.
+ */
+$.fn.formToArray = function(semantic, elements) {
+    var a = [];
+    if (this.length === 0) {
+        return a;
+    }
+
+    var form = this[0];
+    var els = semantic ? form.getElementsByTagName('*') : form.elements;
+    if (!els) {
+        return a;
+    }
+
+    var i,j,n,v,el,max,jmax;
+    for(i=0, max=els.length; i < max; i++) {
+        el = els[i];
+        n = el.name;
+        if (!n) {
+            continue;
+        }
+
+        if (semantic && form.clk && el.type == "image") {
+            // handle image inputs on the fly when semantic == true
+            if(!el.disabled && form.clk == el) {
+                a.push({name: n, value: $(el).val(), type: el.type });
+                a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
+            }
+            continue;
+        }
+
+        v = $.fieldValue(el, true);
+        if (v && v.constructor == Array) {
+            if (elements) 
+                elements.push(el);
+            for(j=0, jmax=v.length; j < jmax; j++) {
+                a.push({name: n, value: v[j]});
+            }
+        }
+        else if (feature.fileapi && el.type == 'file' && !el.disabled) {
+            if (elements) 
+                elements.push(el);
+            var files = el.files;
+            if (files.length) {
+                for (j=0; j < files.length; j++) {
+                    a.push({name: n, value: files[j], type: el.type});
+                }
+            }
+            else {
+                // #180
+                a.push({ name: n, value: '', type: el.type });
+            }
+        }
+        else if (v !== null && typeof v != 'undefined') {
+            if (elements) 
+                elements.push(el);
+            a.push({name: n, value: v, type: el.type, required: el.required});
+        }
+    }
+
+    if (!semantic && form.clk) {
+        // input type=='image' are not found in elements array! handle it here
+        var $input = $(form.clk), input = $input[0];
+        n = input.name;
+        if (n && !input.disabled && input.type == 'image') {
+            a.push({name: n, value: $input.val()});
+            a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
+        }
+    }
+    return a;
+};
+
+/**
+ * Serializes form data into a 'submittable' string. This method will return a string
+ * in the format: name1=value1&amp;name2=value2
+ */
+$.fn.formSerialize = function(semantic) {
+    //hand off to jQuery.param for proper encoding
+    return $.param(this.formToArray(semantic));
+};
+
+/**
+ * Serializes all field elements in the jQuery object into a query string.
+ * This method will return a string in the format: name1=value1&amp;name2=value2
+ */
+$.fn.fieldSerialize = function(successful) {
+    var a = [];
+    this.each(function() {
+        var n = this.name;
+        if (!n) {
+            return;
+        }
+        var v = $.fieldValue(this, successful);
+        if (v && v.constructor == Array) {
+            for (var i=0,max=v.length; i < max; i++) {
+                a.push({name: n, value: v[i]});
+            }
+        }
+        else if (v !== null && typeof v != 'undefined') {
+            a.push({name: this.name, value: v});
+        }
+    });
+    //hand off to jQuery.param for proper encoding
+    return $.param(a);
+};
+
+/**
+ * Returns the value(s) of the element in the matched set.  For example, consider the following form:
+ *
+ *  <form><fieldset>
+ *      <input name="A" type="text" />
+ *      <input name="A" type="text" />
+ *      <input name="B" type="checkbox" value="B1" />
+ *      <input name="B" type="checkbox" value="B2"/>
+ *      <input name="C" type="radio" value="C1" />
+ *      <input name="C" type="radio" value="C2" />
+ *  </fieldset></form>
+ *
+ *  var v = $(':text').fieldValue();
+ *  // if no values are entered into the text inputs
+ *  v == ['','']
+ *  // if values entered into the text inputs are 'foo' and 'bar'
+ *  v == ['foo','bar']
+ *
+ *  var v = $(':checkbox').fieldValue();
+ *  // if neither checkbox is checked
+ *  v === undefined
+ *  // if both checkboxes are checked
+ *  v == ['B1', 'B2']
+ *
+ *  var v = $(':radio').fieldValue();
+ *  // if neither radio is checked
+ *  v === undefined
+ *  // if first radio is checked
+ *  v == ['C1']
+ *
+ * The successful argument controls whether or not the field element must be 'successful'
+ * (per http://www.w3.org/TR/html4/interact/forms.html#successful-controls).
+ * The default value of the successful argument is true.  If this value is false the value(s)
+ * for each element is returned.
+ *
+ * Note: This method *always* returns an array.  If no valid value can be determined the
+ *    array will be empty, otherwise it will contain one or more values.
+ */
+$.fn.fieldValue = function(successful) {
+    for (var val=[], i=0, max=this.length; i < max; i++) {
+        var el = this[i];
+        var v = $.fieldValue(el, successful);
+        if (v === null || typeof v == 'undefined' || (v.constructor == Array && !v.length)) {
+            continue;
+        }
+        if (v.constructor == Array)
+            $.merge(val, v);
+        else
+            val.push(v);
+    }
+    return val;
+};
+
+/**
+ * Returns the value of the field element.
+ */
+$.fieldValue = function(el, successful) {
+    var n = el.name, t = el.type, tag = el.tagName.toLowerCase();
+    if (successful === undefined) {
+        successful = true;
+    }
+
+    if (successful && (!n || el.disabled || t == 'reset' || t == 'button' ||
+        (t == 'checkbox' || t == 'radio') && !el.checked ||
+        (t == 'submit' || t == 'image') && el.form && el.form.clk != el ||
+        tag == 'select' && el.selectedIndex == -1)) {
+            return null;
+    }
+
+    if (tag == 'select') {
+        var index = el.selectedIndex;
+        if (index < 0) {
+            return null;
+        }
+        var a = [], ops = el.options;
+        var one = (t == 'select-one');
+        var max = (one ? index+1 : ops.length);
+        for(var i=(one ? index : 0); i < max; i++) {
+            var op = ops[i];
+            if (op.selected) {
+                var v = op.value;
+                if (!v) { // extra pain for IE...
+                    v = (op.attributes && op.attributes['value'] && !(op.attributes['value'].specified)) ? op.text : op.value;
+                }
+                if (one) {
+                    return v;
+                }
+                a.push(v);
+            }
+        }
+        return a;
+    }
+    return $(el).val();
+};
+
+/**
+ * Clears the form data.  Takes the following actions on the form's input fields:
+ *  - input text fields will have their 'value' property set to the empty string
+ *  - select elements will have their 'selectedIndex' property set to -1
+ *  - checkbox and radio inputs will have their 'checked' property set to false
+ *  - inputs of type submit, button, reset, and hidden will *not* be effected
+ *  - button elements will *not* be effected
+ */
+$.fn.clearForm = function(includeHidden) {
+    return this.each(function() {
+        $('input,select,textarea', this).clearFields(includeHidden);
+    });
+};
+
+/**
+ * Clears the selected form elements.
+ */
+$.fn.clearFields = $.fn.clearInputs = function(includeHidden) {
+    var re = /^(?:color|date|datetime|email|month|number|password|range|search|tel|text|time|url|week)$/i; // 'hidden' is not in this list
+    return this.each(function() {
+        var t = this.type, tag = this.tagName.toLowerCase();
+        if (re.test(t) || tag == 'textarea') {
+            this.value = '';
+        }
+        else if (t == 'checkbox' || t == 'radio') {
+            this.checked = false;
+        }
+        else if (tag == 'select') {
+            this.selectedIndex = -1;
+        }
+        else if (includeHidden) {
+            // includeHidden can be the valud true, or it can be a selector string
+            // indicating a special test; for example:
+            //  $('#myForm').clearForm('.special:hidden')
+            // the above would clean hidden inputs that have the class of 'special'
+            if ( (includeHidden === true && /hidden/.test(t)) ||
+                 (typeof includeHidden == 'string' && $(this).is(includeHidden)) )
+                this.value = '';
+        }
+    });
+};
+
+/**
+ * Resets the form data.  Causes all form elements to be reset to their original value.
+ */
+$.fn.resetForm = function() {
+    return this.each(function() {
+        // guard against an input with the name of 'reset'
+        // note that IE reports the reset function as an 'object'
+        if (typeof this.reset == 'function' || (typeof this.reset == 'object' && !this.reset.nodeType)) {
+            this.reset();
+        }
+    });
+};
+
+/**
+ * Enables or disables any matching elements.
+ */
+$.fn.enable = function(b) {
+    if (b === undefined) {
+        b = true;
+    }
+    return this.each(function() {
+        this.disabled = !b;
+    });
+};
+
+/**
+ * Checks/unchecks any matching checkboxes or radio buttons and
+ * selects/deselects and matching option elements.
+ */
+$.fn.selected = function(select) {
+    if (select === undefined) {
+        select = true;
+    }
+    return this.each(function() {
+        var t = this.type;
+        if (t == 'checkbox' || t == 'radio') {
+            this.checked = select;
+        }
+        else if (this.tagName.toLowerCase() == 'option') {
+            var $sel = $(this).parent('select');
+            if (select && $sel[0] && $sel[0].type == 'select-one') {
+                // deselect all other options
+                $sel.find('option').selected(false);
+            }
+            this.selected = select;
+        }
+    });
+};
+
+// expose debug var
+$.fn.ajaxSubmit.debug = false;
+
+// helper fn for console logging
+function log() {
+    if (!$.fn.ajaxSubmit.debug) 
+        return;
+    var msg = '[jquery.form] ' + Array.prototype.join.call(arguments,'');
+    if (window.console && window.console.log) {
+        window.console.log(msg);
+    }
+    else if (window.opera && window.opera.postError) {
+        window.opera.postError(msg);
+    }
+}
+
+})(jQuery);
diff --git a/openslides/projector/static/javascript/projector-control.js b/openslides/projector/static/javascript/projector-control.js
index 1dac0be48..0cb33975e 100644
--- a/openslides/projector/static/javascript/projector-control.js
+++ b/openslides/projector/static/javascript/projector-control.js
@@ -5,7 +5,85 @@
  * :license: GNU GPL, see LICENSE for more details.
  */
 
+// function that writes the portlet list order to a cookie
+function saveOrder() {
+    $(".column").each(function(index, value){
+        var colid = value.id;
+        var cookieName = "cookie-" + colid;
+        // Get the order for this column.
+        var order = $('#' + colid).sortable("toArray");
+        // For each portlet in the column
+        for ( var i = 0, n = order.length; i < n; i++ ) {
+            // Determine if it is 'opened' or 'closed'
+            var v = $('#' + order[i] ).find('.portlet-content').is(':visible');
+            // Modify the array we're saving to indicate what's open and
+            //  what's not.
+            order[i] = order[i] + ":" + v;
+        }
+        $.cookie(cookieName, order, { path: "/", expiry: new Date(2012, 1, 1)});
+    });
+}
+
+// function that restores the portlet list order from a cookie
+function restoreOrder() {
+    $(".column").each(function(index, value) {
+        var colid = value.id;
+        var cookieName = "cookie-" + colid
+        var cookie = $.cookie(cookieName);
+        if ( cookie == null ) { return; }
+        var IDs = cookie.split(",");
+        for (var i = 0, n = IDs.length; i < n; i++ ) {
+            var toks = IDs[i].split(":");
+            if ( toks.length != 2 ) {
+                continue;
+            }
+            var portletID = toks[0];
+            var visible = toks[1]
+            var portlet = $(".column")
+                .find('#' + portletID)
+                .appendTo($('#' + colid));
+            if (visible === 'false') {
+                portlet.find(".ui-icon").toggleClass("ui-icon-minus");
+                portlet.find(".ui-icon").toggleClass("ui-icon-plus");
+                portlet.find(".portlet-content").hide();
+            }
+        }
+    });
+}
+
 $(function() {
+    $( ".column" ).sortable({
+        connectWith: ".column",
+        stop: function() { saveOrder(); }
+    });
+
+    $(".portlet")
+         .addClass("ui-widget ui-widget-content")
+         .addClass("ui-helper-clearfix ui-corner-all")
+         .find(".portlet-header")
+         .addClass("ui-widget-header ui-corner-all")
+         .prepend('<span class="ui-icon ui-icon-minus"></span>')
+         .end()
+         .find(".portlet-content");
+
+    restoreOrder();
+
+    $(".portlet-header .ui-icon").click(function() {
+        $(this).toggleClass("ui-icon-minus");
+        $(this).toggleClass("ui-icon-plus");
+        $(this).parents(".portlet:first").find(".portlet-content").toggle();
+        saveOrder(); // This is important
+    });
+
+    if ($.browser.msie) {
+        if ($.browser.version >= 8.0 && $.browser.version < 9.0)
+        {
+            /* scaling bug in IE8.. iframe has to be 4 times bigger */
+            $( "#iframe" ).css('width', 1024 * 4);
+            $( "#iframe" ).css('height', 768 * 4);
+        }
+        $( "#iframe" ).css('zoom', '0.25');
+    }
     // activate an element to show it on projector
     $('.activate_link').click(function(event) {
         event.preventDefault();
@@ -14,7 +92,6 @@ $(function() {
             type: 'GET',
             url: $(this).attr('href'),
             dataType: 'json',
-            data: '',
             success: function(data) {
                 $('.activate_link').removeClass('active');
                 $('li').removeClass('activeline');
@@ -28,6 +105,25 @@ $(function() {
         });
     });
 
+    $('a.overlay').click(function(event) {
+        event.preventDefault();
+        var link = $(this);
+        $.ajax({
+            type: 'GET',
+            url: $(this).attr('href'),
+            dataType: 'json',
+            success: function(data) {
+                if (data['active']) {
+                    $('#' + data['def_name'] + '_active').show();
+                    $('#' + data['def_name'] + '_inactive').hide();
+                } else {
+                    $('#' + data['def_name'] + '_active').hide();
+                    $('#' + data['def_name'] + '_inactive').show();
+                }
+            },
+        });
+    });
+
     // control the projector
     $('.projector_edit').click(function(event) {
         event.preventDefault();
@@ -42,7 +138,7 @@ $(function() {
     });
 
     // control countdown
-    $('.projector_countdown_btn').click(function(event) {
+    $('.countdown_control').click(function(event) {
         event.preventDefault();
         var link = $(this);
         var requestData = {};
@@ -56,6 +152,14 @@ $(function() {
             data: requestData,
             dataType: 'json',
             success: function(data) {
+                if (data['state'] == 'active') {
+                    $('#countdown_play').hide();
+                    $('#countdown_stop').show();
+                } else {
+                    $('#countdown_play').show();
+                    $('#countdown_stop').hide();
+                }
+                $('#countdown_time').val(data['countdown_time'])
             }
         });
     });
@@ -78,4 +182,8 @@ $(function() {
             }
         });
     });
+
+    $('#overlay-form').ajaxForm(function() {
+        alert("Thank you for your comment!");
+    });
 });
diff --git a/openslides/projector/static/styles/projector-control.css b/openslides/projector/static/styles/projector-control.css
index 6493edc61..36d9d33e5 100644
--- a/openslides/projector/static/styles/projector-control.css
+++ b/openslides/projector/static/styles/projector-control.css
@@ -39,49 +39,12 @@
 }
 
 /*.projector_countdown_spinval {*/
+
 #countdown_time {
     width: 40px;
     height: 16px;
 }
 
-.projector_countdown_spinbox {
-    height: 16px;
-    width: auto;
-    position: relative;
-    display: inline-block;
-}
-
-.projector_countdown_spinup {
-    position: absolute;
-    top: 0px;
-    left: 35px;
-}
-
-.projector_countdown_spindown {
-    position: absolute;
-    top: 8px;
-    left: 35px;
-}
-
-.projector_countdown_btn img {
-    padding-top: 8px;
-    position: absolute;
-}
-
-/* countdown control buttons */
-.play{
-    background:url(../images/icons/play.png) no-repeat 0px 0px;
-    text-indent: 14px !important;
-}
-.pause{
-    background:url(../images/icons/pause.png) no-repeat 0px 0px;
-    text-indent: 14px !important;
-}
-.backward{
-    background:url(../images/icons/skip-backward.png) no-repeat 0px 0px;
-    text-indent: 14px !important;
-}
-
 /* iframe */
 #iframe {
     -moz-transform-origin: 0 0;
@@ -127,3 +90,22 @@ a.activate_link div {
 a.activate_link.active div {
     background-image: url(../images/icons/accept.png);
 }
+
+a.overlay div {
+    background-image: url(../images/icons/accept-grey.png);
+    background-repeat: no-repeat;
+    float: left;
+    width: 16px;
+    height: 16px;
+    padding-right: 16px;
+    position: relative;
+    top: 4px;
+    left: 4px;
+}
+
+a.overlay.active div {
+    background-image: url(../images/icons/accept.png);
+}
+
+
+
diff --git a/openslides/projector/templates/projector/control.html b/openslides/projector/templates/projector/control.html
index 809fdfdf0..fe589a3e1 100644
--- a/openslides/projector/templates/projector/control.html
+++ b/openslides/projector/templates/projector/control.html
@@ -10,119 +10,7 @@
     <script type="text/javascript" src="{% static 'javascript/jquery-ui-1.8.18.custom.min.js' %}"></script>
     <script type="text/javascript" src="{% static 'javascript/projector-control.js' %}"></script>
     <script type="text/javascript" src="{% static 'javascript/jquery.cookie.js' %}"></script>
-    <script type="text/javascript">
-
-    function switchButtons(which) {
-        if (which == 'stop') {
-            $( "#countdown_play" ).hide();
-            $( "#countdown_stop" ).show();
-        }
-        else {
-            $( "#countdown_play" ).show();
-            $( "#countdown_stop" ).hide();
-        }
-        return true;
-    };
-
-    function spinCount(delta) {
-        var count = parseInt($( "#countdown_time" ).val());
-        if (count + delta < 0) {
-            delta = 0;
-        }
-        $( "#countdown_time" ).val(count + delta);
-        return false;
-    };
-
-    // function that writes the portlet list order to a cookie
-    function saveOrder() {
-        $(".column").each(function(index, value){
-            var colid = value.id;
-            var cookieName = "cookie-" + colid;
-            // Get the order for this column.
-            var order = $('#' + colid).sortable("toArray");
-            // For each portlet in the column
-            for ( var i = 0, n = order.length; i < n; i++ ) {
-                // Determine if it is 'opened' or 'closed'
-                var v = $('#' + order[i] ).find('.portlet-content').is(':visible');
-                // Modify the array we're saving to indicate what's open and
-                //  what's not.
-                order[i] = order[i] + ":" + v;
-            }
-            $.cookie(cookieName, order, { path: "/", expiry: new Date(2012, 1, 1)});
-        });
-    }
-
-    // function that restores the portlet list order from a cookie
-    function restoreOrder() {
-        $(".column").each(function(index, value) {
-            var colid = value.id;
-            var cookieName = "cookie-" + colid
-            var cookie = $.cookie(cookieName);
-            if ( cookie == null ) { return; }
-            var IDs = cookie.split(",");
-            for (var i = 0, n = IDs.length; i < n; i++ ) {
-                var toks = IDs[i].split(":");
-                if ( toks.length != 2 ) {
-                    continue;
-                }
-                var portletID = toks[0];
-                var visible = toks[1]
-                var portlet = $(".column")
-                    .find('#' + portletID)
-                    .appendTo($('#' + colid));
-                if (visible === 'false') {
-                    portlet.find(".ui-icon").toggleClass("ui-icon-minus");
-                    portlet.find(".ui-icon").toggleClass("ui-icon-plus");
-                    portlet.find(".portlet-content").hide();
-                }
-            }
-        });
-    }
-    $(function() {
-        $( ".column" ).sortable({
-            connectWith: ".column",
-            stop: function() { saveOrder(); }
-        });
-
-        $(".portlet")
-             .addClass("ui-widget ui-widget-content")
-             .addClass("ui-helper-clearfix ui-corner-all")
-             .find(".portlet-header")
-             .addClass("ui-widget-header ui-corner-all")
-             .prepend('<span class="ui-icon ui-icon-minus"></span>')
-             .end()
-             .find(".portlet-content");
-
-        restoreOrder();
-
-        $(".portlet-header .ui-icon").click(function() {
-            $(this).toggleClass("ui-icon-minus");
-            $(this).toggleClass("ui-icon-plus");
-            $(this).parents(".portlet:first").find(".portlet-content").toggle();
-            saveOrder(); // This is important
-        });
-
-        $( "document" ).ready(function(){
-            if ($.browser.msie) {
-                if ($.browser.version >= 8.0 && $.browser.version < 9.0)
-                {
-                    /* scaling bug in IE8.. iframe has to be 4 times bigger */
-                    $( "#iframe" ).css('width', 1024 * 4);
-                    $( "#iframe" ).css('height', 768 * 4);
-                }
-                $( "#iframe" ).css('zoom', '0.25');
-            }
-
-            {% if countdown_state == "active" %}
-            switchButtons('stop');
-            {% else %}
-            switchButtons('play');
-            {% endif %}
-        });
-    });
-    </script>
-
-
+    <script type="text/javascript" src="{% static 'javascript/jquery.form.js' %}"></script>
 {% endblock %}
 
 {% block content %}
@@ -180,55 +68,27 @@
         <div class="portlet" id="portlet_overlays">
             <div class="portlet-header">{% trans 'Overlays' %}</div>
             <div class="portlet-content">
-                <ul style="line-height: 180%">
-                <form action="" method="post">{% csrf_token %}
-                    <ul>
-                    {% for overlay in overlays %}
-                        <li>
-                            <input type="checkbox" name="{{ overlay.def_name }}" onchange="submit()"
-                                {% if overlay.active %} checked="checked"{% endif %}> {{ overlay }}:
-                            {# Countdown #}
-                            {% if overlay.def_name == "Countdown" %}
-                                <span class="projector_countdown_spinbox">
-                                    <input class="projector_countdown_spinval" id="countdown_time" name="countdown_time" type="number" min="0" value="{{countdown_time}}">{% trans "sec" %}
-                                    <a id="countdown_set" class="projector_countdown_btn" href="{% url countdown_set_default %}" title="{% trans 'Save as default' %}">
-                                        <img src="{% static 'images/icons/document-save.png' %}" />
-                                    </a>
-                                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                                    <a class="projector_countdown_btn" href="{% url countdown_reset %}" title="{% trans 'Reset countdown' %}" onclick="javascript:switchButtons('play')">
-                                        <button type="submit" class="button" style="padding:4px;" name='message-clean'>
-                                           <span class="icon backward">&nbsp;</span>
-                                        </button></a>&nbsp;
-                                    <a id="countdown_play" class="projector_countdown_btn" href="{% url countdown_start %}" title="{% trans 'Start countdown' %}" onclick="javascript:switchButtons('stop')"><button
-                                         type="submit" class="button" style="padding:4px;" name='message-clean'>
-                                           <span class="icon play">&nbsp;</span>
-                                        </button></a>
-                                    <a id="countdown_stop" class="projector_countdown_btn" href="{% url countdown_stop %}" title="{% trans 'Stop countdown' %}" onclick="javascript:switchButtons('play')">
-                                        <button type="submit" class="button" style="padding:4px;" name='message-clean'>
-                                           <span class="icon pause">&nbsp;</span>
-                                        </button>
-                                    </a>
-                                </span>
-                                <p></p>
-                            {% endif %}
-                            {% if overlay.def_name == "Message" %}
-                                <nobr>
-                                <input name='message_text' type='text' style='width: 70%'
-                                   value="{% get_config 'projector_message' %}">
-                                <button type="submit"
-                                    class="button" style="padding:4px 0;" name='message-clean' title="{% trans 'Clean message' %}">
-                                    <span class="icon clear">&nbsp;</span>
-                                </button>
-                                </nobr>
-                                <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                                <button type="submit" class="button" name='message'>
-                                    <span class="icon ok">{% trans 'Apply' %}</span>
-                                </button>
-                            {% endif %}
-                        </li>
-                    {% endfor %}
-                    </ul>
-                </form>
+                <ul>
+                {% for overlay in overlays %}
+                    <li>
+                        <a id="{{ overlay.def_name }}_inactive" href="{% url projector_overlay_activate overlay.def_name %}" class="overlay"{% if overlay.active %} style="display:none"{% endif %}>
+                            <div></div>
+                        </a>
+                        <a id="{{ overlay.def_name }}_active" href="{% url projector_overlay_deactivate overlay.def_name %}" class="overlay active"{% if not overlay.active %} style="display:none"{% endif %}>
+                            <div></div>
+                        </a>
+
+                        {{ overlay }}:
+                        {# TODO: Call the html via overlay.html #}
+                        {# Countdown #}
+                        {% if overlay.def_name == "Countdown" %}
+                            {% include 'projector/control_countdown.html' %}
+                        {% endif %}
+                        {% if overlay.def_name == "Message" %}
+                            {% include 'projector/control_overlay_message.html' %}
+                        {% endif %}
+                    </li>
+                {% endfor %}
                 </ul>
             </div>
         </div> <!-- end portlet-->
diff --git a/openslides/projector/templates/projector/control_countdown.html b/openslides/projector/templates/projector/control_countdown.html
new file mode 100644
index 000000000..2d2ed726d
--- /dev/null
+++ b/openslides/projector/templates/projector/control_countdown.html
@@ -0,0 +1,19 @@
+{% load staticfiles %}
+{% load i18n %}
+{% load tags %}
+
+<span class="projector_countdown_spinbox">
+    <input class="projector_countdown_spinval" id="countdown_time" name="countdown_time" type="number" min="0" value="{{ countdown_time }}"> {% trans "sec" %}
+    <a id="countdown_set" class="countdown_control" href="{% url countdown_set_default %}" title="{% trans 'Save as default' %}">
+        <img src="{% static 'images/icons/document-save.png' %}" alt="{% url countdown_set_default %}">
+    </a>
+    <a id="countdown_reset" class="countdown_control" href="{% url countdown_reset %}" title="{% trans 'Reset countdown' %}">
+        <img src="{% static 'images/icons/skip-backward.png' %}" alt="{% trans 'Reset countdown' %}">
+    </a>
+    <a id="countdown_play" class="countdown_control" href="{% url countdown_start %}" title="{% trans 'Start countdown' %}"{% if countdown_state == 'active' %} style="display:none"{% endif %}>
+        <img src="{% static 'images/icons/play.png' %}" alt="{% url countdown_start %}">
+    </a>
+    <a id="countdown_stop" class="countdown_control" href="{% url countdown_stop %}" title="{% trans 'Stop countdown' %}"{% if countdown_state == 'inactive' or countdown_state == 'paused' or countdown_state == 'expired' %} style="display:none"{% endif %}>
+        <img src="{% static 'images/icons/pause.png' %}" alt="{% url countdown_stop %}">
+    </a>
+</span>
diff --git a/openslides/projector/templates/projector/control_overlay_message.html b/openslides/projector/templates/projector/control_overlay_message.html
new file mode 100644
index 000000000..e2082d8c1
--- /dev/null
+++ b/openslides/projector/templates/projector/control_overlay_message.html
@@ -0,0 +1,14 @@
+{% load staticfiles %}
+{% load i18n %}
+{% load tags %}
+<form id="overlay-form" action="" method="post" style="display:inline">{% csrf_token %}
+    <input name='message_text' type='text' style='width: 40%' value="{% get_config 'projector_message' %}">
+    <button type="submit" class="button" name='message'>
+        <span class="icon ok">{% trans 'Apply' %}</span>
+    </button>
+    <button type="submit"
+        class="button" style="padding:4px 0;" name='message-clean' title="{% trans 'Clean message' %}">
+        <span class="icon clear">&nbsp;</span>
+    </button>
+</form>
+
diff --git a/openslides/projector/urls.py b/openslides/projector/urls.py
index 7343b1cb8..dcf46debb 100644
--- a/openslides/projector/urls.py
+++ b/openslides/projector/urls.py
@@ -17,8 +17,7 @@ from openslides.utils.views import CreateView
 from openslides.projector.models import ProjectorSlide
 from openslides.projector.views import (ControlView, ActivateView,
     CustomSlideCreateView, CustomSlideUpdateView, CustomSlideDeleteView,
-    CountdownEdit, ProjectorEdit, Projector)
-
+    CountdownEdit, ProjectorEdit, Projector, ActivateOverlay)
 
 
 urlpatterns = patterns('projector.views',
@@ -99,20 +98,6 @@ urlpatterns = patterns('projector.views',
         ## name='countdown_edit',
     ## ),
 
-
-
-    url(r'^countdown/show/$',
-        CountdownEdit.as_view(),
-         {'command': 'show'},
-        name='countdown_open',
-    ),
-
-    url(r'^countdown/hide/$',
-        CountdownEdit.as_view(),
-         {'command': 'hide'},
-        name='countdown_close',
-    ),
-
     url(r'^countdown/reset/$',
         CountdownEdit.as_view(),
          {'command': 'reset'},
@@ -136,4 +121,16 @@ urlpatterns = patterns('projector.views',
          {'command': 'set-default'},
         name='countdown_set_default',
     ),
+
+    url('^overlay/(?P<name>[^/]*)/activate/$',
+        ActivateOverlay.as_view(),
+        {'activate': True},
+        name='projector_overlay_activate',
+    ),
+
+    url('^overlay/(?P<name>[^/]*)/deactivate/$',
+        ActivateOverlay.as_view(),
+        {'activate': False},
+        name='projector_overlay_deactivate',
+    ),
 )
diff --git a/openslides/projector/views.py b/openslides/projector/views.py
index 28298b9c7..1d7b8b357 100644
--- a/openslides/projector/views.py
+++ b/openslides/projector/views.py
@@ -35,7 +35,7 @@ from openslides.projector.models import ProjectorOverlay, ProjectorSlide
 from openslides.projector.signals import projector_overlays
 
 
-class ControlView(TemplateView):
+class ControlView(TemplateView, AjaxMixin):
     template_name = 'projector/control.html'
     permission_required = 'projector.can_manage_projector'
 
@@ -64,6 +64,8 @@ class ControlView(TemplateView):
                 else:
                     overlay.active = False
                 overlay.save()
+        if request.is_ajax():
+            return ajax_get(request, *args, **kwargs)
         return self.get(request, *args, **kwargs)
 
     def get_context_data(self, **kwargs):
@@ -94,6 +96,32 @@ class ControlView(TemplateView):
         return context
 
 
+class ActivateOverlay(RedirectView):
+    url = 'projector_control'
+    allow_ajax = True
+
+    @property
+    def overlay(self):
+        try:
+            return self._overlay
+        except AttributeError:
+            self._overlay = ProjectorOverlay.objects.get(def_name=self.kwargs['name'])
+            return self._overlay
+
+    def pre_redirect(self, request, *args, **kwargs):
+        if kwargs['activate']:
+            self.overlay.active = True
+        else:
+            self.overlay.active = False
+        self.overlay.save()
+
+    def get_ajax_context(self, **kwargs):
+        return {
+            'active': self.overlay.active,
+            'def_name': self.overlay.def_name,
+        }
+
+
 class ActivateView(RedirectView):
     url = 'projector_control'
     allow_ajax = True
@@ -244,6 +272,7 @@ class CountdownEdit(RedirectView):
 
     def pre_redirect(self, request, *args, **kwargs):
         command = kwargs['command']
+        # countdown_state is one of 'inactive', 'paused' and 'active', 'expired'
         if command in ['reset', 'start', 'stop']:
             config['countdown_time'] = config['countdown_time']
 
@@ -276,6 +305,12 @@ class CountdownEdit(RedirectView):
             except AttributeError:
                 pass
 
+    def get_ajax_context(self, **kwargs):
+        return {
+            'state': config['countdown_state'],
+            'countdown_time': config['countdown_time'],
+        }
+
 
 def register_tab(request):
     selected = True if request.path.startswith('/projector/') else False