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
...@@ -24,7 +24,7 @@ $optionform = pieform(array( ...@@ -24,7 +24,7 @@ $optionform = pieform(array(
'pluginname' => 'admin', 'pluginname' => 'admin',
'elements' => array( 'elements' => array(
'allowgroupcategories' => array( 'allowgroupcategories' => array(
'class' => 'last pb0 pt0', 'class' => 'with-label-widthauto',
'type' => 'switchbox', 'type' => 'switchbox',
'title' => get_string('enablegroupcategories', 'admin'), 'title' => get_string('enablegroupcategories', 'admin'),
'defaultvalue' => get_config('allowgroupcategories'), 'defaultvalue' => get_config('allowgroupcategories'),
...@@ -74,7 +74,7 @@ function displaymenuitems(data) { ...@@ -74,7 +74,7 @@ function displaymenuitems(data) {
var rows = map(formatrow,itemlist); var rows = map(formatrow,itemlist);
var form = FORM({'id':'form','method':'post','enctype':'multipart/form-data', var form = FORM({'id':'form','method':'post','enctype':'multipart/form-data',
'encoding':'multipart/form-data'}, 'encoding':'multipart/form-data'},
TABLE({'class':'nohead table'},TBODY(null,[thead,rows,addform()]))); TABLE({'class':'nohead table table-short'},TBODY(null,[thead,rows,addform()])));
replaceChildNodes($('menuitemlist'),form); replaceChildNodes($('menuitemlist'),form);
if (data.focusid) { if (data.focusid) {
$('item' + data.focusid).focus(); $('item' + data.focusid).focus();
...@@ -135,7 +135,7 @@ function editform(item) { ...@@ -135,7 +135,7 @@ function editform(item) {
// Either a save, a cancel button, or both. // Either a save, a cancel button, or both.
var savecancel = []; var savecancel = [];
var save = INPUT({'type':'button','class':'button btn btn-sm btn-default mtl'}); var save = INPUT({'type':'button','class':'button btn btn-default mtl'});
connect(save, 'onclick', function () { saveitem(item.id); }); connect(save, 'onclick', function () { saveitem(item.id); });
var rowtype = 'add'; var rowtype = 'add';
......
...@@ -22,7 +22,6 @@ define('TITLE', get_string('administergroups', 'admin')); ...@@ -22,7 +22,6 @@ define('TITLE', get_string('administergroups', 'admin'));
$quotasform = pieform(array( $quotasform = pieform(array(
'name' => 'groupquotasform', 'name' => 'groupquotasform',
'class' => 'form-inline',
'renderer' => 'div', 'renderer' => 'div',
'elements' => array( 'elements' => array(
'groupid' => array( 'groupid' => array(
...@@ -31,20 +30,16 @@ $quotasform = pieform(array( ...@@ -31,20 +30,16 @@ $quotasform = pieform(array(
), ),
'quota' => array( 'quota' => array(
'type' => 'bytes', 'type' => 'bytes',
'hiddenlabel' => true,
'title' => get_string('filequota1', 'admin'), 'title' => get_string('filequota1', 'admin'),
'defaultvalue' => $group->quota, 'defaultvalue' => $group->quota,
'description' => '<p class="text-small text-lighttone">' .get_string('groupfilequotadescription', 'admin') . '</p>',
), ),
'submit' => array( 'submit' => array(
'type' => 'button', 'type' => 'submit',
'usebuttontag' => true, 'class' => 'btn-primary',
'class' => 'btn-primary ',
'value' => get_string('save'), 'value' => get_string('save'),
), )
'description' => array(
'type' => 'html',
'class' => 'text-block mtm',
'value' => '<p class="metadata">' .get_string('groupfilequotadescription', 'admin') . '</p>'
),
), ),
)); ));
...@@ -87,6 +82,7 @@ $groupadminsform = pieform(array( ...@@ -87,6 +82,7 @@ $groupadminsform = pieform(array(
'elements' => array( 'elements' => array(
'admins' => array( 'admins' => array(
'type' => 'userlist', 'type' => 'userlist',
'hiddenlabel' => true,
'title' => get_string('groupadmins', 'group'), 'title' => get_string('groupadmins', 'group'),
'defaultvalue' => $admins, 'defaultvalue' => $admins,
'lefttitle' => get_string('potentialadmins', 'admin'), 'lefttitle' => get_string('potentialadmins', 'admin'),
......
...@@ -675,9 +675,10 @@ $deleteform = pieform(array( ...@@ -675,9 +675,10 @@ $deleteform = pieform(array(
'value' => $id, 'value' => $id,
), ),
'submit' => array( 'submit' => array(
'type' => 'submit', 'type' => 'button',
'usebuttontag' => true,
'class' => 'btn-default', 'class' => 'btn-default',
'value' => get_string('deleteuser', 'admin'), 'value' => '<span class="icon icon-trash icon-lg text-danger left"></span><span>'. get_string('deleteuser', 'admin') . '</span>',
'confirm' => get_string('confirmdeleteuser', 'admin'), 'confirm' => get_string('confirmdeleteuser', 'admin'),
), ),
), ),
......
...@@ -58,6 +58,7 @@ $calendar = array( ...@@ -58,6 +58,7 @@ $calendar = array(
'name' => 'loggedindate', 'name' => 'loggedindate',
'id' => 'loggedindate', 'id' => 'loggedindate',
'tabindex' => false, 'tabindex' => false,
'class' => 'form-control mtm',
'type' => 'calendar', 'type' => 'calendar',
'title' => get_string('date'), 'title' => get_string('date'),
'imagefile' => $THEME->get_image_url('calendar'), 'imagefile' => $THEME->get_image_url('calendar'),
......
...@@ -25,6 +25,7 @@ $enc_type = json_encode($type); ...@@ -25,6 +25,7 @@ $enc_type = json_encode($type);
$typeform = pieform( $typeform = pieform(
array( array(
'name' => 'usertype', 'name' => 'usertype',
'class' => 'with-heading form-inline',
'elements' => array( 'elements' => array(
'type' => array( 'type' => array(
'type' => 'select', 'type' => 'select',
...@@ -91,7 +92,7 @@ $form = new Pieform(array( ...@@ -91,7 +92,7 @@ $form = new Pieform(array(
'elements' => array( 'elements' => array(
'buttons' => array( 'buttons' => array(
'type' => 'fieldset', 'type' => 'fieldset',
'class' => 'btn-group btn-group-top', 'class' => 'btn-group pull-right',
'isformgroup' => false, 'isformgroup' => false,
'elements' => array( 'elements' => array(
'unsuspend' => array( 'unsuspend' => array(
...@@ -102,6 +103,14 @@ $form = new Pieform(array( ...@@ -102,6 +103,14 @@ $form = new Pieform(array(
'name' => 'unsuspend', 'name' => 'unsuspend',
'value' => get_string('unsuspendusers', 'admin') 'value' => get_string('unsuspendusers', 'admin')
), ),
'unexpire' => array(
'class' => 'btn-default text-inline',
'type' => 'submit',
'isformgroup' => false,
'renderelementsonly' => true,
'name' => 'unexpire',
'value' => get_string('unexpireusers', 'admin')
),
'delete' => array( 'delete' => array(
'class' => 'btn-default text-inline', 'class' => 'btn-default text-inline',
'type' => 'submit', 'type' => 'submit',
...@@ -110,14 +119,6 @@ $form = new Pieform(array( ...@@ -110,14 +119,6 @@ $form = new Pieform(array(
'confirm' => get_string('confirmdeleteusers', 'admin'), 'confirm' => get_string('confirmdeleteusers', 'admin'),
'name' => 'delete', 'name' => 'delete',
'value' => get_string('deleteusers', 'admin') 'value' => get_string('deleteusers', 'admin')
),
'unexpire' => array(
'class' => 'btn-default text-inline',
'type' => 'submit',
'isformgroup' => false,
'renderelementsonly' => true,
'name' => 'unexpire',
'value' => get_string('unexpireusers', 'admin')
) )
) )
) )
......
...@@ -658,15 +658,15 @@ function build_admin_export_queue_results($search, $offset, $limit) { ...@@ -658,15 +658,15 @@ function build_admin_export_queue_results($search, $offset, $limit) {
'template' => 'admin/users/searchexportstatuscolumn.tpl', 'template' => 'admin/users/searchexportstatuscolumn.tpl',
), ),
'exportselect' => array( 'exportselect' => array(
'headhtml' => get_string('requeue', 'export') . '<br /><a href="" id="selectallexport">' . get_string('All') . '</a>&nbsp;<a href="" id="selectnoneexport">' . get_string('none') . '</a>', 'headhtml' => get_string('requeue', 'export') . '<br><div class="btn-group" role="group"><a class="btn btn-xs btn-default" href="" id="selectallexport">' . get_string('All') . '</a>&nbsp;<a class="btn btn-xs btn-default" href="" id="selectnoneexport">' . get_string('none') . '</a></div>',
'template' => 'admin/users/searchselectcolumnexport.tpl', 'template' => 'admin/users/searchselectcolumnexport.tpl',
'class' => 'center nojs-hidden-table-cell', 'class' => 'nojs-hidden-table-cell with-checkbox',
'accessible' => get_string('bulkselect'), 'accessible' => get_string('bulkselect'),
), ),
'deleteselect' => array( 'deleteselect' => array(
'headhtml' => get_string('delete') . '<br /><a href="" id="selectalldelete">' . get_string('All') . '</a>&nbsp;<a href="" id="selectnonedelete">' . get_string('none') . '</a>', 'headhtml' => get_string('delete') . '<br><div class="btn-group" role="group"><a class="btn btn-xs btn-default" href="" id="selectalldelete">' . get_string('All') . '</a>&nbsp;<a class="btn btn-xs btn-default" href="" id="selectnonedelete">' . get_string('none') . '</a></div>',
'template' => 'admin/users/searchselectcolumnexportdelete.tpl', 'template' => 'admin/users/searchselectcolumnexportdelete.tpl',
'class' => 'center nojs-hidden-table-cell', 'class' => 'nojs-hidden-table-cell with-checkbox',
'accessible' => get_string('bulkselect'), 'accessible' => get_string('bulkselect'),
), ),
); );
......
...@@ -4294,6 +4294,7 @@ function language_select_form() { ...@@ -4294,6 +4294,7 @@ function language_select_form() {
$languageform = pieform(array( $languageform = pieform(array(
'name' => 'languageselect', 'name' => 'languageselect',
'renderer' => 'oneline', 'renderer' => 'oneline',
'class' => 'with-label-widthauto',
'validate' => false, 'validate' => false,
'presubmitcallback' => '', 'presubmitcallback' => '',
'elements' => array( 'elements' => array(
...@@ -4305,6 +4306,7 @@ function language_select_form() { ...@@ -4305,6 +4306,7 @@ function language_select_form() {
), ),
'changelang' => array( 'changelang' => array(
'type' => 'submit', 'type' => 'submit',
'class' => 'btn-default',
'value' => get_string('change'), 'value' => get_string('change'),
) )
) )
......
...@@ -77,7 +77,6 @@ ...@@ -77,7 +77,6 @@
{if $SUBPAGENAV || $sectiontabs} {if $SUBPAGENAV || $sectiontabs}
{assign $SUBPAGENAV item} {assign $SUBPAGENAV item}
{$sectiontabs}
<div class="arrow-bar {$item.subnav.class}"> <div class="arrow-bar {$item.subnav.class}">
<span class="arrow hidden-xs"> <span class="arrow hidden-xs">
<span class="text"> <span class="text">
......
...@@ -98,7 +98,6 @@ echo $form_tag; ...@@ -98,7 +98,6 @@ echo $form_tag;
$accountoptions_fieldset = array( $accountoptions_fieldset = array(
'name' => 'generalaccountoptions', 'name' => 'generalaccountoptions',
'type' => 'fieldset', 'type' => 'fieldset',
'class' => 'last',
'elements' => $fieldset_elements, 'elements' => $fieldset_elements,
); );
...@@ -112,9 +111,6 @@ echo $form_tag; ...@@ -112,9 +111,6 @@ echo $form_tag;
?> ?>
</div> </div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal-docked">Close</button>
</div>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -5,16 +5,14 @@ ...@@ -5,16 +5,14 @@
{str section="artefact.blog" tag="addblog"} {str section="artefact.blog" tag="addblog"}
</a> </a>
</div> </div>
{if !$blogs->data}
<p class="no-results">{str tag=youhavenoblogs section=artefact.blog}</p>
{else}
<div id="myblogs" class="rel mtxl ptxl"> <div id="myblogs" class="rel mtxl ptxl">
{if !$blogs->data}
<p class="no-results">{str tag=youhavenoblogs section=artefact.blog}</p>
{else}
<div class="panel-items js-masonry" data-masonry-options='{ "itemSelector": ".panel" }'> <div class="panel-items js-masonry" data-masonry-options='{ "itemSelector": ".panel" }'>
{$blogs->tablerows|safe} {$blogs->tablerows|safe}
</div> </div>
{$blogs->pagination|safe} {$blogs->pagination|safe}
{/if}
</div> </div>
{/if}
{include file="footer.tpl"} {include file="footer.tpl"}
...@@ -139,9 +139,11 @@ ...@@ -139,9 +139,11 @@
// Style label institution selection // Style label institution selection
.institutionselector { .institutionselector {
.form-group label { .form-group {
display: inline-block; label {
font-weight: bold; display: inline;
font-weight: bold;
}
} }
} }
......
...@@ -31,6 +31,7 @@ span.help { ...@@ -31,6 +31,7 @@ span.help {
// Reset font and text propertes given new insertion method // Reset font and text propertes given new insertion method
font-family: $font-family-base; font-family: $font-family-base;
font-size: $font-size-base; font-size: $font-size-base;
text-transform: none;
font-weight: normal; font-weight: normal;
line-height: $line-height-base; line-height: $line-height-base;
text-align: left; text-align: left;
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
.ui-datepicker { .ui-datepicker {
font-size: 0.7em; font-size: 0.7em;
z-index: 6 !important;
.ui-datepicker-prev-year, .ui-datepicker-next-year { .ui-datepicker-prev-year, .ui-datepicker-next-year {
height: 1.8em; height: 1.8em;
position: absolute; position: absolute;
......
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
.form-group { //nested form groups .form-group { //nested form groups
padding: 0; padding: 0;
} }
&.fieldset { &.fieldset {
.form-group { .form-group {
padding: 20px 0; padding: 20px 0;
} }
...@@ -404,6 +404,10 @@ ...@@ -404,6 +404,10 @@
} }
} }
.modal .fieldset & {
border-bottom: 1px solid #f0f0f0;;
}
&.wysiwyg { &.wysiwyg {
.has-help &, .has-help &,
......
...@@ -49,9 +49,14 @@ label, ...@@ -49,9 +49,14 @@ label,
.column &{ .column &{
min-width: 0; min-width: 0;
} }
@media (min-width: $screen-sm-min) { @media (min-width: $screen-sm-min) {
min-width: 265px; min-width: 265px;
} }
.with-label-widthauto & {
min-width: auto;
}
} }
.pseudolabel { .pseudolabel {
......
...@@ -29,6 +29,12 @@ td.tiny { ...@@ -29,6 +29,12 @@ td.tiny {
th { th {
font-weight: 300; font-weight: 300;
} }
.allnone-toggles {
width: 80px;
.btn-xs {
font-size: 10px;
}
}
} }
td input[type=radio], td input[type=radio],
...@@ -128,6 +134,13 @@ td.tiny { ...@@ -128,6 +134,13 @@ td.tiny {
} }
} }
.table-short {
width: 100%;
@media screen and (min-width: $screen-sm-min) {
width: 40%;
}
}
.table-selectedlist { .table-selectedlist {
font-size: $font-size-small; font-size: $font-size-small;
} }
......
{include file="header.tpl"} {include file="header.tpl"}
<div class="panel panel-default"> <div class="panel panel-default">
<h2 class="panel-heading">{str tag=groupquotas section=admin args=$groupname}</h2> <h2 class="panel-heading">{str tag=groupquotas section=admin args=$groupname}</h2>
<div class="panel-body"> <div class="panel-body">
<p class="lead text-small"> <p class="lead text-small">
{str tag=managegroupquotadescription1 section=admin} {str tag=managegroupquotadescription1 section=admin}
</p> </p>
{$quotasform|safe} {$quotasform|safe}
</div> </div>
</div> </div>
<div class="panel panel-default"> <div class="panel panel-default">
<h2 class="panel-heading">{str tag=groupadminsforgroup section=admin args=$groupname}</h2> <h2 class="panel-heading">{str tag=groupadminsforgroup section=admin args=$groupname}</h2>
<div class="panel-body userlistform"> <div class="panel-body userlistform">
<p class="lead text-small">{str tag=managegroupdescription1 section=admin}</p> <p class="lead mbs">{str tag=managegroupdescription1 section=admin}</p>
{$managegroupform|safe} {$managegroupform|safe}
</div> </div>
</div> </div>
{include file="footer.tpl"} {include file="footer.tpl"}
...@@ -3,6 +3,12 @@ ...@@ -3,6 +3,12 @@
<div id="edit-users" class="panel-body admin-edit-users"> <div id="edit-users" class="panel-body admin-edit-users">
<p class="lead">{str tag=editselectedusersdescription1 section=admin}</p> <p class="lead">{str tag=editselectedusersdescription1 section=admin}</p>
<ul class="nav nav-tabs list-unstyled" role="tablist"> <ul class="nav nav-tabs list-unstyled" role="tablist">
<li id="suspend-user-tab" class="active" role="presentation">
<a href="#suspend-form" aria-controls="suspend-form" role="tab" data-toggle="tab">
<span class="icon icon-lg icon-ban left"></span>
{str tag=Suspend section=admin}
</a>
</li>
<li id="changeauth-user-tab" class="" role="presentation"> <li id="changeauth-user-tab" class="" role="presentation">
<a href="#changeauth-form" aria-controls="changeauth-form" role="tab" data-toggle="tab"> <a href="#changeauth-form" aria-controls="changeauth-form" role="tab" data-toggle="tab">
<span class="icon icon-lg icon-key left"></span> <span class="icon icon-lg icon-key left"></span>
...@@ -17,12 +23,6 @@ ...@@ -17,12 +23,6 @@
</a> </a>
</li> </li>
{/if} {/if}
<li id="suspend-user-tab" class="active" role="presentation">
<a href="#suspend-form" aria-controls="suspend-form" role="tab" data-toggle="tab">
<span class="icon icon-lg icon-ban left"></span>
{str tag=Suspend section=admin}
</a>
</li>
<li id="delete-user-tab" class="" role="presentation"> <li id="delete-user-tab" class="" role="presentation">
<a href="#delete-form" aria-controls="delete-form" role="tab" data-toggle="tab"> <a href="#delete-form" aria-controls="delete-form" role="tab" data-toggle="tab">
<span class="icon icon-lg icon-trash left"></span> <span class="icon icon-lg icon-trash left"></span>
...@@ -47,8 +47,8 @@ ...@@ -47,8 +47,8 @@
</div> </div>
<hr> <hr>
<div class="bulk-action-selected-user"> <div class="bulk-action-selected-user">
<h2>{str tag=selectedusers section=admin} ({count($users)})</h2> <h2>{str tag=selectedusers section=admin} ({count($users)})</h2>
{include file="admin/users/userlist.tpl" users=$users} {include file="admin/users/userlist.tpl" users=$users}
</div> </div>
</div> </div>
</div> </div>
......
...@@ -39,35 +39,37 @@ ...@@ -39,35 +39,37 @@
<div class="panel panel-default mtl" id="results"> <div class="panel panel-default mtl" 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 table fullwidth">
<thead> <thead>
<tr> <tr>
{foreach from=$columns key=f item=c} {foreach from=$columns key=f item=c}
<th class="{if $c.sort}search-results-sort-column{if $f == $sortby} {$sortdir}{/if}{/if}{if $c.class} {$c.class}{/if}"> <th class="{if $c.sort}search-results-sort-column{if $f == $sortby} {$sortdir}{/if}{/if}{if $c.class} {$c.class}{/if}">
{if $c.sort} {if $c.sort}
<a href="{$searchurl}&sortby={$f}&sortdir={if $f == $sortby && $sortdir == 'asc'}desc{else}asc{/if}"> <a href="{$searchurl}&sortby={$f}&sortdir={if $f == $sortby && $sortdir == 'asc'}desc{else}asc{/if}">
{$c.name}
<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} {$c.name}
<span class="accessible-hidden sr-only">({str tag=sortby} {if $f == $sortby && $sortdir == 'asc'}{str tag=descending}{else}{str tag=ascending}{/if})</span> {if $c.accessible}
</a> <span class="accessible-hidden sr-only">{$c.accessible}</span>
{else} {/if}
{$c.name}
{if $c.accessible}
<span class="accessible-hidden sr-only">{$c.accessible}</span>
{/if} {/if}
{/if} {if $c.help}
{if $c.help} {$c.helplink|safe}
{$c.helplink|safe} {/if}
{/if} {if $c.headhtml}<div class="headhtml">{$c.headhtml|safe}</div>{/if}
{if $c.headhtml}<div class="headhtml">{$c.headhtml|safe}</div>{/if} </th>