Skip to content

Polish branch dropdown UI #107

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.

Sign up for GitHub

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

Open
devsxyzz wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Polish branch dropdown UI #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
47 changes: 47 additions & 0 deletions public/css/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,3 +337,50 @@ div[class="tooltip-inner"] {
background: transparent;
float: right;
}

/* Scrollable dropdown menus */
.dropdown-menu-scrollable {
max-height: 50vh;
overflow-y: auto;
overflow-x: hidden;
}

/* Search container inside dropdown */
.dropdown-search-container {
padding: 5px 10px;
}

.dropdown-search-container .navbar-form {
margin: 0;
padding: 0;
}

.dropdown-search-container .input-group {
width: 100%;
}

.dropdown-search-container .input-group-addon {
background-color: #fff;
border-right: none;
}

.dropdown-search-container input.typeahead {
border-left: none;
box-shadow: none;
}

.dropdown-search-container input.typeahead:focus {
border-color: #ccc;
box-shadow: none;
}

/* Loading indicator in dropdowns */
.dropdown-loading {
padding: 10px 20px;
color: #999;
text-align: center;
}

.dropdown-loading .fa-spinner {
margin-right: 5px;
}
8 changes: 8 additions & 0 deletions public/js/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ function set_machine_types() {

function populate_machine_type_menus(machine_types) {
var run_filter_list = $('#menu-machine-type').parent().find('ul');
// Remove loading indicator
run_filter_list.find('.dropdown-loading').remove();
if (run_filter_list.children().length == 0) {
var items = [];
$.each(machine_types, function(i) {
Expand Down Expand Up @@ -97,6 +99,8 @@ function set_suites() {

function populate_suite_menus(suite_names) {
var suite_list = $('#menu-suites').parent().find('ul');
// Remove loading indicator
suite_list.find('.dropdown-loading').remove();
if (suite_list.children().length == 0) {
var items = [];
$.each(suite_names, function(i) {
Expand Down Expand Up @@ -279,6 +283,10 @@ $( document ).ready(function() {
name: 'branches',
prefetch: '/_paddles/branches/',
ttl: 30000,
}).on('typeahead:loading', function() {
$(this).closest('.input-group').find('.input-group-addon').html('<i class="fa fa-spinner fa-spin"></i>');
}).on('typeahead:loaded', function() {
$(this).closest('.input-group').find('.input-group-addon').html('<i class="fa fa-search"></i>');
});

$('#search-branches').keypress(function(e) {
Expand Down
22 changes: 14 additions & 8 deletions pulpito/templates/layout.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,29 +53,35 @@
<a href="#" class="dropdown-toggle" id="menu-branches" data-toggle="dropdown">By Branch
<b class="caret"></b>
</a>
<ul class="dropdown-menu">
{% for branch in ['main', 'tentacle', 'squid', 'reef'] %}
<li><a onclick="stack_filter('branch', '{{ branch }}')" href="#">{{ branch }}</a></li>
{% endfor %}
<li>
<ul class="dropdown-menu dropdown-menu-scrollable">
<li class="dropdown-search-container">
<form class="navbar-form">
<input id="search-branches" class='typeahead' type="text" placeholder='search...'>
<div class="input-group">
<span class="input-group-addon"><i class="fa fa-search"></i></span>
<input id="search-branches" class='typeahead form-control' type="text" placeholder='search branches...'>
</div>
</form>
</li>
<li class="divider"></li>
{% for branch in ['main', 'tentacle', 'squid', 'reef'] %}
<li><a onclick="stack_filter('branch', '{{ branch }}')" href="#">{{ branch }}</a></li>
{% endfor %}
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" id="menu-suites" data-toggle="dropdown">By Suite
<b class="caret"></b>
</a>
<ul class="dropdown-menu">
<ul class="dropdown-menu dropdown-menu-scrollable">
<li class="dropdown-loading"><i class="fa fa-spinner fa-spin"></i> Loading...</li>
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" id="menu-machine-type" data-toggle="dropdown">By Machine Type
<b class="caret"></b>
</a>
<ul class="dropdown-menu">
<ul class="dropdown-menu dropdown-menu-scrollable">
<li class="dropdown-loading"><i class="fa fa-spinner fa-spin"></i> Loading...</li>
</ul>
</li>
</ul>
Expand Down