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

Fixed wrong hiding of open agenda child items if parent item is closed

Browse Source
This commit is contained in:
Emanuel Schuetze 2013-02-05 22:36:05 +01:00
parent e49efb40d8
commit c8ddb21760
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openslides/agenda/templates/agenda/item_row.html
View File

@ -8,7 +8,9 @@
<i class="{% if item.closed %}icon-checked-new{% else %}icon-unchecked-new{% endif %}"></i> <i class="{% if item.closed %}icon-checked-new{% else %}icon-unchecked-new{% endif %}"></i>
</a> </a>
{% else %} {% else %}
<i class="icon-"></i> <span class="close_link">
<i class="{% if item.closed %}icon-checked-new{% else %}icon-unchecked-new{% endif %}"></i>
</span>
{% endif %} {% endif %}
</td> </td>
<td> <td>
@ -50,7 +52,6 @@
</span> </span>
</td> </td>
{% endif %} {% endif %}
{% if perms.agenda.can_manage_agenda %}
<td class="tabledrag-hide" style="display: none;"> <td class="tabledrag-hide" style="display: none;">
{% with form=item.weight_form %} {% with form=item.weight_form %}
{{ form.weight }} {{ form.weight }}
@ -58,4 +59,5 @@
{{ form.parent }} {{ form.parent }}
{% endwith %} {% endwith %}
</td> </td>
{% endif %}

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

@ -17,7 +17,6 @@
<script type="text/javascript" src="{% static 'javascript/jquery.cookie.js' %}"></script> <script type="text/javascript" src="{% static 'javascript/jquery.cookie.js' %}"></script>
{% if perms.agenda.can_manage_agenda %} {% if perms.agenda.can_manage_agenda %}
<script type="text/javascript" src="{% static 'javascript/jquery.once.js' %}"></script> <script type="text/javascript" src="{% static 'javascript/jquery.once.js' %}"></script>
<script type="text/javascript" src="{% static 'javascript/jquery.tmpl.js' %}"></script> <script type="text/javascript" src="{% static 'javascript/jquery.tmpl.js' %}"></script>
<script type="text/javascript" src="{% static 'javascript/tabledrag.js' %}"></script> <script type="text/javascript" src="{% static 'javascript/tabledrag.js' %}"></script>
<script type="text/javascript"> <script type="text/javascript">
@ -79,9 +78,9 @@
{% if perms.agenda.can_manage_agenda or perms.projector.can_manage_projector %} {% if perms.agenda.can_manage_agenda or perms.projector.can_manage_projector %}
<th class="mini_width">{% trans "Actions" %}</th> <th class="mini_width">{% trans "Actions" %}</th>
{% endif %} {% endif %}
{% if perms.agenda.can_manage_agenda %} <th class="tabledrag-hide" style="display: none;">
<th class="tabledrag-hide" style="display: none;">{% trans "Weight" %}</th> {% trans "Weight" %}
{% endif %} </th>
</tr> </tr>
<tr class="topline{% if active_sid == 'agenda' %} activeline{% endif %}"> <tr class="topline{% if active_sid == 'agenda' %} activeline{% endif %}">
<td></td> <td></td>