Added color to the map icons.

Eraldo · Aug 18, 2015 · c111e47 · c111e47
1 parent e11adfc
commit c111e47
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 34 deletions.
diff --git a/colegend/website/templates/website/_map.html b/colegend/website/templates/website/_map.html
@@ -3,22 +3,26 @@
         {% for menu_type, menu_items in menu_items.items %}
             {% if menu_items %}
                 {% for menu_item in menu_items %}
-                    <div class="col-xs-3">
+                        <div class="col-xs-3">
                         <a id="{{ menu_item|slugify }}-menu-item" href="
-                            {% if menu_item.arg %}
-                                {% url menu_item.url menu_item.arg %}
-                            {% else %}
-                                {% url menu_item.url %}
-                            {% endif %}"
-                                {% if user.settings.keyboard and menu_item.keyboard_shortcut %}
-                           data-toggle="tooltip" title="Shortcut: {{ menu_item.keyboard_shortcut }}"
-                                {% endif %}>
+                                {% if menu_item.arg %}
+                                    {% url menu_item.url menu_item.arg %}
+                                {% else %}
+                                    {% url menu_item.url %}
+                                {% endif %}">
                             {% if menu_item.icon %}
-                                <h1>{{ menu_item.icon }}</h1>
+                                <h1>
+                                    <span class="label label-default bg-{{ menu_type }}"
+                                        {% if user.settings.keyboard and menu_item.keyboard_shortcut %}
+                                            data-toggle="tooltip" title="Shortcut: {{ menu_item.keyboard_shortcut }}"
+                                        {% endif %}>
+                                        {{ menu_item.icon }}
+                                    </span>
+                                </h1>
                             {% endif %}
                             <span style="white-space: nowrap">{{ menu_item }}</span>
                         </a>
-                    </div>
+                        </div>
                 {% endfor %}
             {% endif %}
         {% endfor %}

diff --git a/colegend/website/templates/website/_menu.html b/colegend/website/templates/website/_menu.html
@@ -43,7 +43,7 @@
                 {% endfor %}
 
                 <!-- Map button trigger modal -->
-                <li><a id="map" href="{% url 'map' %}" data-toggle="modal" data-target="#map-modal">{% icon "map" %}&nbsp;Map</a></li>
+                <li><a id="map" href="#" data-toggle="modal" data-target="#map-modal">{% icon "map" %}&nbsp;Map</a></li>
 
                 <li class="dropdown" data-placement="bottom" data-toggle="tooltip" title="Mentor Menu">
                     <a id="mentor-menu" href="#" class="dropdown-toggle" data-toggle="dropdown"><i

diff --git a/colegend/website/templates/website/map.html b/colegend/website/templates/website/map.html
@@ -14,28 +14,7 @@
     <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
     <div class="well text-center">
         <div class="row">
-        {% for menu_type, menu_items in menu_items.items %}
-            {% if menu_items %}
-                {% for menu_item in menu_items %}
-                        <div class="col-xs-3">
-                        <a id="{{ menu_item|slugify }}-menu-item" href="
-                                {% if menu_item.arg %}
-                                    {% url menu_item.url menu_item.arg %}
-                                {% else %}
-                                    {% url menu_item.url %}
-                                {% endif %}"
-                            {% if user.settings.keyboard and menu_item.keyboard_shortcut %}
-                                data-toggle="tooltip" title="Shortcut: {{ menu_item.keyboard_shortcut }}"
-                            {% endif %}>
-                            {% if menu_item.icon %}
-                                <h1>{{ menu_item.icon }}</h1>
-                            {% endif %}
-                            <span style="white-space: nowrap">{{ menu_item }}</span>
-                        </a>
-                        </div>
-                {% endfor %}
-            {% endif %}
-        {% endfor %}
+            {% include "website/_map.html" %}
         </div>
     </div>
     </div>