Kevin Veroneau avatar Kevin Veroneau committed b19dac3

Updated template to nav can easily use block.super in successor templates. Also updates link filter to enable adding of a bootstrap icon.

Comments (0)

Files changed (2)

bootstrap_theme/templates/bootstrap_theme/fluid.html

         </div>
       </div>
     </div>
+    <div class="container-fluid">
 {% include 'bootstrap_theme/fragments/messages.html' %}
-    <div class="container-fluid">
       <div class="row-fluid">
         <div class="span3">
           <div class="well sidebar-nav">
-            {% block sidebar_nav %}
             <ul class="nav nav-list">
+              {% block sidebar_nav %}
               <li class="nav-header">Sidebar</li>
               <li class="active"><a href="#">Link</a></li>
               <li><a href="#">Link</a></li>
               <li><a href="#">Link</a></li>
               <li><a href="#">Link</a></li>
               <li><a href="#">Link</a></li>
+              {% endblock %}
             </ul>
-            {% endblock %}
           </div><!--/.well -->
         </div><!--/span-->
         <div class="span9">

bootstrap_theme/templatetags/bootstrap.py

 register.tag('dropdown', do_dropdown)
 
 @register.filter
-def link(value):
+def link(value, icon=None):
+    icon_html = '<i class="icon-%s"></i>' % icon if icon else ''
     try:
-        return mark_safe('<a href="%s">%s</a>' % (value.get_absolute_url(), value))
+        return mark_safe('<a href="%s">%s%s</a>' % (value.get_absolute_url(), icon_html, value))
     except:
         return value
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.