[LNT] r255987 - Reorganize the nav bar

Chris Matthews via llvm-commits llvm-commits at lists.llvm.org
Thu Dec 17 22:02:10 PST 2015


Author: cmatthews
Date: Fri Dec 18 00:02:09 2015
New Revision: 255987

URL: http://llvm.org/viewvc/llvm-project?rev=255987&view=rev
Log:
Reorganize the nav bar

Add a system menu into the nav bar. Change the goto menu to be the name
of the suite it operates on.  Move suite and DB next to each other,
they are related.

Modified:
    lnt/trunk/lnt/server/ui/templates/layout.html

Modified: lnt/trunk/lnt/server/ui/templates/layout.html
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/server/ui/templates/layout.html?rev=255987&r1=255986&r2=255987&view=diff
==============================================================================
--- lnt/trunk/lnt/server/ui/templates/layout.html (original)
+++ lnt/trunk/lnt/server/ui/templates/layout.html Fri Dec 18 00:02:09 2015
@@ -104,30 +104,50 @@
             {# LNT Instance Title #}
                 <div id="lnt-instance">
                     <a class="brand" href="{{url_for('index')}}">{{old_config.name}}</a>
+                </div>
+                {# Database Selector #}
+                <ul class="nav">
                     {% if g.db_name is defined %}
-                    <ul class="nav">
-                        <li class="dropdown">
-                            <a href="#" class="dropdown-toggle" data-toggle="dropdown">Suite<b class="caret"></b></a>
-                            <ul class="dropdown-menu">
-                                {% for name in request.get_db().testsuite %}
-                                    <li><a href="{{db_url_for('v4_recent_activity', testsuite_name=name)}}">{{name}}</a></li>
-                                {% endfor %}
-                            </ul>
-                        </li>
-                    </ul>
+                    <li class="dropdown">
+                        <a href="#" class="dropdown-toggle" data-toggle="dropdown" id="dbselect" >Database <b class="caret"></b></a>
+                        <ul class="dropdown-menu">
+                            {% for name in old_config.databases.keys()|sort %}
+                                <li><a href="{{ url_for('select_db', db=name, path=request.path) }}">
+                                {% if name == g.db_name %}
+                                    <b>{{ name }}</b>
+                                {% else %}
+                                    {{ name }}
+                                {% endif %}
+                                </a></li>
+                            {% endfor %}
+                        </ul>
+                    </li>
                     {% endif %}
-                </div>
-        
-                {# Go to #}
+                </ul>
+                {% if g.db_name is defined %}
+                <ul class="nav">
+                    <li class="dropdown">
+                        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Suite<b class="caret"></b></a>
+                        <ul class="dropdown-menu">
+                            {% for name in request.get_db().testsuite %}
+                                <li><a href="{{db_url_for('v4_recent_activity', testsuite_name=name)}}">{{name}}</a></li>
+                            {% endfor %}
+                        </ul>
+                    </li>
+                </ul>
+                {% endif %}
+                {# Test Suite #}
                 {% if g.testsuite_name is defined %}
                     <ul class="nav">
                         <li class="dropdown">
-                            <a href="#" class="dropdown-toggle" data-toggle="dropdown">Go to<b class="caret"></b></a>
+                            <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{g.testsuite_name}}<b class="caret"></b></a>
                             <ul class="dropdown-menu">
                               <li><a href="{{ v4_url_for('v4_recent_activity') }}">Recent Activity</a></li>
                               <li><a href="{{ v4_url_for('v4_global_status') }}">Global Status</a></li>
                               <li><a href="{{ v4_url_for('v4_daily_report_overview') }}">Daily Report</a></li>
                               <li><a href="{{ v4_url_for('v4_machines') }}">All Machines</a></li>
+                               <li class="divider"></li>
+                              <li class="disabled"><a href="#">Changes</a></li>
                               <li><a href="{{ v4_url_for('v4_regression_list', state=0) }}">Detected</a></li>
                               <li><a href="{{ v4_url_for('v4_regression_list', state=1) }}">Staged</a></li>
                               <li><a href="{{ v4_url_for('v4_regression_list', state=10) }}">Active</a></li>
@@ -136,10 +156,6 @@
                               <li><a href="{{ v4_url_for('v4_regression_list', state=23) }}">Verify</a></li>
                               <li><a href="{{ v4_url_for('v4_regression_list', state=22) }}">Fixed</a></li>
                               <li><a href="{{ v4_url_for('v4_regression_list', state=-1) }}">All</a></li>
-                              <li><a href="/log">Logs</a></li>
-                              <li><a href="/rules">Rules</a></li>
-                              <li><a href="/static/docs/index.html">Documentation</a></li>
-                              
                               <li class="divider"></li>
                               <li class="disabled"><a href="#">Summary Report</a></li>
                               {#"{{ v4_url_for('v4_summary_report') }}"#}
@@ -147,27 +163,19 @@
                         </li>
                     </ul>
                 {% endif %}
-
-                {# Database Selector #}
                 <ul class="nav pull-right">
-                    {% if g.db_name is defined %}
                     <li class="dropdown">
-                        <a href="#" class="dropdown-toggle" data-toggle="dropdown" id="dbselect" >Database <b class="caret"></b></a>
+                        <a href="#" class="dropdown-toggle" data-toggle="dropdown">System<b class="caret"></b></a>
                         <ul class="dropdown-menu">
-                            {% for name in old_config.databases.keys()|sort %}
-                                <li><a href="{{ url_for('select_db', db=name, path=request.path) }}">
-                                {% if name == g.db_name %}
-                                    <b>{{ name }}</b>
-                                {% else %}
-                                    {{ name }}
-                                {% endif %}
-                                </a></li>
-                            {% endfor %}
+                          <li><a href="/log">Logs</a></li>
+                          <li><a href="/rules">Rules</a></li>
+                          <li><a href="/static/docs/index.html">Documentation</a></li>
                         </ul>
                     </li>
-                    {% endif %}
                 </ul>
 
+                
+
             </div>
             <div>
                 {# Navigation Breadcrumbs #}




More information about the llvm-commits mailing list