Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: DES-2482 cms search icons, role presentation #1061

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<div class="input-group" style="display:inline-flex; flex:1; align-items: center; min-width:200px;">

<button class="btn btn-success" ng-click="$ctrl.browse()" style="width:fit-content; white-space: nowrap; text-align: center; height: 34px;">
<i class="fa fa-search">&nbsp;</i>Search
<i class="fa fa-search" role="none">&nbsp;</i>Search
</button>
<input type="text" placeholder="Author, Title, Keyword, Description, Natural Hazard Event, Project ID, or DOI"
data-toggle="tooltip" data-placement="top" title="Author, Title, Keyword, Description, Natural Hazard Event, Project ID, or DOI" aria-label="Search Publications"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<form class="navbar-form navbar-left" ng-submit="$ctrl.ddSearch()" style="display:flex"
ng-hide="['Dropbox', 'Box', 'Google Drive', 'NEES Published'].includes($ctrl.placeholder())" role="search">
<input class="form-control" style="width:240px;" placeholder="Find in {{ $ctrl.placeholder() }}" ng-model="$ctrl.search.queryString" aria-label="Find in {{ $ctrl.placeholder() }}">
<button class="btn btn-default" style="clear: right;"> <i class="fa fa-search"></i><span class="sr-only">Search</span></button>
<button class="btn btn-default" style="clear: right;"> <i class="fa fa-search" role="none"></i><span class="sr-only">Search</span></button>
</form>
<div class="btn-toolbar-right">
<div class="btn-group-data-depot-toolbar btn-group">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ <h3> No RAPID admin users! </h3>
<div class="row">
<h2> Add RAPID Admins </h2>
<div class="input-group input-group-lg">
<span class="input-group-addon"><i class="fa fa-search"></i><span class="sr-only">Search</span></span>
<span class="input-group-addon"><i class="fa fa-search" role="none"></i><span class="sr-only">Search</span></span>
<input type="text"
class="form-control"
id="rapid_admin_user"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ <h3> Refine By: </h3>
<form ng-submit='$ctrl.search_browse()' role="search">
<div class="input-group input-group-lg">
<span class="input-group-addon">
<span ng-show="!$ctrl.searching"><i class="fa fa-search" ng-show="!$ctrl.searching"> </i></span>
<span ng-show="!$ctrl.searching"><i class="fa fa-search" role="none" ng-show="!$ctrl.searching"> </i></span>
<span ng-show="$ctrl.searching"><i class="fa fa-spinner fa-spin" > </i></span>
</span>

Expand Down
2 changes: 1 addition & 1 deletion designsafe/templates/includes/navigation.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
{% show_menu 1 2 100 100 "includes/cms_menu.html" %}
</ul>
<form class="navbar-form navbar-right" role="search">
<button class="btn btn-default" id="search_button"> <i class="fa fa-search"></i><span class="sr-only">Search</span></button>
<button class="btn btn-default" id="search_button"> <i class="fa fa-search" role="none"></i><span class="sr-only">Search</span></button>
<input class="form-control" id="searchfield" placeholder="Search DesignSafe" aria-label="Search DesignSafe" style="margin-right:1rem">

<input type="radio" name="search-radio" id="search-radio-website" value="website" checked="checked" style="display:table-cell; vertical-align: middle; margin-top:0px;margin-right:0.25rem;">
Expand Down