Commit 77aa623b authored by Naomi Guyer's avatar Naomi Guyer Committed by Aaron Wells

Input group fixes (bootstrap)

Bug 1465107: Use Bootstrap CSS Framework

Change-Id: I21419cad1eb8885568c004b27b3d3d4464e40541
parent 4c7356a2
......@@ -69,18 +69,42 @@ if (get_config('allowgroupcategories')
$options[0] = get_string('allcategories', 'group');
$options[-1] = get_string('categoryunassigned', 'group');
$options += $groupcategories;
$elements['groupcategory'] = array(
'title' => get_string('groupcategory', 'group'),
'hiddenlabel' => false,
'type' => 'select',
'options' => $options,
'defaultvalue' => $groupcategory,
'class' => 'input-small text');
$groupcategoryfield = array(
'title' => get_string('groupcategory', 'group'),
'hiddenlabel' => false,
'type' => 'select',
'options' => $options,
'defaultvalue' => $groupcategory,
'class' => 'input-small'
);
$searchfield = array(
'type' => 'submit',
'class' => 'btn btn-primary input-group-btn no-label button',
'value' => get_string('search')
);
$elements['formgroupcategory'] = array(
'type' => 'fieldset',
'class' => 'input-group',
'elements' => array(
'groupcategory' => $groupcategoryfield,
'search' => $searchfield
)
);
} else {
$elements['searchfield'] = array(
'type' => 'submit',
'class' => 'btn btn-primary no-label',
'value' => get_string('search')
);
}
$elements['search'] = array(
'type' => 'submit',
'class' => 'btn btn-primary',
'value' => get_string('search'));
$searchform = pieform(array(
'name' => 'search',
'checkdirtychange' => false,
......
......@@ -13763,7 +13763,7 @@ label .col-collapse,
-moz-appearance: none;
-webkit-appearance: none;
position: relative;
padding-right: 27px;
padding-right: 30px;
background: transparent;
height: 35px;
left: 0;
......
......@@ -106,7 +106,7 @@
select.form-control {
@include appearance(none);
position: relative;
padding-right: 27px;
padding-right: 30px;
background: transparent;
height: $input-height-base;
left: 0;
......
This diff is collapsed.
......@@ -86,22 +86,47 @@ $searchform = pieform(array(
'renderer' => 'div',
'class' => 'search with-heading form-inline',
'elements' => array(
'inputgroup' => array(
'searchwithin' => array(
'type' => 'fieldset',
'class' => 'dropdown-group js-dropdown-group',
'elements' => array(
'query' => array(
'title' => get_string('search') . ': ',
'hiddenlabel' => false,
'type' => 'text',
'class' => 'with-dropdown js-with-dropdown'
),
'type' => array(
'class' => 'dropdown-connect js-dropdown-connect',
'type' => 'select',
'title' => get_string('searchwithin') . ': ',
'options' => $searchoptions,
'defaultvalue' => $searchtype,
)
)
),
'inputgroupsort' => array(
'type' => 'fieldset',
'title' => get_string('Query') . ': ',
'class' => 'input-group pb0',
'class' => 'input-group',
'elements' => array(
'query' => array(
'type' => 'text',
'sort' => array(
'class' => 'input-small',
'type' => 'select',
'title' => get_string('sortresultsby') . ' ',
'options' => $sortoptions,
'defaultvalue' => $sort,
),
'submit' => array(
'submit' => array(
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn btn-primary input-group-btn',
'value' => get_string('go'),
'class' => 'btn btn-primary input-group-btn no-label button',
'value' => get_string('search'),
)
),
),
'advanced' => array(
'type' => 'fieldset',
'legend' => get_string('moreoptions', 'view'),
......@@ -109,20 +134,6 @@ $searchform = pieform(array(
'collapsible' => true,
'collapsed' => true,
'elements' => array(
'type' => array(
'class' => 'fullwidth',
'type' => 'select',
'title' => get_string('searchwithin') . ': ',
'options' => $searchoptions,
'defaultvalue' => $searchtype,
),
'sort' => array(
'class' => 'fullwidth',
'type' => 'select',
'title' => get_string('sortresultsby') . ' ',
'options' => $sortoptions,
'defaultvalue' => $sort,
),
'share' => array(
'class' => 'fullwidth',
'type' => 'checkboxes',
......
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