From a4592ec8493410feebded1e9ee83efaaf3bf1d60 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Fri, 18 Jan 2013 21:44:47 +0100
Subject: [PATCH] Reworked projector activate buttons in agenda widget.

---
 openslides/agenda/templates/agenda/widget.html      |  8 ++++----
 openslides/projector/static/javascript/dashboard.js | 10 ++++++----
 openslides/static/styles/base.css                   |  6 +++---
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/openslides/agenda/templates/agenda/widget.html b/openslides/agenda/templates/agenda/widget.html
index f5438b966..ce856707b 100644
--- a/openslides/agenda/templates/agenda/widget.html
+++ b/openslides/agenda/templates/agenda/widget.html
@@ -4,8 +4,8 @@
 
 <ul style="line-height: 180%">
     <li class="{% if agenda.active %}activeline{% endif %}">
-        <a href="{% url 'projector_activate_slide' agenda.key  %}" class="activate_link btn {% if agenda.active %}btn-primary{% endif %} btn-mini" title="{% trans 'Show agenda' %}">
-            <i class="icon icon-facetime-video {% if item.active %}icon-white{% endif %}"></i>
+        <a href="{% url 'projector_activate_slide' agenda.key  %}" class="activate_projector btn {% if agenda.active %}btn-primary{% endif %} btn-mini" title="{% trans 'Show agenda' %}">
+            <i class="icon icon-facetime-video {% if agenda.active %}icon-white{% endif %}"></i>
         </a>&nbsp;
         <a href="{% url 'projctor_preview_slide' agenda.key %}" title="{% trans 'Preview' %}" class="icon preview right">
             <span></span>
@@ -17,7 +17,7 @@
 <ul style="line-height: 180%">
 {% for item in items %}
     <li class="{% if item.active %}activeline{% endif %}">
-        <a href="{% url 'projector_activate_slide' item.sid  %}" class="activate_link btn {% if item.active %}btn-primary{% endif %} btn-mini" title="{% trans 'Show item' %}">
+        <a href="{% url 'projector_activate_slide' item.sid  %}" class="activate_projector btn {% if item.active %}btn-primary{% endif %} btn-mini" title="{% trans 'Show item' %}">
             <i class="icon icon-facetime-video {% if item.active %}icon-white{% endif %}"></i>
         </a>&nbsp;
         <a href="{% model_url item 'delete' %}" title="{% trans 'Delete' %}" class="icon delete right">
@@ -30,7 +30,7 @@
             <span></span>
         </a>
         {% if not item.is_leaf_node %}
-        <a class="activate_link right" href="{% url 'projector_activate_slide' item.sid 'summary' %}">
+        <a class="activate_projector right" href="{% url 'projector_activate_slide' item.sid 'summary' %}">
             <img src="{% static 'images/icons/summary.png' %}"
                 title="{% trans 'Activate summary for this item' %}"
                 style="padding-right: 2px;">
diff --git a/openslides/projector/static/javascript/dashboard.js b/openslides/projector/static/javascript/dashboard.js
index 430709c72..d258c7e1c 100644
--- a/openslides/projector/static/javascript/dashboard.js
+++ b/openslides/projector/static/javascript/dashboard.js
@@ -51,7 +51,7 @@ $(function() {
     }
 
     // activate an element to show it on projector
-    $('.activate_link').click(function(event) {
+    $('.activate_projector').click(function(event) {
         event.preventDefault();
         var link = $(this);
         $.ajax({
@@ -59,10 +59,12 @@ $(function() {
             url: $(this).attr('href'),
             dataType: 'json',
             success: function(data) {
-                $('.activate_link').removeClass('active');
+                $('.activate_projector').removeClass('btn-primary');
+                $('.activate_projector .icon').removeClass('icon-white');
                 $('li').removeClass('activeline');
-                $('div').removeClass('activeline');
-                link.addClass('active');
+                //$('div').removeClass('activeline');
+                link.addClass('btn-primary');
+                link.find('.icon').addClass('icon-white');
                 link.parent().addClass('activeline');
             },
             error: function () {
diff --git a/openslides/static/styles/base.css b/openslides/static/styles/base.css
index 6c8c6950e..edaa7be43 100644
--- a/openslides/static/styles/base.css
+++ b/openslides/static/styles/base.css
@@ -79,12 +79,12 @@ a:hover {
 
 
 /** Utils **/
-tr.activeline td, li.activeline {
-    background-color: #bed4de !important;
-}
 tr.itemdoneline td, li.itemdoneline {
     background-color: #EAEAEA !important;
 }
+tr.activeline td, li.activeline {
+    background-color: #bed4de !important;
+}
 .nopadding {
     padding: 0;
 }