ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed IE CSS issues (with white-space: nowrap).

Browse Source
This commit is contained in:
Emanuel Schuetze 2011-11-14 20:14:56 +01:00
parent eb35289e4e
commit 9feca83bb3
4 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
openslides/agenda/templates/agenda/overview.html
View File

@ -97,9 +97,10 @@
{% if perms.agenda.can_manage_agenda %} {% if perms.agenda.can_manage_agenda %}
<td></td> <td></td>
{% endif %} {% endif %}
<td id="action_field" style="width: 1px;white-space: nowrap;"> <td><span id="action_field" style="width: 1px;white-space: nowrap;">
<div></div> <span></span>
<a href="{% url print_agenda %}" title="{%trans 'Print agenda' %}"><img src="/static/images/icons/application-pdf.png"></a> <a href="{% url print_agenda %}" title="{%trans 'Print agenda' %}"><img src="/static/images/icons/application-pdf.png"></a>
</span>
</td> </td>
</tr> </tr>
{% for item in items %} {% for item in items %}
@ -161,21 +162,21 @@
{% endif %} {% endif %}
</td> </td>
{% endif %} {% 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> <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 %} {% 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_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 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 %}"> <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> </a>
{% if item.children.exists %} {% 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> <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 %}
{% endif %} {% endif %}
</span>
</td> </td>
{% if perms.agenda.can_manage_agenda %} {% if perms.agenda.can_manage_agenda %}
<td class="tabledrag-hide"> <td class="tabledrag-hide">
@ -233,16 +234,17 @@
Text Text
{% endifequal %} {% endifequal %}
</td> </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="{{ 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_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 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 %}"> <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> </a>
{% if item.children.exists %} {% 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> <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> </td>
<td class="tabledrag-hide"> <td class="tabledrag-hide">
{% with form=item.weight_form %} {% with form=item.weight_form %}

4
openslides/participant/templates/participant/overview.html
View File

@ -64,7 +64,8 @@
<td>{% if user.last_login > user.date_joined %} <td>{% if user.last_login > user.date_joined %}
{{ user.last_login }} {{ user.last_login }}
{% endif %}</td> {% 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> <a href="{% url user_delete user.id %}"><img src="/static/images/icons/edit-delete.png" title="{%trans 'Delete participant' %}"></a>
{% if user.is_active %} {% 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> <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 %} {% 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> <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 %} {% endif %}
</span>
</td> </td>
{% endif %} {% endif %}
</tr> </tr>

2
openslides/static/javascript/agenda.js
View File

@ -63,7 +63,7 @@ $(function() {
}); });
}); });
// hide closed items // 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) { if ($.cookie('Slide.HideClosed') == 1) {
$.cookie('Slide.HideClosed', 0); $.cookie('Slide.HideClosed', 0);
hideClosedSlides(false); hideClosedSlides(false);

8
openslides/static/styles/agenda.css
View File

@ -13,7 +13,7 @@ tr.inactiveline a.activate_link div {
height: 16px; height: 16px;
} }
a.close_link.closed div { a.close_link.closed span {
background-image: url(/static/images/icons/user-offline.png); background-image: url(/static/images/icons/user-offline.png);
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;
@ -21,7 +21,7 @@ a.close_link.closed div {
height: 16px; height: 16px;
display: inline-block; display: inline-block;
} }
a.close_link.open div { a.close_link.open span {
background-image: url(/static/images/icons/user-online.png); background-image: url(/static/images/icons/user-online.png);
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;
@ -30,7 +30,7 @@ a.close_link.open div {
display: inline-block; display: inline-block;
} }
a.hidelink.hide div { a.hidelink.hide span {
background-image: url(/static/images/icons/layer-visible-off.png); background-image: url(/static/images/icons/layer-visible-off.png);
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;
@ -38,7 +38,7 @@ a.hidelink.hide div {
height: 16px; height: 16px;
display: inline-block; display: inline-block;
} }
a.hidelink.show div { a.hidelink.show span {
background-image: url(/static/images/icons/layer-visible-on.png); background-image: url(/static/images/icons/layer-visible-on.png);
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;