altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Consolidated multiple group contextmenu buttonlist elements into one. Changed button links into plain links for agenda/minutes/materials -- makes the bage less busy, takes up less room, and lessens the conflation between action buttons and links.

Browse source 
- Legacy-Id: 10788
This commit is contained in:
Henrik Levkowetz 2016-02-06 19:59:31 +00:00
parent 33b1cc312e
commit 9c6ca73995
3 changed files with 20 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ietf/templates/group/group_base.html
View file

@ -30,13 +30,15 @@
{% endfor %}
</ul>
{% if menu_actions %}
<div class="buttonlist">
{% for name, url in menu_actions %}
<a class="btn {% if name == "Request closing group" %}btn-warning{% else %}btn-default{% endif %}" href="{{ url }}">{{ name }}</a>
{% endfor %}
</div>
{% endif %}
<div class="buttonlist">
{% block buttonlist %}
{% if menu_actions %}
{% for name, url in menu_actions %}
<a class="btn {% if name == "Request closing group" %}btn-warning{% else %}btn-default{% endif %}" href="{{ url }}">{{ name }}</a>
{% endfor %}
{% endif %}
{% endblock buttonlist %}
</div>
{% block group_content %}
{% endblock group_content %}

6
ietf/templates/group/meetings-row.html
View file

@ -26,9 +26,9 @@
{% endif %}
{% endif %}
</td>
<td>{% if s.agenda %}<a class="btn btn-default btn-xs" href="{{ s.agenda.get_absolute_url }}">Agenda</a>{% endif %}</td>
<td>{% if s.minutes %}<a class="btn btn-default btn-xs" href="{{ s.minutes.get_absolute_url }}">Minutes</a>{% endif %}</td>
<td><a class="btn btn-default btn-xs" href="{% url 'ietf.meeting.views.session_details' num=s.meeting.number acronym=s.group.acronym %}">Materials</a></td>
<td>{% if s.agenda %}<a href="{{ s.agenda.get_absolute_url }}">Agenda</a>{% endif %}</td>
<td>{% if s.minutes %}<a href="{{ s.minutes.get_absolute_url }}">Minutes</a>{% endif %}</td>
<td><a href="{% url 'ietf.meeting.views.session_details' num=s.meeting.number acronym=s.group.acronym %}">Materials</a></td>
{% endfor %}
</tbody>
</table>

15
ietf/templates/group/meetings.html
View file

@ -4,16 +4,17 @@
{% block title %}Meetings{% if group %} for {{group.acronym}}{% endif %}{% endblock %}
{% block buttonlist %}
{{ block.super }}
<a class="btn btn-default" href="{% url 'ietf.meeting.views.meeting_requests' %}">Session requests</a>
{% if can_edit %}
<a class="btn btn-default" href="{% url 'ietf.secr.sreq.views.main' %}">Request a session</a>
{% endif %}
{% endblock buttonlist %}
{% block group_content %}
{% origin %}
<div class="buttonlist">
<a class="btn btn-default" href="{% url 'ietf.meeting.views.meeting_requests' %}">Session requests</a>
{% if can_edit %}
<a class="btn btn-default" href="{% url 'ietf.secr.sreq.views.main' %}">Request a session</a>
{% endif %}
</div>
{% if in_progress %}
<div class="panel panel-default" id="inprogressmeets">
<div class="panel-heading">