From 9feca83bb3952ca96b1177a09b003200e5600006 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Mon, 14 Nov 2011 20:14:56 +0100
Subject: [PATCH] Fixed IE CSS issues (with white-space: nowrap).

---
 openslides/agenda/templates/agenda/overview.html | 16 +++++++++-------
 .../templates/participant/overview.html          |  4 +++-
 openslides/static/javascript/agenda.js           |  2 +-
 openslides/static/styles/agenda.css              |  8 ++++----
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/openslides/agenda/templates/agenda/overview.html b/openslides/agenda/templates/agenda/overview.html
index f7317404d..93160c1f6 100644
--- a/openslides/agenda/templates/agenda/overview.html
+++ b/openslides/agenda/templates/agenda/overview.html
@@ -97,9 +97,10 @@
                 {% if perms.agenda.can_manage_agenda %}
                 <td></td>
                 {% endif %}
-                <td id="action_field" style="width: 1px;white-space: nowrap;">
-                    <div></div>
+                <td><span id="action_field" style="width: 1px;white-space: nowrap;">
+                    <span></span>
                     <a href="{% url print_agenda %}" title="{%trans 'Print agenda' %}"><img src="/static/images/icons/application-pdf.png"></a>
+                    </span>
                 </td>
             </tr>
             {% for item in items %}
@@ -161,21 +162,21 @@
                     {% endif %}
                 </td>
                 {% endif %}
-                <td style="width: 1px;white-space: nowrap;">
+                <td><span style="width: 1px;white-space: nowrap;">
                     <a href="{{ item.get_absolute_url }}"><img src="/static/images/icons/document-preview.png" title="{% trans 'Show projector preview' %}"></a>
 
                     {% if perms.agenda.can_manage_agenda %}
                     <a href="{% url item_edit item.id %}"><img src="/static/images/icons/document-edit.png" title="{% trans 'Edit item' %}"></a>
                     <a href="{% url item_delete item.id %}"><img src="/static/images/icons/edit-delete.png" title="{% trans 'Delete item' %}"></a>
-
                     <a class="close_link {% if item.closed %}closed{% else %}open{% endif %}" href="{% if item.closed %}{% url item_open item.id %}{% else %}{% url item_close item.id %}{% endif %}">
-                        <div></div>
+                        <span></span>
                     </a>
 
                     {% if item.children.exists %}
                         <a href="{% url item_activate_summary item.id %}"><img src="/static/images/icons/view-list-tree.png" title="{% trans 'Select item overview' %}"></a>
                     {% endif %}
                     {% endif %}
+                    </span>
                 </td>
                 {% if perms.agenda.can_manage_agenda %}
                 <td class="tabledrag-hide">
@@ -233,16 +234,17 @@
                         Text
                     {% endifequal %}
                 </td>
-                <td style="width: 1px;white-space: nowrap;">
+                <td><span style="width: 1px;white-space: nowrap;">
                     <a href="{{ item.get_absolute_url }}"><img src="/static/images/icons/document-preview.png" title="{% trans 'Show projector preview' %}"></a>
                     <a href="{% url item_edit item.id %}"><img src="/static/images/icons/document-edit.png" title="{% trans 'Edit item' %}"></a>
                     <a href="{% url item_delete item.id %}"><img src="/static/images/icons/edit-delete.png" title="{% trans 'Delete item' %}"></a>
                     <a class="close_link {% if item.closed %}closed{% else %}open{% endif %}" href="{% if item.closed %}{% url item_open item.id %}{% else %}{% url item_close item.id %}{% endif %}">
-                        <div></div>
+                        <span></span>
                     </a>
                     {% if item.children.exists %}
                         <a href="{% url item_activate_summary item.id %}"><img src="/static/images/icons/view-list-tree.png" title="{% trans 'Select item overview' %}"></a>
                     {% endif %}
+                    </span>
                 </td>
                 <td class="tabledrag-hide">
                     {% with form=item.weight_form %}
diff --git a/openslides/participant/templates/participant/overview.html b/openslides/participant/templates/participant/overview.html
index f8cf678ba..a6475d2ed 100644
--- a/openslides/participant/templates/participant/overview.html
+++ b/openslides/participant/templates/participant/overview.html
@@ -64,7 +64,8 @@
             <td>{% if user.last_login > user.date_joined %}
                 {{ user.last_login }}
                 {% endif %}</td>
-            <td style="width: 1px; white-space: nowrap;"><a href="{% url user_edit user.id %}"><img src="/static/images/icons/document-edit.png" title="{%trans 'Edit participant' %}"></a>
+            <td><span style="width: 1px; white-space: nowrap;">
+                <a href="{% url user_edit user.id %}"><img src="/static/images/icons/document-edit.png" title="{%trans 'Edit participant' %}"></a>
                 <a href="{% url user_delete user.id %}"><img src="/static/images/icons/edit-delete.png" title="{%trans 'Delete participant' %}"></a>
                 {% if user.is_active %}
                 <a href="{% url user_set_active user.id %}"><img src="/static/images/icons/user-online.png" title="{%trans 'Participiant is activated. Click to deactivate!' %}"></a>
@@ -76,6 +77,7 @@
                 {% else %}
                 <a href="{% url user_set_superuser user.id %}"><img src="/static/images/icons/im-user.png" title="{%trans 'Normal user. Click to get administrator!' %}"></a>
                 {% endif %}
+                </span>
             </td>
             {% endif %}
         </tr>
diff --git a/openslides/static/javascript/agenda.js b/openslides/static/javascript/agenda.js
index f996f6560..5201ae5c7 100644
--- a/openslides/static/javascript/agenda.js
+++ b/openslides/static/javascript/agenda.js
@@ -63,7 +63,7 @@ $(function() {
         });
     });
     // hide closed items
-    $('#action_field div').after($('<a id="hidelink" class="hidelink hide" title="hide" href="#"><div></div></a>').click(function () {
+    $('#action_field span').after($('<a id="hidelink" class="hidelink hide" title="hide" href="#"><span></span></a>').click(function () {
         if ($.cookie('Slide.HideClosed') == 1) {
             $.cookie('Slide.HideClosed', 0);
             hideClosedSlides(false);
diff --git a/openslides/static/styles/agenda.css b/openslides/static/styles/agenda.css
index b5d5b21a6..d176a52ab 100644
--- a/openslides/static/styles/agenda.css
+++ b/openslides/static/styles/agenda.css
@@ -13,7 +13,7 @@ tr.inactiveline a.activate_link div {
     height: 16px;
 }
 
-a.close_link.closed div {
+a.close_link.closed span {
     background-image: url(/static/images/icons/user-offline.png);
     background-repeat: no-repeat;
     background-position: center;
@@ -21,7 +21,7 @@ a.close_link.closed div {
     height: 16px;
     display: inline-block;
 }
-a.close_link.open div {
+a.close_link.open span {
     background-image: url(/static/images/icons/user-online.png);
     background-repeat: no-repeat;
     background-position: center;
@@ -30,7 +30,7 @@ a.close_link.open div {
     display: inline-block;
 }
 
-a.hidelink.hide div {
+a.hidelink.hide span {
     background-image: url(/static/images/icons/layer-visible-off.png);
     background-repeat: no-repeat;
     background-position: center;
@@ -38,7 +38,7 @@ a.hidelink.hide div {
     height: 16px;
     display: inline-block;
 }
-a.hidelink.show div {
+a.hidelink.show span {
     background-image: url(/static/images/icons/layer-visible-on.png);
     background-repeat: no-repeat;
     background-position: center;