Commit e1076283 authored by Son Nguyen's avatar Son Nguyen Committed by Gerrit Code Review
Browse files

Merge "Minor styling fixes part4 (bug: 1465107)"

parents a59ab28b 1a508cd6
...@@ -2174,6 +2174,7 @@ function auth_generate_registration_form($formname, $authname='internal', $goto) ...@@ -2174,6 +2174,7 @@ function auth_generate_registration_form($formname, $authname='internal', $goto)
$elements['submit'] = array( $elements['submit'] = array(
'type' => 'submit', 'type' => 'submit',
'class' => 'btn-primary',
'value' => get_string('register'), 'value' => get_string('register'),
); );
......
...@@ -36,22 +36,17 @@ ...@@ -36,22 +36,17 @@
<li class="list-group-item{if !$data.active} list-group-item-warning{/if}" id="{$plugintype}.{$plugin}"> <li class="list-group-item{if !$data.active} list-group-item-warning{/if}" id="{$plugintype}.{$plugin}">
<div class="list-group-item-heading"> <div class="list-group-item-heading">
{$plugin} {$plugin}
{if $data.activateform} <div class="btn-group btn-group-top">
<div class="btn-group btn-group-top">
{$data.activateform|safe}
{/if}
{if $data.config} {if $data.config}
{if !$data.activateform} <div class="btn-group btn-group-top"> {/if}
<a class="btn btn-default pull-left" title="{str tag='configfor'} {$plugintype} {$plugin}" href="pluginconfig.php?plugintype={$plugintype}&amp;pluginname={$plugin}"> <a class="btn btn-default pull-left" title="{str tag='configfor'} {$plugintype} {$plugin}" href="pluginconfig.php?plugintype={$plugintype}&amp;pluginname={$plugin}">
<span class="icon icon-cog icon-lg"></span> <span class="icon icon-cog icon-lg"></span>
<span class="accessible-hidden sr-only ">{str tag='configfor'} {$plugintype} {$plugin}</span> <span class="accessible-hidden sr-only ">{str tag='configfor'} {$plugintype} {$plugin}</span>
</a> </a>
{/if} {/if}
{if $data.activateform}
{if $data.config || $data.activateform} {$data.activateform|safe}
</div>
{/if} {/if}
</div>
</div> </div>
{if $data.types} {if $data.types}
......
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
<div class="panel panel-default mtxl" id="results" > <div class="panel panel-default mtxl" id="results" >
<h2 class="panel-heading" id="resultsheading">{str tag="Results"}</h2> <h2 class="panel-heading" id="resultsheading">{str tag="Results"}</h2>
{if $results} {if $results}
<table id="searchresults" class="tablerenderer fullwidth listing"> <table id="searchresults" class="tablerenderer fullwidth table">
<thead> <thead>
<tr> <tr>
{foreach from=$columns key=f item=c} {foreach from=$columns key=f item=c}
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
{$pagination|safe} {$pagination|safe}
</div> </div>
<a class="panel-footer" id="csvlink" href="{$WWWROOT}admin/groups/archivescsvdownload.php{if $.request.institution}?institution={$.request.institution}{/if}" target="_blank"> <a class="panel-footer text-small" id="csvlink" href="{$WWWROOT}admin/groups/archivescsvdownload.php{if $.request.institution}?institution={$.request.institution}{/if}" target="_blank">
<span class="icon icon-table prs"></span> <span class="icon icon-table prs"></span>
{str tag=exportdataascsv section=admin} {str tag=exportdataascsv section=admin}
</a> </a>
......
...@@ -34,8 +34,6 @@ ...@@ -34,8 +34,6 @@
{if $add} {if $add}
<h2 class="title panel-heading">{str tag="addinstitution" section="admin"}</h2> <h2 class="title panel-heading">{str tag="addinstitution" section="admin"}</h2>
{/if} {/if}
<h2 class="title panel-heading">{str tag="institution" section="admin"}</h2>
<div class="panel-body"> <div class="panel-body">
{$institution_form|safe} {$institution_form|safe}
</div> </div>
...@@ -54,7 +52,6 @@ ...@@ -54,7 +52,6 @@
{if $countinstitutions > 1} {if $countinstitutions > 1}
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false"> <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
<span class="icon icon-pencil icon-lg prs"></span> <span class="icon icon-pencil icon-lg prs"></span>
<span class="icon icon-ellipsis-h icon-xs"></span> <span class="icon icon-ellipsis-h icon-xs"></span>
......
{include file="header.tpl"} {include file="header.tpl"}
<p class="lead">{str tag="institutionmemberspagedescription" section="admin"}</p> <p class="lead">{str tag="institutionmemberspagedescription" section="admin"}</p>
<div class="panel panel-default panel-body"> <div class="panel panel-default panel-body">
<p>{$instructions}</p>
<p>{$instructions}</p> {$usertypeselector|safe}
{$usertypeselector|safe} <div class="userlistform">
<div class="userlistform"> {$institutionusersform|safe}
{$institutionusersform|safe} </div>
</div>
</div> </div>
{include file="footer.tpl"} {include file="footer.tpl"}
{include file="header.tpl"} {include file="header.tpl"}
<div class="lead">{str tag="pendingregistrationspagedescription" section="admin"}</div> <div class="lead">{str tag="pendingregistrationspagedescription" section="admin"}</div>
<div class="panel panel-default panel-body"> <div class="panel panel-default">
<div id="pendingonlineistcontainer"> <div id="pendingonlineistcontainer">
<table id="pendinglist" class="fullwidth listing"> {$data|safe}
<tbody> </div>
{$data|safe}
</tbody>
</table>
</div>
</div> </div>
{include file="footer.tpl"} {include file="footer.tpl"}
{if $data} {if $data}
<table id="pendinglist" class="fullwidth listing"> <table id="pendinglist" class="fullwidth table">
<thead> <thead>
<th>{str tag=pendingregistration section=admin}</th> <th>{str tag=pendingregistration section=admin}</th>
<th>{str tag=registrationreason section=admin}</th> <th>{str tag=registrationreason section=admin}</th>
<th>&nbsp;</th> <th>&nbsp;</th>
</thead> </thead>
<tbody> <tbody>
{foreach from=$data item=registration} {foreach from=$data item=registration}
<tr class="{cycle values='r0,r1'}"> <tr class="{cycle values='r0,r1'}">
<td class="pendinginfo"> <td class="pendinginfo">
<div id="pendinginfo_{$registration->id}"> <div id="pendinginfo_{$registration->id}">
<h3 class="title">{$registration->firstname} {$registration->lastname}</h3> <h3 class="title">{$registration->firstname} {$registration->lastname}</h3>
<div class="detail">{$registration->email}</div> <div class="detail">{$registration->email}</div>
</div> </div>
</td> </td>
<td class="pendinginfo"> <td class="pendinginfo">
<div class="detail">{$registration->reason}</div> <div class="detail">{$registration->reason}</div>
</td> </td>
<td class="right"> <td class="">
<a class="btn" href="{$WWWROOT}admin/users/actionregistration.php?r={$registration->id}&action=approve"><span class="btn-approve">{str tag=approve section=admin}</span></a> <div class="btn-group">
<a class="btn" href="{$WWWROOT}admin/users/actionregistration.php?r={$registration->id}&action=deny"><span class="btn-deny">{str tag=deny section=admin}</span></a> <a class="btn btn-default btn-xs" href="{$WWWROOT}admin/users/actionregistration.php?r={$registration->id}&action=approve">
</td> <span class="icon icon-lg left icon-check text-success"></span>
</tr> <span class="btn-approve">{str tag=approve section=admin}</span>
</a>
<a class="btn btn-default btn-xs" href="{$WWWROOT}admin/users/actionregistration.php?r={$registration->id}&action=deny">
<span class="icon icon-lg left icon-ban text-danger"></span>
<span class="btn-deny">{str tag=deny section=admin}</span></a>
</div>
</td>
</tr>
{/foreach} {/foreach}
{else} {else}
<tr><td><div class="lead text-small">{str tag=nopendingregistrations section=admin}</div></td></tr> <tr><td><div class="no-results">{str tag=nopendingregistrations section=admin}</div></td></tr>
{/if} {/if}
</tbody>
</table>
...@@ -2,11 +2,15 @@ ...@@ -2,11 +2,15 @@
{if $GROUP} {if $GROUP}
<h2>{$PAGESUBHEADING}{if $SUBPAGEHELPNAME}<span class="page-help-icon">{$PAGEHELPICON|safe}</span>{/if}</h2> <h2>{$PAGESUBHEADING}{if $SUBPAGEHELPNAME}<span class="page-help-icon">{$PAGEHELPICON|safe}</span>{/if}</h2>
{/if} {/if}
{if $ADMIN} {if $ADMIN || $INSTITUTIONALADMIN}
<div class="panel panel-default"> <div class="row">
<div class="panel-body"> <div class="col-md-9">
{$form|safe} <div class="panel panel-default">
</div> <div class="panel-body">
{$form|safe}
</div>
</div>
</div>
</div> </div>
{else} {else}
{$form|safe} {$form|safe}
......
...@@ -4,11 +4,19 @@ ...@@ -4,11 +4,19 @@
{elseif $pagedescriptionhtml} {elseif $pagedescriptionhtml}
{$pagedescriptionhtml|safe} {$pagedescriptionhtml|safe}
{/if} {/if}
{if $ADMIN}<div class="panel panel-default panel-body">{/if} {if $ADMIN || $INSTITUTIONALADMIN}
<div class="row">
{$form|safe} <div class="col-md-9">
<div class="panel panel-default">
{if $ADMIN}</div>{/if} <div class="panel-body">
{$form|safe}
</div>
</div>
</div>
</div>
{else}
{$form|safe}
{/if}
{include file="pagemodal.tpl"} {include file="pagemodal.tpl"}
{include file="footer.tpl"} {include file="footer.tpl"}
\ No newline at end of file
...@@ -184,7 +184,9 @@ ...@@ -184,7 +184,9 @@
IMPORTANT: do not introduce any new whitespace into the instanceList div. IMPORTANT: do not introduce any new whitespace into the instanceList div.
*}} *}}
<div id="instanceList">{{foreach $instancelist instance}}<div class="authInstance" id="instanceDiv{{$instance->id}}"> <div id="instanceList" class="pbl">
{{foreach $instancelist instance}}
<div class="authInstance" id="instanceDiv{{$instance->id}}">
<label class="authLabel"> <label class="authLabel">
<a href="" onclick="editinstance({{$instance->id}},'{{$instance->authname}}'); return false;"> <a href="" onclick="editinstance({{$instance->id}},'{{$instance->authname}}'); return false;">
{{str tag="title" section="auth.`$instance->authname`"}}</a> {{str tag="title" section="auth.`$instance->authname`"}}</a>
...@@ -207,17 +209,18 @@ IMPORTANT: do not introduce any new whitespace into the instanceList div. ...@@ -207,17 +209,18 @@ IMPORTANT: do not introduce any new whitespace into the instanceList div.
<span class="sr-only">{{str tag=deleteitem}}</span> <span class="sr-only">{{str tag=deleteitem}}</span>
</a> </a>
</span> </span>
</div>{{/foreach}} </div>
{{/foreach}}
</div> </div>
<div class="form-group"> <div class="select">
<span class="picker"> <span class="picker">
<select class="select form-control" name="dummy" id="dummySelect"> <select class="select form-control" name="dummy" id="dummySelect">
{{foreach $authtypes authtype}} {{foreach $authtypes authtype}}
<option value="{{$authtype->name}}"{{if !$authtype->is_usable}} disabled="disabled"{{/if}}>{{$authtype->title}} - {{$authtype->description}}</option> <option value="{{$authtype->name}}"{{if !$authtype->is_usable}} disabled="disabled"{{/if}}>{{$authtype->title}} - {{$authtype->description}}</option>
{{/foreach}} {{/foreach}}
</select> </select>
</span> </span>
<button class="btn btn-primary" type="button" onclick="addinstance(); return false;" name="button" value="foo">{{str tag=Add section=admin}}</button> <button class="btn btn-primary" type="button" onclick="addinstance(); return false;" name="button" value="foo">{{str tag=Add section=admin}}</button>
</div> </div>
<input type="hidden" id="instancePriority" name="instancePriority" value="{{$instancestring}}" /> <input type="hidden" id="instancePriority" name="instancePriority" value="{{$instancestring}}" />
......
...@@ -97,8 +97,8 @@ ...@@ -97,8 +97,8 @@
{$institutionselector|safe} {$institutionselector|safe}
</div> </div>
{/if} {/if}
{if isset($PAGEHEADING)}
{if isset($PAGEHEADING)}
<h1 class="{$headingclass}"> <h1 class="{$headingclass}">
{if isset($pageicon)} {if isset($pageicon)}
<span class="{$pageicon}"></span> <span class="{$pageicon}"></span>
...@@ -117,10 +117,7 @@ ...@@ -117,10 +117,7 @@
<span class="icon-rss icon icon-lg"></span> <span class="icon-rss icon icon-lg"></span>
</a> </a>
{/if} {/if}
</h1> </h1>
{/if} {/if}
{if $SUBPAGETOP} {if $SUBPAGETOP}
......
{include file="header.tpl"} {include file="header.tpl"}
<div class="message alert alert-{$type}">
<div class="message"> {$message|clean_html|safe}
{$message|clean_html|safe} </div>
</div>
{include file="footer.tpl"} {include file="footer.tpl"}
{include file="header.tpl"} {include file="header.tpl"}
{include file="view/editviewtabs.tpl" selected='title' new=$new issiteview=$issiteview} {include file="view/editviewtabs.tpl" selected='title' new=$new issiteview=$issiteview}
{if $ADMIN || $INSTITUTIONALADMIN}
<div class="row">
<div class="col-md-9">
<div class="panel panel-default">
<div class="panel-body">
{$editview|safe}
</div>
</div>
</div>
</div>
{else}
<div class="row"> <div class="row">
<div class="col-md-9"> <div class="col-md-9">
{$editview|safe} {$editview|safe}
</div> </div>
</div> </div>
{/if}
{include file="footer.tpl"} {include file="footer.tpl"}
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