Commit 85b78c1f authored by Naomi Guyer's avatar Naomi Guyer Committed by Aaron Wells
Browse files

Navigation (bootstrap)

Bug 1465107: Use Bootstrap CSS Framework
Applied bootstrap tabs and tidy up form styling
Mobile menu
Add bootstrap accessibility, tab styling to bootstrap

Change-Id: Ifa42d482f5fd7e1cdfb52bae1ebb5ff3bf5085a9
parent 506c5805
......@@ -17,7 +17,7 @@
{if $data.notinstallable}
{str tag='notinstallable'}: {$data.notinstallable}
{else}
<span id="{$plugintype}.{$plugin}.install">(<a href="" onClick="{$installlink}('{$plugintype}.{$plugin}'); return false;">{str tag='install' section='admin'} <span class="accessible-hidden ">{$plugintype} {$plugin}</span></a>)</span>
<span id="{$plugintype}.{$plugin}.install">(<a href="" onClick="{$installlink}('{$plugintype}.{$plugin}'); return false;">{str tag='install' section='admin'} <span class="accessible-hidden sr-only">{$plugintype} {$plugin}</span></a>)</span>
{/if}
<span id="{$plugintype}.{$plugin}.message"></span>
</li>
......@@ -25,7 +25,7 @@
</ul>
</li>
{/if}
<li><b>{str tag='installedplugins'}</b>
<ul id="{$plugintype}.installed">
{foreach from=$installed key='plugin' item='data'}
......@@ -35,7 +35,7 @@
{/if}
{if $data.config}
{if !$data.activateform} [ {else} | {/if}
<a href="pluginconfig.php?plugintype={$plugintype}&amp;pluginname={$plugin}">{str tag='config'} <span class="accessible-hidden ">{str tag='configfor'} {$plugintype} {$plugin}</span></a>
<a href="pluginconfig.php?plugintype={$plugintype}&amp;pluginname={$plugin}">{str tag='config'} <span class="accessible-hidden sr-only ">{str tag='configfor'} {$plugintype} {$plugin}</span></a>
{/if}
{if $data.config || $data.activateform} ] {/if}
</li>
......@@ -44,7 +44,7 @@
<ul>
{foreach from=$data.types key='type' item='config'}
<li>{$type}
{if $config} [ <a href="pluginconfig.php?plugintype={$plugintype}&amp;pluginname={$plugin}&amp;type={$type}">{str tag='config'} <span class="accessible-hidden ">{str tag='configfor'} {$plugintype} {$plugin}</span></a> ]{/if}</li>
{if $config} [ <a href="pluginconfig.php?plugintype={$plugintype}&amp;pluginname={$plugin}&amp;type={$type}">{str tag='config'} <span class="accessible-hidden sr-only">{str tag='configfor'} {$plugintype} {$plugin}</span></a> ]{/if}</li>
{/foreach}
</ul>
</li>
......
......@@ -54,12 +54,12 @@
{if $c.sort}
<a href="{$searchurl}&sortby={$f}&sortdir={if $f == $sortby && $sortdir == 'asc'}desc{else}asc{/if}">
{$c.name}
<span class="accessible-hidden">({str tag=sortby} {if $f == $sortby && $sortdir == 'asc'}{str tag=descending}{else}{str tag=ascending}{/if})</span>
<span class="accessible-hidden sr-only">({str tag=sortby} {if $f == $sortby && $sortdir == 'asc'}{str tag=descending}{else}{str tag=ascending}{/if})</span>
</a>
{else}
{$c.name}
{if $c.accessible}
<span class="accessible-hidden">{$c.accessible}</span>
<span class="accessible-hidden sr-only">{$c.accessible}</span>
{/if}
{/if}
{if $c.help}
......
......@@ -12,7 +12,7 @@
<th>{str tag="groupcategory" section="group"}</th>
{/if}
<th>{str tag="groupvisible" section="admin"}</th>
<th><span class="accessible-hidden">{str tag=edit}</span></th>
<th><span class="accessible-hidden sr-only">{str tag=edit}</span></th>
</tr>
</thead>
<tbody>
......
......@@ -8,7 +8,7 @@
<div class="site-stats-right">
<div class="tabswrap"><ul class="in-page-tabs">
{foreach from=$subpages item=subpage}
<li{if $subpage == $type} class="current-tab"{/if}><a {if $subpage == $type}class="current-tab" {/if}href="{$WWWROOT}admin/statistics.php?type={$subpage}">{str tag=$subpage}<span class="accessible-hidden">({str tag=tab}{if $subpage == $type} {str tag=selected}{/if})</span></a></li>
<li{if $subpage == $type} class="current-tab"{/if}><a {if $subpage == $type}class="current-tab" {/if}href="{$WWWROOT}admin/statistics.php?type={$subpage}">{str tag=$subpage}<span class="accessible-hidden sr-only">({str tag=tab}{if $subpage == $type} {str tag=selected}{/if})</span></a></li>
{/foreach}
</ul></div>
......@@ -21,7 +21,7 @@
{if $subpagedata.table.csv}
<div class="fr">
<span class="bulkaction-title">{str tag=exportstatsascsv section=admin}:</span>
<a href="{$WWWROOT}download.php" target="_blank">{str tag=Download section=admin} <span class="accessible-hidden"> {str tag=downloaddataascsv section=admin args=$type}</span></a>
<a href="{$WWWROOT}download.php" target="_blank">{str tag=Download section=admin} <span class="accessible-hidden sr-only"> {str tag=downloaddataascsv section=admin args=$type}</span></a>
</div>
{/if}
<div id="statistics_table_container" class="statistics-subpage-{if $subpagedata.summary}right{else}full{/if}-column {if $subpagedata.table.count == 0} hidden{/if}">
......
......@@ -38,12 +38,12 @@
{if $c.sort}
<a href="{$searchurl}&sortby={$f}&sortdir={if $f == $sortby && $sortdir == 'asc'}desc{else}asc{/if}">
{$c.name}
<span class="accessible-hidden">({str tag=sortby} {if $f == $sortby && $sortdir == 'asc'}{str tag=descending}{else}{str tag=ascending}{/if})</span>
<span class="accessible-hidden sr-only">({str tag=sortby} {if $f == $sortby && $sortdir == 'asc'}{str tag=descending}{else}{str tag=ascending}{/if})</span>
</a>
{else}
{$c.name}
{if $c.accessible}
<span class="accessible-hidden">{$c.accessible}</span>
<span class="accessible-hidden sr-only">{$c.accessible}</span>
{/if}
{/if}
{if $c.help}
......
......@@ -41,7 +41,7 @@
<th class="center">{str tag="Staff" section="admin"}</th>
<th class="center">{str tag="Admins" section="admin"}</th>
<th></th>
<th><span class="accessible-hidden">{str tag=edit}</span></th>
<th><span class="accessible-hidden sr-only">{str tag=edit}</span></th>
</tr>
</thead>
<tfoot>
......
......@@ -13,7 +13,7 @@
{foreach from=$tabs item=tab}
<li {if $tab.selected} class="current-tab"{/if}>
<button type="submit" class="linkbtn{if $tab.selected} current-tab{/if}" name="report:{$tab.id}" value="{$tab.name}" />
{$tab.name}<span class="accessible-hidden">({str tag=tab}{if $tab.selected} {str tag=selected}{/if})</span>
{$tab.name}<span class="accessible-hidden sr-only">({str tag=tab}{if $tab.selected} {str tag=selected}{/if})</span>
</button>
</li>
{/foreach}
......@@ -24,7 +24,7 @@
{if $csv}
<div class="fr">
<span class="bulkaction-title">{str tag=exportusersascsv section=admin}:</span>
<a href="{$WWWROOT}download.php" target="_blank">{str tag=Download section=admin} <span class="accessible-hidden">{str tag=downloadusersascsv section=admin}</span></a>
<a href="{$WWWROOT}download.php" target="_blank">{str tag=Download section=admin} <span class="accessible-hidden sr-only">{str tag=downloadusersascsv section=admin}</span></a>
</div>
{/if}
<h2>{str tag=selectedusers section=admin} ({count($users)})</h2>
......
{include file="header.tpl"}
<p>{str tag="usersearchinstructions" section="admin"}</p>
<span class="accessible-hidden" tabindex="0">{str tag="filterresultsby"}</span>
<span class="accessible-hidden sr-only" tabindex="0">{str tag="filterresultsby"}</span>
<div id="initials">
<div id="firstnamelist">
<strong id="firstname">{str tag="firstname"}:</strong>
......@@ -79,12 +79,12 @@
<strong>{str tag=withselectedusers section=admin}: </strong>
{if $USER->get('admin') || $USER->is_institutional_admin()}
<form class="nojs-hidden-inline" id="bulkactions" action="{$WWWROOT}admin/users/bulk.php" method="post">
<label class="accessible-hidden" for="editbtn">{str tag=withselectedusersedit section=admin}</label>
<label class="accessible-hidden sr-only" for="editbtn">{str tag=withselectedusersedit section=admin}</label>
<input type="button" class="button" name="edit" id="editbtn" value="{str tag=edit}">
</form>
{/if}
<form class="nojs-hidden-inline" id="report" action="{$WWWROOT}admin/users/report.php" method="post">
<label class="accessible-hidden" for="reportsbtn">{str tag=withselectedusersreports section=admin}</label>
<label class="accessible-hidden sr-only" for="reportsbtn">{str tag=withselectedusersreports section=admin}</label>
<input type="button" class="button" name="reports" id="reportsbtn" value="{str tag=getreports section=admin}">
</form>
<div id="nousersselected" class="hidden error">{str tag=nousersselected section=admin}</div>
......@@ -101,12 +101,12 @@
{if $c.sort}
<a href="{$searchurl}&sortby={$f}&sortdir={if $f == $sortby && $sortdir == 'asc'}desc{else}asc{/if}">
{$c.name}
<span class="accessible-hidden">({str tag=sortby} {if $f == $sortby && $sortdir == 'asc'}{str tag=descending}{else}{str tag=ascending}{/if})</span>
<span class="accessible-hidden sr-only">({str tag=sortby} {if $f == $sortby && $sortdir == 'asc'}{str tag=descending}{else}{str tag=ascending}{/if})</span>
</a>
{else}
{$c.name}
{if $c.accessible}
<span class="accessible-hidden">{$c.accessible}</span>
<span class="accessible-hidden sr-only">{$c.accessible}</span>
{/if}
{/if}
{if $c.help}
......
<label class="accessible-hidden" for="selectusers_{$r.id}">{str tag=selectuser section=admin arg1="$r.firstname $r.lastname"}</label>
<label class="accessible-hidden sr-only" for="selectusers_{$r.id}">{str tag=selectuser section=admin arg1="$r.firstname $r.lastname"}</label>
<input name="selectusers" class="selectusers" type="checkbox" id="selectusers_{$r.id}" value="{$r.id}">
<label class="accessible-hidden" for="selectusersexport_{$r.eid}">{str tag=selectuserexport section=admin arg1="$r.contentname"}</label>
<label class="accessible-hidden sr-only" for="selectusersexport_{$r.eid}">{str tag=selectuserexport section=admin arg1="$r.contentname"}</label>
<input name="selectusersexport" class="selectusersexport" type="checkbox" id="selectusersexport_{$r.eid}" value="{$r.eid}"{if $r.statustype eq 'pending'} disabled{/if}>
<label class="accessible-hidden" for="selectusersexportdelete_{$r.eid}">{str tag=selectuserexportdelete section=admin arg1="$r.contentname"}</label>
<label class="accessible-hidden sr-only" for="selectusersexportdelete_{$r.eid}">{str tag=selectuserexportdelete section=admin arg1="$r.contentname"}</label>
<input name="selectusersexportdelete" class="selectusersexportdelete" type="checkbox" id="selectusersexportdelete_{$r.eid}" value="{$r.eid}">
......@@ -10,7 +10,7 @@
<div class="tabswrap"><h3 class="rd-tab-title"><a href="#">{str tag=tabs}<span class="rd-tab"></span></a></h3>
<ul class="in-page-tabs">
{foreach from=$subpages item=subpage}
<li{if $subpage == $type} class="current-tab"{/if}><a {if $subpage == $type}class="current-tab" {/if}href="{$WWWROOT}admin/users/statistics.php?institution={$institutiondata.name}&type={$subpage}">{str tag=$subpage}<span class="accessible-hidden">({str tag=tab}{if $subpage == $type} {str tag=selected}{/if})</span></a></li>
<li{if $subpage == $type} class="current-tab"{/if}><a {if $subpage == $type}class="current-tab" {/if}href="{$WWWROOT}admin/users/statistics.php?institution={$institutiondata.name}&type={$subpage}">{str tag=$subpage}<span class="accessible-hidden sr-only">({str tag=tab}{if $subpage == $type} {str tag=selected}{/if})</span></a></li>
{/foreach}
</ul></div>
......@@ -23,7 +23,7 @@
{if $subpagedata.table.csv}
<div class="fr">
<span class="bulkaction-title">{str tag=exportstatsascsv section=admin}:</span>
<a href="{$WWWROOT}download.php" target="_blank">{str tag=Download section=admin} <span class="accessible-hidden">{str tag=downloadstatsascsv section=admin}</span></a>
<a href="{$WWWROOT}download.php" target="_blank">{str tag=Download section=admin} <span class="accessible-hidden sr-only">{str tag=downloadstatsascsv section=admin}</span></a>
</div>
{/if}
<div id="statistics_table_container" class="statistics-subpage-{if $subpagedata.summary}right{else}full{/if}-column {if $subpagedata.table.count == 0} hidden{/if}">
......
......@@ -2,7 +2,7 @@
{{foreach from=$validated item=email}}
<div class="validated">
<label for="{{$form}}_{{$name}}">
<span class="accessible-hidden">{{$title}}: </span>
<span class="accessible-hidden sr-only">{{$title}}: </span>
</label>
<input disabled {{if $email == $default}} checked{{/if}}{{if $describedby}} aria-describedby="{{$describedby}}"{{/if}} type="radio" name="{{$name}}_locked" value="{{$email}}" id="{{$form}}_{{$name}}">
{{$email}}
......@@ -100,7 +100,7 @@
<input{{if $email == $default}} checked{{/if}} type="radio" id="{{$name}}_radio_{{$i}}" name="{{$name}}_selected" value="{{$email}}">
<input type="hidden" name="{{$name}}_valid[]" value="{{$email}}">
<label for="{{$name}}_radio_{{$i}}">
<span class="accessible-hidden">{{$title}}: </span>{{$email}}
<span class="accessible-hidden sr-only">{{$title}}: </span>{{$email}}
</label>
<a href="" onclick="{{$name}}_remove(this); return false;"><img class="inline-button"alt="{{str tag=delete}}" src="{{theme_url filename="images/btn_deleteremove.png"}}" /></a>
</div>
......
......@@ -19,7 +19,7 @@
{{if $maxfilesize}}
<input type="hidden" name="MAX_FILE_SIZE" value="{{$maxfilesize}}">
{{/if}}
<label id="{{$name}}_files_label" class="accessible-hidden" for="{{$name}}_files_0">{{$title}}</label>
<label id="{{$name}}_files_label" class="accessible-hidden sr-only" for="{{$name}}_files_0">{{$title}}</label>
<input type="file" id="{{$name}}_files_0" name="{{$name}}_files_0">
</div>
<a class="btn-addfile" href="" onclick="{{$name}}_new(); return false;">
......
......@@ -8,7 +8,7 @@
<legend><a href="" id="viewacl-advanced-show">{{str tag=otherusersandgroups section=view}}</a></legend>
<div class="viewacl-advanced-search">
<label for="search">{{str tag=search}}</label>
<label class="accessible-hidden" for="type">{{str tag=searchtype}}</label>
<label class="accessible-hidden sr-only" for="type">{{str tag=searchtype}}</label>
<select name="type" id="type">
<option value="friend" selected="selected">{{str tag=friends section=view}}</option>
<option value="group">{{str tag=groups}}</option>
......@@ -27,12 +27,12 @@
<table id="accesslisttable" class="fr hidden fullwidth hidefocus" tabindex="-1">
<thead>
<tr class="accesslist-head">
<th><span class="accessible-hidden">{{str tag=profileicon section=view}}</span></th>
<th><span class="accessible-hidden sr-only">{{str tag=profileicon section=view}}</span></th>
<th>{{str tag=Added section=view}}</th>
<th>{{str tag=startdate section=view}}</th>
<th>{{str tag=stopdate section=view}}</th>
<th class="center comments{{if $allowcomments}} hidden{{/if}}">{{str tag=Comments section=artefact.comment}}</th>
<th><span class="accessible-hidden">{{str tag=edit}}</span></th>
<th><span class="accessible-hidden sr-only">{{str tag=edit}}</span></th>
</tr>
</thead>
<tbody id="accesslistitems">
......@@ -244,7 +244,7 @@ function renderAccessListItem(item) {
function makeCalendarInput(item, type, disabled) {
var label = LABEL({
'for': type + 'date_' + count,
'class': 'accessible-hidden'
'class': 'accessible-hidden sr-only'
}, get_string(type + 'date'));
var input = INPUT({
'type':'text',
......
......@@ -21,11 +21,11 @@
<li class="admincontrol">
<a href="{$WWWROOT}group/edit.php?id={$group->id}" title="{str(tag=editspecific arg1=$group->name)|escape:html|safe}" class="btn">
<span class="btn-edit">{str tag=editgroup section=group}</span>
<span class="accessible-hidden">{str tag=editspecific arg1=$group->name}</span>
<span class="accessible-hidden sr-only">{str tag=editspecific arg1=$group->name}</span>
</a>
<a href="{$WWWROOT}group/delete.php?id={$group->id}" title="{str(tag=deletespecific arg1=$group->name)|escape:html|safe}" class="btn">
<span class="btn-del">{str tag=deletegroup1 section=group}</span>
<span class="accessible-hidden">{str tag=deletespecific arg1=$group->name}</span>
<span class="accessible-hidden sr-only">{str tag=deletespecific arg1=$group->name}</span>
</a>
</li>
......
......@@ -18,11 +18,11 @@
<div class="cb"></div>
{if $membershiptype}
<h2 id="searchresultsheading">
<span class="accessible-hidden">{str tag=Results}: </span>
<span class="accessible-hidden sr-only">{str tag=Results}: </span>
{str tag=pendingmembers section=group}
</h2>
{else}
<h2 id="searchresultsheading" class="accessible-hidden hidden">{str tag=Results}</h2>
<h2 id="searchresultsheading" class="accessible-hidden hidden sr-only">{str tag=Results}</h2>
{/if}
<div id="results">
<div id="membersearchresults" class="tablerenderer fullwidth listing twocolumn">
......
......@@ -3,53 +3,39 @@
<!--[if IE 9 ]><html{if $LANGDIRECTION == 'rtl'} dir="rtl"{/if} lang="{$LANGUAGE}" class="ie ie9"><![endif]-->
<!--[if (gt IE 9)|!(IE)]><!--><html{if $LANGDIRECTION == 'rtl'} dir="rtl"{/if} lang="{$LANGUAGE}"><!--<![endif]-->
{include file="header/head.tpl"}
<body class="no-js">
{if $ADDITIONALHTMLTOPOFBODY}{$ADDITIONALHTMLTOPOFBODY|safe}{/if}
{if $USERMASQUERADING || !$PRODUCTIONMODE || $SITECLOSED || $SITETOP}
<div class="sitemessages">
{/if}
{if $USERMASQUERADING}
<div class="sitemessage alert alert-danger" role="alert"><img src="{theme_url filename='images/failure.png'}" alt="">{$masqueradedetails} {$becomeyouagain|safe}</div>
{/if}
{if !$PRODUCTIONMODE}
<div class="sitemessage alert alert-danger" role="alert">{str tag=notproductionsite section=error}</div>
{/if}
{if $SITECLOSED}
<div class="sitemessage alert alert-info" role="alert">
{if $SITECLOSED == 'logindisabled'}{str tag=siteclosedlogindisabled section=mahara arg1="`$WWWROOT`admin/upgrade.php"}{else}{str tag=siteclosed}{/if}</div>
{/if}
{if $SITETOP}
<div id="switchwrap">{$SITETOP|safe}</div>
{/if}
{if $USERMASQUERADING || !$PRODUCTIONMODE || $SITECLOSED || $SITETOP}
</div>
{/if}
<body data-usethemedjs="true" class="no-js {if $ADMIN || $INSTITUTIONALADMIN || $STAFF || $INSTITUTIONALSTAFF}admin{/if}">
<a class="sr-only sr-only-focusable" href="#main">{str tag=skipmenu}</a>
<div id="loading-box" class="loading-box"></div>
<header class="header navbar navbar-default navbar-fixed-top">
<div class="container">
<!-- Brand and toggle get grouped for better mobile display -->
<button type="button" class="menu-toggle navbar-toggle collapsed" data-toggle="collapse" data-target=".nav-main">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
{if $MAINNAV}
<!-- Brand and toggle get grouped for better mobile display -->
<button type="button" class="menu-toggle navbar-toggle collapsed" data-toggle="collapse" data-target=".nav-main">
<span class="sr-only">{str tag="show"} {str tag="menu"}</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
{/if}
{if !$nosearch && ($LOGGEDIN || $publicsearchallowed)}
<button type="button" class="navbar-toggle search-toggle collapsed" data-toggle="collapse" data-target=".navbar-form">
<span class="glyphicon glyphicon-search"></span>
<span class="nav-title sr-only">Toggle {str tag="search"}</span>
<span class="nav-title sr-only">{str tag="show"} {str tag="search"}</span>
</button>
{/if}
<span id="site-logo" class="site-logo">
<a href="{$WWWROOT}">
<img src="{$sitelogo}" alt="{$sitename}">
</a>
{if $ADMIN || $INSTITUTIONALADMIN || $STAFF || $INSTITUTIONALSTAFF}
<div class="admin-title">
<a href="{$WWWROOT}admin/" accesskey="a" class="admin-site">{str tag="administration"}</a>
</div>
{/if}
</span>
{include file="header/topright.tpl"}
</div>
......@@ -58,10 +44,31 @@
{include file="header/navigation.tpl"}
<div class="container">
{if $USERMASQUERADING || !$PRODUCTIONMODE || $SITECLOSED || $SITETOP}
<div class="sitemessages">
{/if}
{if $USERMASQUERADING}
<div class="sitemessage alert alert-danger" role="alert"><img src="{theme_url filename='images/failure.png'}" alt="">{$masqueradedetails} {$becomeyouagain|safe}</div>
{/if}
{if !$PRODUCTIONMODE}
<div class="sitemessage alert alert-danger" role="alert">{str tag=notproductionsite section=error}</div>
{/if}
{if $SITECLOSED}
<div class="sitemessage alert alert-info" role="alert">
{if $SITECLOSED == 'logindisabled'}{str tag=siteclosedlogindisabled section=mahara arg1="`$WWWROOT`admin/upgrade.php"}{else}{str tag=siteclosed}{/if}</div>
{/if}
{if $SITETOP}
<div id="switchwrap">{$SITETOP|safe}</div>
{/if}
{if $USERMASQUERADING || !$PRODUCTIONMODE || $SITECLOSED || $SITETOP}
</div>
{/if}
<div class="row">
<div id="main" class="{if $SIDEBARS}{if $SIDEBLOCKS.right}col-md-9 {else}col-md-9 col-md-push-3{/if}{else}col-md-12{/if} main">
<div id="content" class="main-column{if $selected == 'content'} editcontent{/if}">
<div id="content" class="main-column{if $selected == 'content'} editcontent{/if}">
<div id="main-column-container">
{dynamic}{insert_messages}{/dynamic}
{if isset($PAGEHEADING)}
<h1>{$PAGEHEADING}{if $PAGEHELPNAME}<span class="page-help-icon">{$PAGEHELPICON|safe}</span>{/if}</h1>
......@@ -72,17 +79,15 @@
{include file=$SUBPAGETOP}
{/if}
{* Tabs and beginning of page container for group info pages *}
<div class="tabswrap">
<ul class="in-page-tabs">
<ul class="nav nav-pills">
{foreach from=$SUBPAGENAV item=item}
<li {if $item.selected}class="current-tab"{/if}>
<li {if $item.selected}class="current-tab active" role="presentation"{/if}>
<a {if $item.tooltip}title="{$item.tooltip}"{/if}{if $item.selected}class="current-tab" {/if}href="{$WWWROOT}{$item.url}">
{$item.title}
<span class="accessible-hidden">({str tag=tab}{if $item.selected} {str tag=selected}{/if})</span>
<span class="accessible-hidden sr-only">({str tag=tab}{if $item.selected} {str tag=selected}{/if})</span>
</a>
</li>
{/foreach}
</ul>
</div>
<div class="subpage">
{/if}
......@@ -31,6 +31,8 @@
{$INLINEJAVASCRIPT|safe}
</script>
{/if}
<link href='http://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,400,300,700' rel='stylesheet' type='text/css'>
{foreach from=$STYLESHEETLIST item=cssurl}
<link rel="stylesheet" type="text/css" href="{$cssurl}">
{/foreach}
......
{if $MAINNAV}
<nav id="main-nav" class="{if $ADMIN || $INSTITUTIONALADMIN || $STAFF || $INSTITUTIONALSTAFF}{if $DROPDOWNMENU}dropdown-adminnav {else}adminnav {/if}{/if} nav collapse navbar-collapse nav-main main-nav navbar-inverse">
<div class="container">
{if $ADMIN || $INSTITUTIONALADMIN || $STAFF || $INSTITUTIONALSTAFF}
<div class="navbar-header">
<span class="navbar-brand" href="">Administration <span class="glyphicon glyphicon-chevron-right"></span></span>
<a class="navbar-brand" href="{$WWWROOT}" accesskey="h" class="return-site">
<span class="glyphicon glyphicon-chevron-left"></span>
{str tag="returntosite"}
</a>
</div>
{/if}
<ul id="{if $DROPDOWNMENU}dropdown-nav{else}nav{/if}" class="nav navbar-nav">
{strip}
{foreach from=$MAINNAV item=item}
{foreach from=$MAINNAV item=item name=menu}
<li class="{if $item.path}{$item.path}{else}dashboard{/if}{if $item.selected} active{/if}{if $DROPDOWNMENU} dropdown-nav-home{/if}">
<a href="{$WWWROOT}{$item.url}"{if $item.accesskey} accesskey="{$item.accesskey}"{/if} class="{if $item.path}{$item.path}{else}dashboard{/if}">
{if $item.accessibletitle && !$DROPDOWNMENU}
......@@ -20,19 +23,25 @@
{$item.title}
{if $item.accessibletitle && !$DROPDOWNMENU}
</span>
<span class="accessible-hidden">
<span class="accessible-hidden sr-only">
({$item.accessibletitle})
</span>
{/if}
{if $DROPDOWNMENU && $item.submenu}
<span class="accessible-hidden">
<span class="accessible-hidden sr-only">
({str tag=dropdownmenu})
</span>
{/if}
</a>
{if $DROPDOWNMENU}
{if $item.submenu}
<ul class="dropdown-menu" role="menu">
<button type="button" class="navbar-showchildren navbar-toggle dropdown-toggle {if !$item.selected}collapsed{/if}" data-toggle="collapse" data-target="#childmenu-{$dwoo.foreach.menu.index}">
<span class="glyphicon glyphicon-chevron-down"></span>
<span class="nav-title sr-only">{str tag="show"} {str tag="menu"}</span>
</button>
{/if}
{if $item.submenu}
<ul id="childmenu-{$dwoo.foreach.menu.index}" class="{if $DROPDOWNMENU}dropdown-menu{else}hidden-md hidden-lg hidden-sm collapse {if $item.selected}in{/if}{/if} child-nav" role="menu">
{strip}
{foreach from=$item.submenu item=subitem}
<li class="{if $subitem.selected}active {/if}{if $subitem.submenu}has-sub {/if}">
......@@ -53,17 +62,12 @@
</li>
{/foreach}
{/strip}
<div class="cl"></div>
</ul>
{/if}
{/if}
</li>
{/foreach}
{if $ADMIN || $INSTITUTIONALADMIN || $STAFF || $INSTITUTIONALSTAFF}
<li class="returntosite">
<a href="{$WWWROOT}" accesskey="h" class="return-site">{str tag="returntosite"}</a>
</li>
{elseif $USER->get('admin')}
<li class="siteadmin">
<a href="{$WWWROOT}admin/" accesskey="a" class="admin-site">{str tag="administration"}</a>
......@@ -91,7 +95,7 @@
{if $SELECTEDSUBNAV}
<div class="navbar navbar-default navbar-secondary">
<div class="navbar navbar-default secondary-nav hidden-xs">
<div class="container">
<ul class="nav navbar-nav">
{strip}
......@@ -109,7 +113,7 @@
</div>
{/if}
{if $tertiarymenu}
<div class="navbar navbar-secondary">
<div class="navbar secondary-nav">
<div class="container">
<ul class="nav navbar-nav">
{strip}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment