Commit 5470b39d authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review

Merge "Bootstrap bug fixes (bootstrap) BUG 1465107"

parents 2c6ea727 50031f15
...@@ -26,7 +26,7 @@ $deleteform = pieform(array( ...@@ -26,7 +26,7 @@ $deleteform = pieform(array(
'pluginname' => 'account', 'pluginname' => 'account',
'elements' => array( 'elements' => array(
'submit' => array( 'submit' => array(
'class' => 'btn btn-danger', 'class' => 'btn btn-default',
'type' => 'submit', 'type' => 'submit',
'value' => get_string('deleteaccount', 'mahara', display_username($USER), full_name($USER)), 'value' => get_string('deleteaccount', 'mahara', display_username($USER), full_name($USER)),
), ),
......
...@@ -29,6 +29,7 @@ $form = pieform(array( ...@@ -29,6 +29,7 @@ $form = pieform(array(
'elements' => array( 'elements' => array(
'submit' => array( 'submit' => array(
'type' => 'submitcancel', 'type' => 'submitcancel',
'class' => 'btn btn-default',
'value' => array(get_string('yes'), get_string('no')), 'value' => array(get_string('yes'), get_string('no')),
'goto' => get_config('wwwroot') . 'admin/groups/groups.php', 'goto' => get_config('wwwroot') . 'admin/groups/groups.php',
) )
......
...@@ -22,6 +22,8 @@ define('TITLE', get_string('administergroups', 'admin')); ...@@ -22,6 +22,8 @@ define('TITLE', get_string('administergroups', 'admin'));
$quotasform = pieform(array( $quotasform = pieform(array(
'name' => 'groupquotasform', 'name' => 'groupquotasform',
'class' => 'form-inline',
'renderer' => 'div',
'elements' => array( 'elements' => array(
'groupid' => array( 'groupid' => array(
'type' => 'hidden', 'type' => 'hidden',
...@@ -30,13 +32,14 @@ $quotasform = pieform(array( ...@@ -30,13 +32,14 @@ $quotasform = pieform(array(
'quota' => array( 'quota' => array(
'type' => 'bytes', 'type' => 'bytes',
'title' => get_string('filequota1', 'admin'), 'title' => get_string('filequota1', 'admin'),
'description' => get_string('groupfilequotadescription', 'admin'),
'defaultvalue' => $group->quota, 'defaultvalue' => $group->quota,
), ),
'submit' => array( 'submit' => array(
'type' => 'submit', 'type' => 'button',
'usebuttontag' => true,
'class' => 'btn btn-primary no-label',
'value' => get_string('save'), 'value' => get_string('save'),
), )
), ),
)); ));
...@@ -73,7 +76,7 @@ $admins = get_column_sql( ...@@ -73,7 +76,7 @@ $admins = get_column_sql(
$groupadminsform = pieform(array( $groupadminsform = pieform(array(
'name' => 'groupadminsform', 'name' => 'groupadminsform',
'renderer' => 'table', 'renderer' => 'div',
'plugintype' => 'core', 'plugintype' => 'core',
'pluginname' => 'admin', 'pluginname' => 'admin',
'elements' => array( 'elements' => array(
...@@ -86,6 +89,7 @@ $groupadminsform = pieform(array( ...@@ -86,6 +89,7 @@ $groupadminsform = pieform(array(
), ),
'submit' => array( 'submit' => array(
'type' => 'submit', 'type' => 'submit',
'class' => 'btn btn-success',
'value' => get_string('save'), 'value' => get_string('save'),
), ),
), ),
......
...@@ -54,7 +54,7 @@ $closeform = pieform(array( ...@@ -54,7 +54,7 @@ $closeform = pieform(array(
'submit' => array( 'submit' => array(
'type' => 'submit', 'type' => 'submit',
'value' => get_string($closed ? 'Open' : 'Close', 'admin'), 'value' => get_string($closed ? 'Open' : 'Close', 'admin'),
'class' => $closed ? 'btn btn-success' : 'btn btn-danger' 'class' => $closed ? 'btn btn-success' : 'btn btn-default'
), ),
), ),
)); ));
......
...@@ -730,7 +730,7 @@ $siteoptionform = array( ...@@ -730,7 +730,7 @@ $siteoptionform = array(
), ),
'loggingsettings' => array( 'loggingsettings' => array(
'iconclass'=>'exclamation-triangle', 'iconclass'=>'exclamation-triangle',
'class' => 'last', 'class' => 'last mbxl',
'type' => 'fieldset', 'type' => 'fieldset',
'collapsible' => true, 'collapsible' => true,
'collapsed' => true, 'collapsed' => true,
...@@ -764,8 +764,9 @@ $siteoptionform = array( ...@@ -764,8 +764,9 @@ $siteoptionform = array(
); );
$siteoptionform['elements']['submit'] = array( $siteoptionform['elements']['submit'] = array(
'type' => 'submit', 'type' => 'button',
'class' => 'btn btn-success mtm', 'usebuttontag' => true,
'class' => 'btn btn-success',
'value' => get_string('updatesiteoptions', 'admin') 'value' => get_string('updatesiteoptions', 'admin')
); );
......
...@@ -79,6 +79,7 @@ if ($institution && $plugin) { ...@@ -79,6 +79,7 @@ if ($institution && $plugin) {
$form['elements']['submit'] = array( $form['elements']['submit'] = array(
'type' => 'submitcancel', 'type' => 'submitcancel',
'class' => 'btn btn-success',
'value' => array(get_string('submit'), get_string('cancel')), 'value' => array(get_string('submit'), get_string('cancel')),
'goto' => 'addauthority.php?c=1' 'goto' => 'addauthority.php?c=1'
); );
......
...@@ -189,6 +189,7 @@ if ($institution || $add) { ...@@ -189,6 +189,7 @@ if ($institution || $add) {
), ),
'submit' => array( 'submit' => array(
'type' => 'submitcancel', 'type' => 'submitcancel',
'class' => 'btn btn-default',
'value' => array(get_string('yes'), get_string('no')) 'value' => array(get_string('yes'), get_string('no'))
) )
) )
...@@ -532,6 +533,7 @@ if ($institution || $add) { ...@@ -532,6 +533,7 @@ if ($institution || $add) {
$elements['lockedfields'] = array( $elements['lockedfields'] = array(
'type' => 'fieldset', 'type' => 'fieldset',
'class' => 'last',
'legend' => get_string('Lockedfields', 'admin'), 'legend' => get_string('Lockedfields', 'admin'),
'collapsible' => true, 'collapsible' => true,
'collapsed' => true, 'collapsed' => true,
...@@ -551,11 +553,6 @@ if ($institution || $add) { ...@@ -551,11 +553,6 @@ if ($institution || $add) {
'disabled' => $institution != 'mahara' && in_array($field, $sitelockedfields) 'disabled' => $institution != 'mahara' && in_array($field, $sitelockedfields)
); );
} }
$elements['lockedfieldshelp'] = array(
'value' => '<tr id="lockedfieldshelp"><th colspan="2">'
. get_help_icon('core', 'admin', 'institution', 'lockedfields')
. '</th></tr>'
);
// Check for active plugins institution settings. // Check for active plugins institution settings.
$elements['pluginsfields'] = array( $elements['pluginsfields'] = array(
...@@ -582,6 +579,7 @@ if ($institution || $add) { ...@@ -582,6 +579,7 @@ if ($institution || $add) {
$elements['submit'] = array( $elements['submit'] = array(
'type' => 'submitcancel', 'type' => 'submitcancel',
'class' => 'btn btn-success',
'value' => array(get_string('submit'), get_string('cancel')) 'value' => array(get_string('submit'), get_string('cancel'))
); );
...@@ -1059,6 +1057,8 @@ if ($institution && $institution != 'mahara') { ...@@ -1059,6 +1057,8 @@ if ($institution && $institution != 'mahara') {
$suspendformdef = array( $suspendformdef = array(
'name' => 'institution_suspend', 'name' => 'institution_suspend',
'plugintype' => 'core', 'plugintype' => 'core',
'renderer' => 'div',
'class' => 'form-as-button last',
'pluginname' => 'admin', 'pluginname' => 'admin',
'elements' => array( 'elements' => array(
'i' => array( 'i' => array(
...@@ -1066,9 +1066,10 @@ if ($institution && $institution != 'mahara') { ...@@ -1066,9 +1066,10 @@ if ($institution && $institution != 'mahara') {
'value' => $institution, 'value' => $institution,
), ),
'submit' => array( 'submit' => array(
'type' => 'submit', 'type' => 'button',
'value' => get_string('suspendinstitution','admin'), 'usebuttontag' => true,
'description' => get_string('suspendinstitutiondescription','admin'), 'class' => 'btn btn-default',
'value' => '<span class="icon icon-lg text-danger icon-ban prm"></span>' . get_string('suspendinstitution','admin'),
), ),
) )
); );
...@@ -1079,6 +1080,7 @@ if ($institution && $institution != 'mahara') { ...@@ -1079,6 +1080,7 @@ if ($institution && $institution != 'mahara') {
$suspendformdef = array( $suspendformdef = array(
'name' => 'institution_unsuspend', 'name' => 'institution_unsuspend',
'plugintype' => 'core', 'plugintype' => 'core',
'renderer' => 'div',
'pluginname' => 'admin', 'pluginname' => 'admin',
'elements' => array( 'elements' => array(
'i' => array( 'i' => array(
...@@ -1086,8 +1088,10 @@ if ($institution && $institution != 'mahara') { ...@@ -1086,8 +1088,10 @@ if ($institution && $institution != 'mahara') {
'value' => $institution, 'value' => $institution,
), ),
'submit' => array( 'submit' => array(
'type' => 'submit', 'type' => 'button',
'value' => get_string('unsuspendinstitution','admin'), 'usebuttontag' => true,
'class' => 'btn btn-default',
'value' => '<span class="icon icon-lg text-success icon-check prm"></span>' . get_string('unsuspendinstitution','admin'),
'description' => get_string('unsuspendinstitutiondescription','admin'), 'description' => get_string('unsuspendinstitutiondescription','admin'),
), ),
) )
...@@ -1136,6 +1140,7 @@ jQuery(function($) { ...@@ -1136,6 +1140,7 @@ jQuery(function($) {
$smarty = smarty(); $smarty = smarty();
setpageicon($smarty, 'icon-university'); setpageicon($smarty, 'icon-university');
$smarty->assign('INLINEJAVASCRIPT', $themeoptionsjs); $smarty->assign('INLINEJAVASCRIPT', $themeoptionsjs);
$smarty->assign('institution_form', $institutionform); $smarty->assign('institution_form', $institutionform);
$smarty->assign('instancestring', $instancestring); $smarty->assign('instancestring', $instancestring);
...@@ -1154,6 +1159,7 @@ if (isset($suspended)) { ...@@ -1154,6 +1159,7 @@ if (isset($suspended)) {
} }
$smarty->assign('PAGEHEADING', get_string('admininstitutions', 'admin')); $smarty->assign('PAGEHEADING', get_string('admininstitutions', 'admin'));
$smarty->assign('subsectionheading', get_field('institution', 'displayname', 'name', $institution));
$smarty->display('admin/users/institutions.tpl'); $smarty->display('admin/users/institutions.tpl');
function theme_sort($a, $b) { function theme_sort($a, $b) {
......
...@@ -56,7 +56,7 @@ if ($delete) { ...@@ -56,7 +56,7 @@ if ($delete) {
'elements' => array( 'elements' => array(
'submit' => array( 'submit' => array(
'type' => 'submitcancel', 'type' => 'submitcancel',
'class' => 'btn btn-danger', 'class' => 'btn btn-default',
'value' => array(get_string('deleteprofile','artefact.internal'), get_string('cancel')), 'value' => array(get_string('deleteprofile','artefact.internal'), get_string('cancel')),
'goto' => get_config('wwwroot') . '/artefact/internal/index.php?fs=social', 'goto' => get_config('wwwroot') . '/artefact/internal/index.php?fs=social',
), ),
......
...@@ -154,7 +154,7 @@ class PluginAuthBrowserid extends PluginAuth { ...@@ -154,7 +154,7 @@ class PluginAuthBrowserid extends PluginAuth {
return array( return array(
'elements' => $elements, 'elements' => $elements,
'renderer' => 'table' 'renderer' => 'div'
); );
} }
......
...@@ -210,7 +210,7 @@ class PluginAuthImap extends PluginAuth { ...@@ -210,7 +210,7 @@ class PluginAuthImap extends PluginAuth {
return array( return array(
'elements' => $elements, 'elements' => $elements,
'renderer' => 'table' 'renderer' => 'div'
); );
} }
......
...@@ -1967,7 +1967,7 @@ class PluginAuthLdap extends PluginAuth { ...@@ -1967,7 +1967,7 @@ class PluginAuthLdap extends PluginAuth {
return array( return array(
'elements' => $elements, 'elements' => $elements,
'renderer' => 'table' 'renderer' => 'div'
); );
} }
......
...@@ -462,7 +462,7 @@ class PluginAuthSaml extends PluginAuth { ...@@ -462,7 +462,7 @@ class PluginAuthSaml extends PluginAuth {
return array( return array(
'elements' => $elements, 'elements' => $elements,
'renderer' => 'table' 'renderer' => 'div'
); );
} }
......
...@@ -835,7 +835,7 @@ class PluginAuthXmlrpc extends PluginAuth { ...@@ -835,7 +835,7 @@ class PluginAuthXmlrpc extends PluginAuth {
return array( return array(
'elements' => $elements, 'elements' => $elements,
'renderer' => 'table' 'renderer' => 'div'
); );
} }
......
...@@ -204,10 +204,7 @@ function export_submit(Pieform $form, $values) { ...@@ -204,10 +204,7 @@ function export_submit(Pieform $form, $values) {
} }
$smarty = smarty( $smarty = smarty(
$jsfiles, $jsfiles
array('<link rel="stylesheet" type="text/css" href="' . append_version_number(get_config('wwwroot') . 'theme/views.css') . '">'),
array(),
array('stylesheets' => array('style/views.css'))
); );
$smarty->assign('PAGEHEADING', TITLE); $smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('pagedescription', get_string('exportportfoliodescription', 'export')); $smarty->assign('pagedescription', get_string('exportportfoliodescription', 'export'));
......
...@@ -1496,7 +1496,8 @@ EOF; ...@@ -1496,7 +1496,8 @@ EOF;
else { else {
$labelclass = ''; $labelclass = '';
} }
$nolabeltypes = array('radio', 'emaillist', 'date', 'files', 'checkboxes'); $nolabeltypes = array('radio', 'emaillist', 'date', 'files', 'checkboxes', 'bytes');
if (!empty($element['nolabel']) || in_array($element['type'], $nolabeltypes)) { if (!empty($element['nolabel']) || in_array($element['type'], $nolabeltypes)) {
// Don't bother with a label for the element. // Don't bother with a label for the element.
// Special 'nolabeltypes' have their own label(s) added direct to the form field(s). // Special 'nolabeltypes' have their own label(s) added direct to the form field(s).
......
...@@ -65,16 +65,19 @@ function pieform_element_bytes(Pieform $form, $element) {/*{{{*/ ...@@ -65,16 +65,19 @@ function pieform_element_bytes(Pieform $form, $element) {/*{{{*/
// @todo probably create with an actual input element, as tabindex doesn't work here for one thing // @todo probably create with an actual input element, as tabindex doesn't work here for one thing
// Same with the select. And do the events using mochikit signal instead of dom events // Same with the select. And do the events using mochikit signal instead of dom events
$numberinput = '<input'; $numberinput = '<div class="with-dropdown js-with-dropdown text">';
$numberinput .= '<label for="' . $formname . '_' . $name . '">' . Pieform::hsc($element['title']) . ': </label><input';
$numberinput .= ' type="text" size="6" name="' . $name . '"'; $numberinput .= ' type="text" size="6" name="' . $name . '"';
$numberinput .= ' id="' . $formname . '_' . $name . '" value="' . Pieform::hsc($values['number']) . '" tabindex="' . Pieform::hsc($element['tabindex']) . '"'; $numberinput .= ' id="' . $formname . '_' . $name . '" value="' . Pieform::hsc($values['number']) . '" tabindex="' . Pieform::hsc($element['tabindex']) . '"';
$numberinput .= (isset($element['error']) ? ' class="error"' : ''); $numberinput .= 'class="with-dropdown js-with-dropdown form-control text'. (isset($element['error']) ? ' error"' : '') . '"';
if (isset($element['description'])) { if (isset($element['description'])) {
$numberinput .= ' aria-describedby="' . $form->element_descriptors($element) . '"'; $numberinput .= ' aria-describedby="' . $form->element_descriptors($element) . '"';
} }
$numberinput .= ">\n"; $numberinput .= "></div>\n";
$uselect = '<label for="' . $formname . '_' . $name . '_units" class="accessible-hidden sr-only">' . get_string('units') . '</label>';
$uselect .= '<select name="' . $name . '_units" id="' . $formname . '_' . $name . '_units"' . ' tabindex="' . Pieform::hsc($element['tabindex']) . '"'; $uselect = '<div class="dropdown-connect js-dropdown-connect select">';
$uselect .= '<label for="' . $formname . '_' . $name . '_units" class="accessible-hidden sr-only">' . get_string('units') . '</label>';
$uselect .= '<span class="picker"><select class="form-control dropdown-connect js-dropdown-connect select" name="' . $name . '_units" id="' . $formname . '_' . $name . '_units"' . ' tabindex="' . Pieform::hsc($element['tabindex']) . '"';
if (isset($element['description'])) { if (isset($element['description'])) {
$uselect .= ' aria-describedby="' . $form->element_descriptors($element) . '"'; $uselect .= ' aria-describedby="' . $form->element_descriptors($element) . '"';
} }
...@@ -83,9 +86,15 @@ function pieform_element_bytes(Pieform $form, $element) {/*{{{*/ ...@@ -83,9 +86,15 @@ function pieform_element_bytes(Pieform $form, $element) {/*{{{*/
$uselect .= "\t<option value=\"$u\"" . (($values['units'] == $u) ? ' selected="selected"' : '') . '>' $uselect .= "\t<option value=\"$u\"" . (($values['units'] == $u) ? ' selected="selected"' : '') . '>'
. $form->i18n('element', 'bytes', $u, $element) . "</option>\n"; . $form->i18n('element', 'bytes', $u, $element) . "</option>\n";
} }
$uselect .= "</select>\n"; $uselect .= "</select></span></div>\n";
$fieldset = '<div id="' . $formname . '_' . $name . '_fieldset" class="dropdown-group js-dropdown-group form-group">'
. '<fieldset class="pieform-fieldset dropdown-group js-dropdown-group">'
. $numberinput
. $uselect
. '</fieldset></div>';
return $numberinput . $uselect; return $fieldset;
}/*}}}*/ }/*}}}*/
/** /**
......
This diff is collapsed.
{include file="header.tpl"} {include file="header.tpl"}
<div class="deletemessage"> <div class="panel panel-danger mtxl">
<h2>{$subheading}</h2> <h2 class="panel-heading">{$subheading}</h2>
<p class="lead">{$message}</p> <div class="panel-body">
{$form|safe} <p>{$message}</p>
{$form|safe}
</div>
</div> </div>
{include file="footer.tpl"} {include file="footer.tpl"}
...@@ -7,7 +7,11 @@ ...@@ -7,7 +7,11 @@
} }
&.form-group { &.form-group {
margin-left: 15px; margin-left: 11px;
.with-heading & {
margin-left: 15px;
}
} }
.with-dropdown { .with-dropdown {
position: absolute; position: absolute;
......
...@@ -16,6 +16,12 @@ ...@@ -16,6 +16,12 @@
padding: 20px 0; padding: 20px 0;
position: relative; position: relative;
&.bytes {
.pseudolabel {
display: none;
}
}
&.fake-form { &.fake-form {
border: 0; border: 0;
padding: 0; padding: 0;
......
...@@ -21,8 +21,8 @@ $gray-lighter: lighten($gray-base, 93.5%) !default; // #eee ...@@ -21,8 +21,8 @@ $gray-lighter: lighten($gray-base, 93.5%) !default; // #eee
$brand-default: #ECECEC !default; $brand-default: #ECECEC !default;
$brand-primary: $mahara-green-bright !default; $brand-primary: darken($mahara-green-bright, 2%) !default;
$brand-success: $mahara-green-bright !default; $brand-success: darken($mahara-green-bright, 2%) !default;
$brand-info: #5bc0de !default; $brand-info: #5bc0de !default;
$brand-warning: #f0ad4e !default; $brand-warning: #f0ad4e !default;
$brand-danger: #d9534f !default; $brand-danger: #d9534f !default;
...@@ -183,10 +183,10 @@ $btn-default-border: #ccc !default; ...@@ -183,10 +183,10 @@ $btn-default-border: #ccc !default;
$btn-primary-color: #fff !default; $btn-primary-color: #fff !default;
$btn-primary-bg: $brand-primary !default; $btn-primary-bg: $brand-primary !default;
$btn-primary-border: darken($btn-primary-bg, 5%) !default; $btn-primary-border: darken($btn-primary-bg, 8%) !default;
$btn-success-color: #fff !default; $btn-success-color: #fff !default;
$btn-success-bg: $mahara-green-light !default; $btn-success-bg: $brand-primary !default;
$btn-success-border: darken($btn-success-bg, 5%) !default; $btn-success-border: darken($btn-success-bg, 5%) !default;
$btn-info-color: $state-info-text !default; $btn-info-color: $state-info-text !default;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
</table> </table>
<div class="right activity-buttons"> <div class="right activity-buttons">
<input class="submit btn btn-success" type="submit" value="{str tag='markasread' section='activity'}" /> <input class="submit btn btn-success" type="submit" value="{str tag='markasread' section='activity'}" />
<input class="submit btn btn-danger" type="button" value="{str tag='delete'}" onClick="markread(document.notificationlist, 'del'); return false;" /> <input class="submit btn btn-default" type="button" value="{str tag='delete'}" onClick="markread(document.notificationlist, 'del'); return false;" />
</div> </div>
{$activitylist.pagination|safe} {$activitylist.pagination|safe}
</form> </form>
......
{include file="header.tpl"} {include file="header.tpl"}
<div id="deleteaccount"> <div id="deleteaccount">
<h1> <div class="panel panel-danger mtxl">
{str tag=deleteaccount section=account} <h2 class="panel-heading">{str tag=deleteaccount section=account}</h2>
</h1> <div class="panel-body">
<p class="lead"> <p>{str tag=deleteaccountdescription section=account}</p>
{str tag=deleteaccountdescription section=account} {$delete_form|safe}
</p> </div>
{$form|safe} </div>
</div> </div>
{include file="footer.tpl"} {include file="footer.tpl"}
\ No newline at end of file
{include file="header.tpl"} {include file="header.tpl"}
<h3>{str tag=groupquotas section=admin args=$groupname}</h3> <div class="panel panel-default">
<p>{str tag=managegroupquotadescription1 section=admin}</p> <h2 class="panel-heading">{str tag=groupquotas section=admin args=$groupname}</h2>
<div> <div class="panel-body">