Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
2cd2a64
commit to main
van-go Nov 3, 2023
e3f9d71
Merge branch 'main' of https://github.com/DesignSafe-CI/portal
van-go Nov 6, 2023
3434941
Merge branch 'main' of https://github.com/DesignSafe-CI/portal
van-go Nov 15, 2023
50fd17a
Merge branch 'main' of https://github.com/DesignSafe-CI/portal
van-go Dec 12, 2023
a2cac73
Merge branch 'main' of https://github.com/DesignSafe-CI/portal
van-go Jan 2, 2024
0095d87
Merge branch 'main' of https://github.com/DesignSafe-CI/portal
van-go Jan 3, 2024
b8a8bae
Merge branch 'main' of https://github.com/DesignSafe-CI/portal
van-go Jan 11, 2024
b4669e1
Merge branch 'main' of https://github.com/DesignSafe-CI/portal
van-go Jan 24, 2024
98a7604
Merge branch 'main' of https://github.com/DesignSafe-CI/portal
van-go Feb 5, 2024
20390dd
Merge branch 'main' of https://github.com/DesignSafe-CI/portal
van-go Feb 20, 2024
bdf2cc3
Merge branch 'main' of https://github.com/DesignSafe-CI/portal
van-go Mar 12, 2024
88d960e
Merge branch 'main' of https://github.com/DesignSafe-CI/portal
van-go Mar 22, 2024
e4b0c9b
Merge branch 'main' of https://github.com/DesignSafe-CI/portal
van-go May 6, 2024
49b6cbf
Merge branch 'main' of https://github.com/DesignSafe-CI/portal
van-go May 6, 2024
e668307
Merge branch 'main' of https://github.com/DesignSafe-CI/portal
van-go May 8, 2024
4bf403c
Merge branch 'main' of https://github.com/DesignSafe-CI/portal
van-go May 29, 2024
9d8ceab
Merge branch 'main' of https://github.com/DesignSafe-CI/portal
van-go Aug 12, 2024
758f0ae
Merge branch 'main' of https://github.com/DesignSafe-CI/portal
van-go Aug 20, 2024
c0d2f66
Merge branch 'main' of https://github.com/DesignSafe-CI/portal
van-go Sep 4, 2024
73d9958
Merge branch 'main' of https://github.com/DesignSafe-CI/portal
van-go Sep 25, 2024
289e3fa
Merge branch 'main' of https://github.com/DesignSafe-CI/portal
van-go Dec 2, 2024
626640d
Merge branch 'main' of https://github.com/DesignSafe-CI/portal
van-go Dec 5, 2024
e771aa8
Merge branch 'main' of https://github.com/DesignSafe-CI/portal
van-go Jan 10, 2025
f7bed8d
Merge branch 'main' of https://github.com/DesignSafe-CI/portal
van-go Mar 18, 2025
c1a7a97
Merge branch 'main' of https://github.com/DesignSafe-CI/portal
van-go Mar 24, 2025
165ad8c
Merge branch 'main' of https://github.com/DesignSafe-CI/portal
van-go Apr 30, 2025
37c14bc
Merge branch 'main' of https://github.com/DesignSafe-CI/portal
van-go May 7, 2025
bfa1458
Merge branch 'main' of https://github.com/DesignSafe-CI/portal
van-go May 7, 2025
a4466cc
Merge branch 'main' of https://github.com/DesignSafe-CI/portal
van-go May 9, 2025
9a78985
Enhance search functionality with tips popover
van-go May 14, 2025
061d398
Adjust popover margin for search tips
van-go May 14, 2025
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
6 changes: 5 additions & 1 deletion conf/docker/docker-compose-dev.all.debug.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
services:
redis:
image: redis:7
platform: "linux/amd64"
volumes:
- redis_data_v3:/data
ports:
Expand All @@ -9,7 +10,7 @@ services:
hostname: des_redis

rabbitmq:
image: rabbitmq:3.6.10-management
image: arm64v8/rabbitmq:3.6.14-management
volumes:
- rabbitmq_data_v3:/var/lib/rabbitmq/mnesia/rabbit@des_rabbitmq
env_file: ../env_files/rabbitmq.env
Expand All @@ -20,11 +21,13 @@ services:

