Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mahara
mahara
Commits
a488581f
Commit
a488581f
authored
Aug 18, 2016
by
Liam
Committed by
Aaron Wells
Aug 18, 2016
Browse files
Added search button to site search - Bug #1606725
behatnotneeded Change-Id: I3f25b4f8266e70e50df3c4457be24f2089ce382d
parent
87d79be9
Changes
4
Hide whitespace changes
Inline
Side-by-side
htdocs/search/elasticsearch/lib.php
View file @
a488581f
...
...
@@ -140,8 +140,10 @@ class PluginSearchElasticsearch extends PluginSearch {
'hiddenlabel'
=>
true
,
),
'submit'
=>
array
(
'type'
=>
'submit'
,
'value'
=>
get_string
(
'go'
),
'type'
=>
'button'
,
'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>'
,
)
)
));
...
...
htdocs/search/lib.php
View file @
a488581f
...
...
@@ -243,8 +243,10 @@ abstract class PluginSearch extends Plugin implements IPluginSearch {
'hiddenlabel'
=>
true
,
),
'submit'
=>
array
(
'type'
=>
'submit'
,
'value'
=>
get_string
(
'go'
),
'type'
=>
'button'
,
'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>'
,
)
)
));
...
...
htdocs/theme/raw/sass/layout/_header.scss
View file @
a488581f
...
...
@@ -33,4 +33,23 @@
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
;
}
}
}
}
test/behat/features/user/find_friend.feature
View file @
a488581f
...
...
@@ -31,6 +31,7 @@ Scenario: Find users in your institution and outside your institution
# Searching outside my own institution, I should find all users
When
I select
"Everyone"
from
"Filter"
And
I set the field
"Search"
to
"smith"
And
I scroll to the id
"main-nav"
And
I press
"search_submit"
# I should find everyone
Then
I should see
"Jen Smith"
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment