Commit 5f36b126 authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files

Merge "More minor fixes - part 3 (bug: 1465107)"

parents 4e390a5b f204a8ad
......@@ -123,7 +123,7 @@
<h2 class="panel-heading" id="resultsheading">{str tag="Results"}</h2>
{if $results}
<div class="table-responsive">
<table id="searchresults" class="table table-striped fullwidth listing table-small">
<table id="searchresults" class="table table-striped fullwidth listing">
<thead>
<tr>
{foreach from=$columns key=f item=c}
......@@ -144,7 +144,7 @@
{if $c.help}
{$c.helplink|safe}
{/if}
{if $c.headhtml}<div class="headhtml">{$c.headhtml|safe}</div>{/if}
{if $c.headhtml}<div class="headhtml allnone-toggles">{$c.headhtml|safe}</div>{/if}
{if !$c.mergefirst}
</th>
{/if}
......@@ -160,7 +160,7 @@
{$pagination|safe}
</div>
{else}
<div class="panel-body">{str tag="noresultsfound"}</div>
<div class="panel-body"><p class="no-results">{str tag="noresultsfound"}</p></div>
{/if}
{if $USER->get('admin') || $USER->is_institutional_admin() || get_config('staffreports')}
<div class="withselectedusers panel-body">
......
{include file="header.tpl"}
<div class="panel panel-default panel-body">
{$typeform|safe}
{$typeform|safe}
<div class="panel panel-default panel-body mtl">
{$buttonformopen|safe}
{$buttonform|safe}
<table id="suspendedlist" class="table fullwidth mtxl pull-left">
{$buttonform|safe}
<table id="suspendedlist" class="table fullwidth pull-left ptl">
<thead>
<tr>
<th>{str tag=fullname}</th>
......@@ -14,9 +15,9 @@
<th>{str tag=expired section=admin}</th>
<th>{str tag=select}</th>
</tr>
</thead>
<tbody>
</tbody>
</thead>
<tbody>
</tbody>
</table>
</form>
</div>
......
<div class="table-responsive">
<table class="fullwidth table">
<table class="fullwidth table table-striped">
<thead>
<tr>
<th>{str tag=username}</th>
......
......@@ -131,19 +131,14 @@
});
</script>
<table class="userlisttable fullwidth">
<tr>
<td colspan="3" id="{{$name}}_messages">
</td>
</tr>
<tr>
<td colspan="3" class="ptl form-group last">
<td colspan="3" class="form-group last">
<label for="{{$name}}_search" class="plain sr-only">{{str tag='filter'}}</label>
<div class="input-group">
<input id="{{$name}}_search" type="text" class="text form-control">
<span class="input-group-btn">
<button id="{{$name}}_search_btn" type="button" class="btn btn-primary">
<span class="icon icon-filter prs"></span>
{{str tag='filter'}}
{{str tag='search'}}
</button>
</span>
</div>
......@@ -175,3 +170,4 @@
</tr>
</table>
<input type="hidden" id="{{$name}}" name="{{$name}}" value="{{$value}}">
<p id="{{$name}}_messages" class="description"></p>
......@@ -79,17 +79,16 @@
{if $SUBPAGENAV || $sectiontabs}
{assign $SUBPAGENAV item}
{$sectiontabs}
<div class="arrow-bar {$item.subnav.class}">
<span class="arrow hidden-xs">
<span class="text">
{if isset($PAGEHEADING)}{$PAGEHEADING}{/if}
</span>
<div class="arrow-bar {$item.subnav.class}">
<span class="arrow hidden-xs">
<span class="text">
{if isset($PAGEHEADING)}{$PAGEHEADING}{/if}
</span>
<span class="right-text">
{include file="inpagenav.tpl"}
</span>
</div>
</span>
<span class="right-text">
{include file="inpagenav.tpl"}
</span>
</div>
{/if}
{dynamic}{insert_messages}{/dynamic}
......
......@@ -5,13 +5,13 @@
<td>
<form class="nojs-hidden-inline" id="archive" action="{$WWWROOT}admin/users/exportqueue.php" method="post">
<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}">
<input type="button" class="button btn btn-default btn-xs" 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 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}">
<input type="button" class="button btn btn-default btn-xs" name="delete" id="deletebtn" value="{str tag=delete section=mahara}">
</form>
</td>
</tr>
......@@ -81,9 +81,9 @@
{/foreach}
</div>
{else}
<div class="message">
{str tag="nofonts" section="skin"}
</div>
<p class="no-results">
{str tag="nofonts" section="skin"}
</p>
{/if}
</div>
......
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