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
......@@ -49,10 +49,12 @@
{/if}
</ul>
<div class="navbar-form navbar-right">
{if !$nosearch && ($LOGGEDIN || $publicsearchallowed)}
{header_search_form}
{/if}
{if !$nosearch && ($LOGGEDIN || $publicsearchallowed)}
<div class="navbar-form navbar-right collapse navbar-collapse">
{header_search_form}
</div>
{/if}
......@@ -18,7 +18,7 @@
{foreach from=$displaydecisions key=opt item=displayopt}
{if !$view.disabled[$opt]}
<input id="decision_{$view.id}_{$opt}" class="viewdecision" id="{$view.id}" type="radio" name="decision_{$view.id}" value="{$opt}"{if $view.decision == $opt} checked="checked"{/if}>
<label for="decision_{$view.id}_{$opt}">{$displayopt}<span class="accessible-hidden">({$view.title})</span></label><br>
<label for="decision_{$view.id}_{$opt}">{$displayopt}<span class="accessible-hidden sr-only">({$view.title})</span></label><br>
{/if}
{/foreach}
</div>
......
......@@ -4,14 +4,14 @@
</td>
<td>
<form class="nojs-hidden-inline" id="archive" action="{$WWWROOT}admin/users/exportqueue.php" method="post">
<label class="accessible-hidden" for="exportbtn">{str tag=withselectedcontentexport section=admin}</label>
<label class="accessible-hidden sr-only" for="exportbtn">{str tag=withselectedcontentexport section=admin}</label>
<input type="button" class="button" name="export" id="exportbtn" value="{str tag=Archive section=admin}">
</form>
</td>
<td>
<form class="nojs-hidden-inline" id="exportdelete" action="{$WWWROOT}admin/users/exportqueue.php" method="post">
<label class="accessible-hidden" for="deletebtn">{str tag=withselectedcontentdelete section=admin}</label>
<label class="accessible-hidden sr-only" for="deletebtn">{str tag=withselectedcontentdelete section=admin}</label>
<input type="button" class="button" name="delete" id="deletebtn" value="{str tag=delete section=mahara}">
</form>
</td>
</tr>
\ No newline at end of file
</tr>
......@@ -12,7 +12,7 @@
{$form|safe}
{if $sitefonts}
{if $query}
<h2 id="searchresultsheading" class="accessible-hidden">{str tag=Results}</h2>
<h2 id="searchresultsheading" class="accessible-hidden sr-only">{str tag=Results}</h2>
{/if}
<div id="fontlist" class="fullwidth listing">
{foreach from=$sitefonts item=font}
......@@ -21,13 +21,13 @@
<ul class="actionlist">
<li class="notbtn">{str tag="fonttype.$font.fonttype" section="skin"}</li>
{if $font.fonttype == 'google'}
<li><a class="btn-display" href="javascript:" onclick="window.open('http://www.google.com/webfonts/specimen/{$font.urlencode}','specimen','width=700,height=800,toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,copyhistory=yes,resizable=no')">{str tag="viewfontspecimen" section="skin"}<span class="accessible-hidden">{str tag=viewfontspecimenfor section=skin arg1=$font.title}</span></a></li>
<li><a class="btn-display" href="javascript:" onclick="window.open('http://www.google.com/webfonts/specimen/{$font.urlencode}','specimen','width=700,height=800,toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,copyhistory=yes,resizable=no')">{str tag="viewfontspecimen" section="skin"}<span class="accessible-hidden sr-only">{str tag=viewfontspecimenfor section=skin arg1=$font.title}</span></a></li>
{else}
<li><a class="btn-display" href="javascript:" onclick="window.open('{$WWWROOT}admin/site/font/specimen.php?font={$font.name}','specimen','width=700,height=800,toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,copyhistory=yes,resizable=no')">{str tag="viewfontspecimen" section="skin"}<span class="accessible-hidden">{str tag=viewfontspecimenfor section=skin arg1=$font.title}</span></a></li>
<li><a class="btn-display" href="javascript:" onclick="window.open('{$WWWROOT}admin/site/font/specimen.php?font={$font.name}','specimen','width=700,height=800,toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,copyhistory=yes,resizable=no')">{str tag="viewfontspecimen" section="skin"}<span class="accessible-hidden sr-only">{str tag=viewfontspecimenfor section=skin arg1=$font.title}</span></a></li>
{/if}
{if $font.fonttype == 'site'}<li><a class="btn-edit" href="{$WWWROOT}admin/site/font/edit.php?font={$font.name}">{str tag="editproperties" section="skin"}<span class="accessible-hidden">{str tag=viewfontspecimenfor section=skin arg1=$font.title}</span></a></li>{/if}
{if $font.fonttype == 'site'}<li><a class="btn-add" href="{$WWWROOT}admin/site/font/add.php?font={$font.name}">{str tag="addfontvariant" section="skin"}<span class="accessible-hidden">{str tag=viewfontspecimenfor section=skin arg1=$font.title}</span></a></li>{/if}
<li><a class="btn-del" href="{$WWWROOT}admin/site/font/delete.php?font={$font.name}">{str tag=deletefont section=skin} <span class="accessible-hidden">{$font.title}</span></a></li>
{if $font.fonttype == 'site'}<li><a class="btn-edit" href="{$WWWROOT}admin/site/font/edit.php?font={$font.name}">{str tag="editproperties" section="skin"}<span class="accessible-hidden sr-only">{str tag=viewfontspecimenfor section=skin arg1=$font.title}</span></a></li>{/if}
{if $font.fonttype == 'site'}<li><a class="btn-add" href="{$WWWROOT}admin/site/font/add.php?font={$font.name}">{str tag="addfontvariant" section="skin"}<span class="accessible-hidden sr-only">{str tag=viewfontspecimenfor section=skin arg1=$font.title}</span></a></li>{/if}
<li><a class="btn-del" href="{$WWWROOT}admin/site/font/delete.php?font={$font.name}">{str tag=deletefont section=skin} <span class="accessible-hidden sr-only">{$font.title}</span></a></li>
</ul>
<div style="font-family:'{$font.title|escape_css_string}';font-size:{$size}pt;line-height:{$size}pt;padding:3px 0;">
{if $preview == 10}{$font.title}{/if}
......@@ -41,4 +41,4 @@
<div class="message">{str tag="nofonts" section="skin"}</div>
{/if}
{$pagination|safe}
{include file="footer.tpl"}
\ No newline at end of file
{include file="footer.tpl"}
......@@ -4,12 +4,12 @@
<div class="rbuttons"><a class="btn" href="{$WWWROOT}edittags.php">{str tag=edittags}</a></div>
<div class="tabswrap"><ul class="in-page-tabs">
{foreach from=$tagsortoptions key=tagsortfield item=selectedsort name=tagsortoptions}
<li{if $selectedsort} class="current-tab"{/if}><a href="{$WWWROOT}tags.php?ts={$tagsortfield}"{if $selectedsort} class="current-tab"{/if}>{str tag=sort$tagsortfield}<span class="accessible-hidden">({str tag=tab}{if $selectedsort} {str tag=selected}{/if})</span></a></li>
<li{if $selectedsort} class="current-tab"{/if}><a href="{$WWWROOT}tags.php?ts={$tagsortfield}"{if $selectedsort} class="current-tab"{/if}>{str tag=sort$tagsortfield}<span class="accessible-hidden sr-only">({str tag=tab}{if $selectedsort} {str tag=selected}{/if})</span></a></li>
{/foreach}
</ul></div>
<div class="subpage mytags">
{foreach from=$tags item=t}
<a id="tag:{$t->tag|urlencode|safe}" class="tag{if $t->tag == $tag} selected{/if}" href="{$WWWROOT}tags.php?tag={$t->tag|urlencode|safe}">{$t->tag|str_shorten_text:30}&nbsp;<span class="tagfreq">({$t->count})</span></a>
<a id="tag:{$t->tag|urlencode|safe}" class="tag{if $t->tag == $tag} selected{/if}" href="{$WWWROOT}tags.php?tag={$t->tag|urlencode|safe}">{$t->tag|str_shorten_text:30}&nbsp;<span class="tagfreq">({$t->count})</span></a>
{/foreach}
</div>
{else}
......
{include file="header.tpl"}
{$form|safe}
<h2 id="searchresultsheading" class="accessible-hidden hidden">{str tag=Results}</h2>
<h2 id="searchresultsheading" class="accessible-hidden hidden sr-only">{str tag=Results}</h2>
<div id="friendslist" class="fullwidth listing">
{$results.tablerows|safe}
</div>
......
<div class="tabswrap"><ul class="in-page-tabs">
{if $edittitle}<li {if $selected == 'title'} class="current-tab"{/if}><a{if $selected == 'title'} class="current-tab"{/if} href="{$WWWROOT}view/edit.php?id={$viewid}{if $new}&new=1{/if}">{str tag=edittitleanddescription section=view}<span class="accessible-hidden">({str tag=tab}{if $selected == 'title'} {str tag=selected}{/if})</span></a></li>{/if}
<li {if $selected == 'layout'} class="current-tab"{/if}><a{if $selected == 'layout'} class="current-tab"{/if} href="{$WWWROOT}view/layout.php?id={$viewid}{if $new}&new=1{/if}">{str tag=editlayout section=view}<span class="accessible-hidden">({str tag=tab}{if $selected == 'layout'} {str tag=selected}{/if})</span></a></li>
<li {if $selected == 'content'} class="current-tab"{/if}><a{if $selected == 'content'} class="current-tab"{/if} href="{$WWWROOT}view/blocks.php?id={$viewid}{if $new}&new=1{/if}">{str tag=editcontent section=view}<span class="accessible-hidden">({str tag=tab}{if $selected == 'content'} {str tag=selected}{/if})</span></a></li>
{if $edittitle}<li {if $selected == 'title'} class="current-tab"{/if}><a{if $selected == 'title'} class="current-tab"{/if} href="{$WWWROOT}view/edit.php?id={$viewid}{if $new}&new=1{/if}">{str tag=edittitleanddescription section=view}<span class="accessible-hidden sr-only">({str tag=tab}{if $selected == 'title'} {str tag=selected}{/if})</span></a></li>{/if}
<li {if $selected == 'layout'} class="current-tab"{/if}><a{if $selected == 'layout'} class="current-tab"{/if} href="{$WWWROOT}view/layout.php?id={$viewid}{if $new}&new=1{/if}">{str tag=editlayout section=view}<span class="accessible-hidden sr-only">({str tag=tab}{if $selected == 'layout'} {str tag=selected}{/if})</span></a></li>
<li {if $selected == 'content'} class="current-tab"{/if}><a{if $selected == 'content'} class="current-tab"{/if} href="{$WWWROOT}view/blocks.php?id={$viewid}{if $new}&new=1{/if}">{str tag=editcontent section=view}<span class="accessible-hidden sr-only">({str tag=tab}{if $selected == 'content'} {str tag=selected}{/if})</span></a></li>
{if !$issitetemplate}
{if can_use_skins(null, false, $issiteview)}<li {if $selected == 'skin'} class="current-tab"{/if}><a{if $selected == 'skin'} class="current-tab"{/if} href="{$WWWROOT}view/skin.php?id={$viewid}{if $new}&new=1{/if}">{str tag=chooseskin section=skin}<span class="accessible-hidden">({str tag=tab}{if $selected == 'skin'} {str tag=selected}{/if})</span></a></li>{/if}
{if can_use_skins(null, false, $issiteview)}<li {if $selected == 'skin'} class="current-tab"{/if}><a{if $selected == 'skin'} class="current-tab"{/if} href="{$WWWROOT}view/skin.php?id={$viewid}{if $new}&new=1{/if}">{str tag=chooseskin section=skin}<span class="accessible-hidden sr-only">({str tag=tab}{if $selected == 'skin'} {str tag=selected}{/if})</span></a></li>{/if}
<li class="displaypage"><a href="{$displaylink}">{str tag=displayview section=view} &raquo;</a></li>
{if $edittitle || $viewtype == 'profile'}<li class="sharepage"><a href="{$WWWROOT}view/access.php?id={$viewid}{if $new}&new=1{/if}">{str tag=shareview section=view} &raquo;</a></li>{/if}
{/if}
......
......@@ -18,7 +18,7 @@
{$searchform|safe}
{if $query}
<h2 id="searchresultsheading" class="accessible-hidden">{str tag=Results}</h2>
<h2 id="searchresultsheading" class="accessible-hidden sr-only">{str tag=Results}</h2>
{/if}
{if $views}
......
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