memcached:
image: memcached:latest
platform: "linux/amd64"
container_name: des_memcached
hostname: des_memcached

elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch:7.4.0
platform: "linux/amd64"
ulimits:
memlock: -1
environment:
Expand Down Expand Up @@ -54,6 +57,7 @@ services:

nginx:
image: nginx
platform: "linux/amd64"
volumes:
- ../nginx/nginx.debug.conf:/etc/nginx/nginx.conf
- ../nginx/gzip.conf:/etc/nginx/gzip.conf
Expand Down
3 changes: 3 additions & 0 deletions designsafe/static/vendor/bootstrap-ds/css/bootstrap.css
Original file line number Diff line number Diff line change
Expand Up @@ -5290,6 +5290,9 @@ fieldset[disabled] .navbar-inverse .btn-link:hover,
fieldset[disabled] .navbar-inverse .btn-link:focus {
color: #444444;
}
.popover.search-tips-popover {
margin-top: -30px !important;
}
.breadcrumb {
padding: 8px 15px;
margin-bottom: 20px;
Expand Down
59 changes: 47 additions & 12 deletions designsafe/templates/includes/navigation.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
<div class="navbar-header">
<ul class="nav navbar-nav hidden-xs">
<li>
<button class="navbar-toggle hidden-sm hidden-md hidden-lg" data-toggle="dropdown" aria-expanded="true" style="display:inherit">
<span class="sr-only">Section navigation</span>
<span class="icon-bar" role="presentation"></span>
<span class="icon-bar" role="presentation"></span>
<span class="icon-bar" role="presentation"></span>
</button>
<ul class="dropdown-menu">
{% include 'includes/global_nav.html' %}
</ul>
<button class="navbar-toggle hidden-sm hidden-md hidden-lg" data-toggle="dropdown" aria-expanded="true" style="display:inherit">
<span class="sr-only">Section navigation</span>
<span class="icon-bar" role="presentation"></span>
<span class="icon-bar" role="presentation"></span>
<span class="icon-bar" role="presentation"></span>
</button>
<ul class="dropdown-menu">
{% include 'includes/global_nav.html' %}
</ul>
</li>
</ul>
<!-- {% if section_root %}
Expand All @@ -32,9 +32,25 @@
{% 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" 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">

<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"
autocomplete="off"
uib-popover-template="'searchTips.html'"
popover-title="Search Tips"
popover-trigger="'focus'"
popover-placement="bottom-left"
popover-class="search-tips-popover"
popover-append-to-body="true"
>

<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;">
<label for="search-radio-website" style="color:white; margin-bottom:0px; margin-right:1rem; vertical-align: middle;">Website</label>
<input type="radio" name="search-radio" id="search-radio-datasets" value="datasets" style="display:table-cell; vertical-align: middle; margin-top:0px; margin-right:0.25rem;">
Expand All @@ -44,3 +60,22 @@
</div>
</div>
</nav>

<!-- Popover template for search tips -->
<script type="text/ng-template" id="searchTips.html">
<div style="max-width:300px; padding:8px;">
<h5 style="margin-top:0;"><strong>Search Tips</strong></h5>
<ul class="list-unstyled" style="margin:0 0 8px 0; padding:0;">
<li><strong>"exact phrase"</strong> – Use quotes to search for exact phrases.</li>
<li><strong>word1 OR word2</strong> – Find results containing either word.</li>
<li><strong>word1 AND word2, word3 word4</strong> – Use AND, commas, and spaces to find results containing each word.</li>
</ul>
<h5 style="margin:0 0 4px 0;"><strong>Recent Searches</strong></h5>
<ul class="list-unstyled" style="margin:0; padding:0;">
<li ng-repeat="term in $ctrl.recentSearches">
<a href ng-click="$ctrl.search_browse(term)" style="cursor:pointer; color:#337ab7;">{{term}}</a>
</li>
<li ng-if="!$ctrl.recentSearches.length"><em>No recent searches</em></li>
</ul>
</div>
</script>