Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRogelio Mita <rogeliomita@activitycentral.com>2013-07-23 14:09:57 (GMT)
committer Rogelio Mita <rogeliomita@activitycentral.com>2013-07-23 14:09:57 (GMT)
commit9157b35840e783d8d1119f2066d228c4fa5465d7 (patch)
treeaa2d34350cfaf337bf05aec17295701088d704dd
parentcc720312dd4f6f95b2d2a7edd52d5151b66ae332 (diff)
issue 4114: grouping menu options
-rw-r--r--webapp/webapp/templates/base-main.html25
1 files changed, 15 insertions, 10 deletions
diff --git a/webapp/webapp/templates/base-main.html b/webapp/webapp/templates/base-main.html
index d086a4b..e83e360 100644
--- a/webapp/webapp/templates/base-main.html
+++ b/webapp/webapp/templates/base-main.html
@@ -62,14 +62,18 @@
<li class="divider-vertical"></li>
{% if user.is_sociologist %}
- {% url sociologist:poll_list as poll_list_url %}
- <li class="{% if request.path == poll_list_url %}active{% endif %}">
- <a href="{{ poll_list_url }}"><i class="icon-white icon-list-alt"></i>&nbsp;Listado de encuestas</a>
- </li>
-
- {% url sociologist:poll_add as poll_add_url %}
- <li class="{% if request.path == poll_add_url %}active{% endif %}">
- <a href="{{ poll_add_url }}"><i class="icon-white icon-plus"></i>&nbsp;Nueva encuesta</a>
+ <li class="dropdown">
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="icon-white icon-check"></i>&nbsp;Encuestas&nbsp;<b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ {% url sociologist:poll_add as poll_add_url %}
+ <li class="{% if request.path == poll_add_url %}active{% endif %}">
+ <a href="{{ poll_add_url }}"><i class="icon-white icon-plus"></i>&nbsp;Nueva encuesta</a>
+ </li>
+ {% url sociologist:poll_list as poll_list_url %}
+ <li class="{% if request.path == poll_list_url %}active{% endif %}">
+ <a href="{{ poll_list_url }}"><i class="icon-white icon-list-alt"></i>&nbsp;Listado de encuestas</a>
+ </li>
+ </ul>
</li>
<li class="divider-vertical"></li>
@@ -77,13 +81,14 @@
<li class="dropdown {% if 'pollsters' in request.path %}active{% endif %}">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="icon-white icon-group"></i>&nbsp;Encuestadores&nbsp;<b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="{% url sociologist:pollster_list %}"><i class="icon-list-alt"></i>&nbsp;Listado/Asignaci&oacute;n de encuestas</a></li>
- <li><a href="{% url sociologist:pollster_new %}"><i class="icon-plus"></i>&nbsp;Nuevo</a></li>
+ <li><a href="{% url sociologist:pollster_new %}"><i class="icon-plus"></i>&nbsp;Nuevo encuestador</a></li>
+ <li><a href="{% url sociologist:pollster_list %}"><i class="icon-list-alt"></i>&nbsp;Listado/Asignaci&oacute;n de encuestas</a></li>
</ul>
</li>
{% endif %}
{% if user.is_superuser %}
+ <li class="divider-vertical"></li>
{% url sociologist:sociologist_form as sociologist_form_url %}
<li class="{% if request.path == sociologist_form_url %}active{% endif %}">
<a href="{{ sociologist_form_url }}"><i class="icon-white icon-plus"></i>&nbsp;Nuevo sociologo</a>