Commit a488581f authored by Liam's avatar Liam Committed by Aaron Wells

Added search button to site search - Bug #1606725

behatnotneeded

Change-Id: I3f25b4f8266e70e50df3c4457be24f2089ce382d
parent 87d79be9
...@@ -140,8 +140,10 @@ class PluginSearchElasticsearch extends PluginSearch { ...@@ -140,8 +140,10 @@ class PluginSearchElasticsearch extends PluginSearch {
'hiddenlabel' => true, 'hiddenlabel' => true,
), ),
'submit' => array( 'submit' => array(
'type' => 'submit', 'type' => 'button',
'value' => get_string('go'), 'class' => 'btn-primary input-group-btn',
'usebuttontag' => true,
'value' => '<span class="icon icon-search icon-lg" role="presentation" aria-hidden="true"></span><span class="sr-only">'. get_string('go') . '</span>',
) )
) )
)); ));
......
...@@ -243,8 +243,10 @@ abstract class PluginSearch extends Plugin implements IPluginSearch { ...@@ -243,8 +243,10 @@ abstract class PluginSearch extends Plugin implements IPluginSearch {
'hiddenlabel' => true, 'hiddenlabel' => true,
), ),
'submit' => array( 'submit' => array(
'type' => 'submit', 'type' => 'button',
'value' => get_string('go'), 'class' => 'btn-primary input-group-btn',
'usebuttontag' => true,
'value' => '<span class="icon icon-search icon-lg" role="presentation" aria-hidden="true"></span><span class="sr-only">'. get_string('go') . '</span>',
) )
) )
)); ));
......
...@@ -33,4 +33,23 @@ ...@@ -33,4 +33,23 @@
margin-top: 20px; margin-top: 20px;
} }
} }
.header-search-form {
.input-group-btn {
display: block !important;
float: right;
border-top-left-radius: 0;
border-bottom-left-radius: 0;
border-left: 0;
margin-left: -1px;
}
@media (max-width: $screen-sm-min) {
input[type=text] {
width: 87%;
float: left;
}
.input-group-btn {
float: left;
}
}
}
} }
...@@ -31,6 +31,7 @@ Scenario: Find users in your institution and outside your institution ...@@ -31,6 +31,7 @@ Scenario: Find users in your institution and outside your institution
# Searching outside my own institution, I should find all users # Searching outside my own institution, I should find all users
When I select "Everyone" from "Filter" When I select "Everyone" from "Filter"
And I set the field "Search" to "smith" And I set the field "Search" to "smith"
And I scroll to the id "main-nav"
And I press "search_submit" And I press "search_submit"
# I should find everyone # I should find everyone
Then I should see "Jen Smith" Then I should see "Jen Smith"
......
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