Changeset 608 in tmcsimulator for branches/LCSv1/views


Ignore:
Timestamp:
03/30/2020 01:12:49 PM (6 years ago)
Author:
jdalbey
Message:

LCSv1 update layout.html and lcstrain.css to enhance nav bar functionality to show selected tab in blue.

Location:
branches/LCSv1/views
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/LCSv1/views/layout.html

    r607 r608  
    1414          user-scalable = yes allows the user to zoom in --> 
    1515    <meta name="viewport" content="width=device-width, initial-scale=1.0"> 
    16     <title>{{=response.title or request.application}}</title> 
     16    <title>{{=response.title or request.application}} {{=request.function}}</title> 
    1717    <!-- http://dev.w3.org/html5/markup/meta.name.html --> 
    1818    <meta name="application-name" content="{{=request.application}}"> 
    … …  
    3636  <body> 
    3737    <div class="w2p_flash alert alert-dismissable">{{=response.flash or ''}}</div> 
     38       
     39      <!-- Don't show the banner and navbar on the login page --> 
     40     {{if (request.function != "index"):}} 
     41     <!-- LCS banner ===================================== --> 
    3842      <div class="container" id="banner"> 
    3943          <div class = "toplinks" style = "float:right"> 
    40 <a href="help.html">Help</a>&nbsp;&nbsp;&nbsp;<a href="index.html">Logout</a> 
     44              <a href="help.html" style="text-decoration:underline">Help</a>&nbsp;&nbsp;&nbsp; 
     45              <a href="index.html" style="text-decoration:underline">Logout</a> 
    4146          </div> 
    4247          <div class="lcslogo"> 
    … …  
    4651          </div> 
    4752      </div> 
    48     </div> 
    49     <!-- Navbar ======================================= --> 
    50     <div role="navigation" class="navtabs" style="margin-top: 3%;"> 
    51       <div class="tabrow">        
    52           {{for _item in response.menu or []:}} 
    53           {{if len(_item)<4 or not _item[3]:}} 
    54             <a class="tabBtn" href="{{=_item[2]}}">{{=_item[0]}}</a> 
    55           {{else:}} 
    56             <a class="tabBtn" href="{{=_item[2]}}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">{{=_item[0]}}</a> 
    57           {{pass}} 
    58           {{pass}} 
     53    <!-- LCS navbar ===================================== --> 
     54     <div role="navigation" class="navtabs"> 
     55      <div class="tabrow"> 
     56      <!-- Display the menu choices as tabs with the current page highlighted --> 
     57     {{for _item in response.menu or []:}} 
     58            <a class="tabBtn {{if _item[2].endswith(request.function):}}selectedTab{{pass}}" href="{{=_item[2]}}">{{=_item[0]}}</a> 
     59     {{pass}} 
    5960      </div> 
    6061      <hr class="tabBar"> 
    6162    </div> 
    62  
     63    {{pass}} 
    6364    <!-- Masthead ===================================== --> 
    6465    {{block header}} 

  • branches/LCSv1/views/layout.html.bak

    r593 r608  
    1414          user-scalable = yes allows the user to zoom in --> 
    1515    <meta name="viewport" content="width=device-width, initial-scale=1.0"> 
    16     <title>{{=response.title or request.application}}</title> 
     16    <title>{{=response.title or request.application}} {{=request.function}}</title> 
    1717    <!-- http://dev.w3.org/html5/markup/meta.name.html --> 
    1818    <meta name="application-name" content="{{=request.application}}"> 
    … …  
    3636  <body> 
    3737    <div class="w2p_flash alert alert-dismissable">{{=response.flash or ''}}</div> 
     38     {{if (request.function != "index"):}} 
     39     <!-- LCS banner ===================================== --> 
    3840      <div class="container" id="banner"> 
    3941          <div class = "toplinks" style = "float:right"> 
    40 <a href="help.html">Help</a>&nbsp;&nbsp;&nbsp;<a href="index.html">Logout</a> 
     42              <a href="help.html" style="text-decoration:underline">Help</a>&nbsp;&nbsp;&nbsp; 
     43              <a href="index.html" style="text-decoration:underline">Logout</a> 
    4144          </div> 
    42           <div class="title"> 
     45          <div class="lcslogo"> 
    4346             <h2> 
    4447                 Lane Closure System 
    … …  
    4649          </div> 
    4750      </div> 
     51    <!-- LCS navbar ===================================== --> 
     52     <div role="navigation" class="navtabs"> 
     53      <div class="tabrow"> 
     54     {{for _item in response.menu or []:}} 
     55            <a class="tabBtn {{if _item[2].endswith(request.function):}}selectedTab{{pass}}" href="{{=_item[2]}}">{{=_item[0]}}</a> 
     56     {{pass}} 
     57      </div> 
     58      <hr class="tabBar"> 
    4859    </div> 
    49     <!-- Navbar ======================================= --> 
    50     <nav class="navbar navbar-light navbar-expand-md bg-faded bg-dark navbar-dark justify-content-center"> 
    51        <a href="index.html" class="navbar-brand d-flex w-50 mr-auto"></a> 
    52        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation"> 
    53          <span class="navbar-toggler-icon"></span> 
    54        </button> 
    55        <div class="navbar-collapse collapse w-100" id="navbarNavDropdown"> 
    56          <ul class="navbar-nav w-100 justify-content-center"> 
    57           {{for _item in response.menu or []:}} 
    58           {{if len(_item)<4 or not _item[3]:}} 
    59           <li class="nav-item {{if _item[1]:}}active{{pass}}"> 
    60             <a class="nav-link" href="{{=_item[2]}}">{{=_item[0]}}</a> 
    61           </li> 
    62           {{else:}} 
    63           <li class="nav-item dropdown"> 
    64             <a class="nav-link dropdown-toggle" href="{{=_item[2]}}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">{{=_item[0]}}</a> 
    65             <div class="dropdown-menu"> 
    66               {{for _subitem in _item[3]:}} 
    67               <a class="dropdown-item" href="{{=_subitem[2]}}">{{=_subitem[0]}}</a> 
    68               {{pass}} 
    69             </div> 
    70           </li> 
    71           {{pass}} 
    72           {{pass}} 
    73         </ul> 
    74          
    75       </div> 
    76     </nav> 
    77  
     60    {{pass}} 
    7861    <!-- Masthead ===================================== --> 
    7962    {{block header}} 
Note: See TracChangeset for help on using the changeset viewer.