diff farol/templates/base.j2 @ 125:67c4b299736e

Update look-and-feel
author Benoît Allard <benoit.allard@greenbone.net>
date Thu, 23 Oct 2014 16:18:30 +0200
parents ce64f90e58c4
children 3a56d5501ffa
line wrap: on
line diff
--- a/farol/templates/base.j2	Fri Oct 17 16:09:09 2014 +0200
+++ b/farol/templates/base.j2	Thu Oct 23 16:18:30 2014 +0200
@@ -65,7 +65,7 @@
                 <a role="menuitem" tabindex="-1" href="{{ url_for('producttree.view') }}">View Product Tree</a>
               </li>
               <li role="presentation" class="divider"></li>
-              {% for name, productid in products %}
+              {% for name, productid in products | sort %}
                 <li><a href="{{ url_for('producttree.view_product', productid=productid) }}">{{ name }}</a></li>
               {% endfor %}
             </ul>
@@ -84,15 +84,15 @@
         </ul>
         {% if has_current %}
           {% if error %}
-            <p class="navbar-text">Document is <a id="error-popover" href="#" tabindex="0" class="navbar-link" data-toggle="popover" data-trigger="focus" data-placement="bottom" title="First Error:" data-content="{{ error }}"><strong>invalid</strong></a></p>
+            <p class="navbar-text">Document is <a id="error-popover" href="#" tabindex="0" class="navbar-link" data-toggle="popover" data-trigger="focus" data-placement="bottom" title="First Error:" data-content="{{ error }}"><strong>invalid</strong></a> <span class="badge progress-bar-danger"><strong>&#x2717;</strong></span></p>
           {% else %}
-            <p class="navbar-text">Document looks valid</p>
+            <p class="navbar-text">Document looks valid <span class="badge progress-bar-success"><strong>&#x2713;</strong></span></p>
           {% endif %}
         {% endif %}
         <ul class="nav navbar-nav navbar-right">
           {% if has_current %}
           <li class="dropdown{{ ' active' if active == 'render' }}">
-            <a href="#" class="dropdown-toggle" data-toggle="dropdown">Render <span class="caret"></span></a>
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown">Export <span class="caret"></span></a>
             <ul class="dropdown-menu" role="menu">
               {% for format in ('cvrf', 'nasl', 'oval') %}<li><a href="{{ url_for('render', format_=format)}}">as {{ format | upper }}</a></li>{% endfor %}
             </ul>

http://farol.wald.intevation.org