mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2025-09-10 15:14:33 +08:00
Merge pull request #237 from ZmagoD/zd_SCI_593_v2
Styled global team switch and search [fixes SCI-593]
This commit is contained in:
Zmago Devetak
GitHub
commit
12c77df883
3 changed files with 162 additions and 63 deletions
|
|
@ -94,9 +94,20 @@
|
|||
});
|
||||
}
|
||||
|
||||
function focusSearchInput() {
|
||||
var searchIco = $('#search-ico');
|
||||
searchIco
|
||||
.on('shown.bs.dropdown', function() {
|
||||
searchIco
|
||||
.find('input.form-control')
|
||||
.focus();
|
||||
});
|
||||
}
|
||||
|
||||
// init
|
||||
loadDropdownNotifications();
|
||||
loadUnseenNotificationsNumber();
|
||||
toggleNotificationBellPosition();
|
||||
focusSearchInput();
|
||||
initGlobalSwitchForm();
|
||||
})();
|
||||
|
|
|
|||
|
|
@ -554,10 +554,35 @@ a[data-toggle="tooltip"] {
|
|||
}
|
||||
}
|
||||
|
||||
// Global team switch
|
||||
.search-dropdown {
|
||||
padding-right: 25px;
|
||||
width: 250px;
|
||||
|
||||
input {
|
||||
width: 230px;
|
||||
}
|
||||
}
|
||||
|
||||
@media(max-width:1000px) {
|
||||
.search-dropdown {
|
||||
width: 270px;
|
||||
|
||||
.form-group {
|
||||
padding-left: 15px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Global team switch
|
||||
#team-switch {
|
||||
border-left: 1px solid $color-alto;
|
||||
border-right: 1px solid $color-alto;
|
||||
word-wrap: break-word;
|
||||
|
||||
.dropdown-menu {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
i {
|
||||
margin-right: 5px;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -55,6 +55,88 @@
|
|||
|
||||
<!-- profile info -->
|
||||
<ul class="nav navbar-nav navbar-right">
|
||||
|
||||
<!-- Global team switch -->
|
||||
<% if current_user.organizations.length > 0 %>
|
||||
<li class="dropdown" id="team-switch">
|
||||
<a href="#"
|
||||
class="dropdown-toggle"
|
||||
data-toggle="dropdown"
|
||||
role="button"
|
||||
aria-haspopup="true"
|
||||
aria-expanded="false">
|
||||
<%= fa_icon 'users' %>
|
||||
<span>
|
||||
<%= truncate_organization_name(current_organization.name) %>
|
||||
</span>
|
||||
</a>
|
||||
|
||||
<ul class="dropdown-menu ">
|
||||
<%= form_for(current_user,
|
||||
url: user_current_organization_path,
|
||||
method: :post) do |f| %>
|
||||
<%= hidden_field(:user, :current_organization_id) %>
|
||||
<% current_user.organizations.each do |org| %>
|
||||
<% next unless org != current_organization %>
|
||||
<li>
|
||||
<a href="#"
|
||||
data-id="<%= org.id %>"
|
||||
class="text-center change-team">
|
||||
<%= org.name %>
|
||||
</a>
|
||||
</li>
|
||||
<% end %>
|
||||
<% end %>
|
||||
<li role="separator" class="divider"></li>
|
||||
<li>
|
||||
<%= link_to new_organization_path do %>
|
||||
<span class="glyphicon glyphicon-plus"></span>
|
||||
<%= t('users.settings.organizations.index.new_organization') %>
|
||||
<% end %>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
<% end %>
|
||||
|
||||
<!-- search -->
|
||||
<li class="dropdown"
|
||||
id="search-ico">
|
||||
<a href="#"
|
||||
class="dropdown-toggle"
|
||||
data-toggle="dropdown"
|
||||
role="button"
|
||||
aria-haspopup="true"
|
||||
aria-expanded="false">
|
||||
<span class="glyphicon glyphicon-search"></span>
|
||||
</a>
|
||||
<ul class="dropdown-menu search-dropdown">
|
||||
<li>
|
||||
<!-- search form -->
|
||||
<%= form_tag search_path,
|
||||
method: :get,
|
||||
id: 'search-bar',
|
||||
class: 'navbar-form navbar-right',
|
||||
role: 'search' do %>
|
||||
<div class="form-group">
|
||||
<div class="input-group">
|
||||
<input class="form-control"
|
||||
type="text"
|
||||
name="q"
|
||||
placeholder="<%= t('nav.search') %>">
|
||||
<span class="input-group-btn visible-xs visible-sm">
|
||||
<button id="search-button"
|
||||
class="btn btn-default"
|
||||
type="submit">
|
||||
<span class="glyphicon glyphicon-menu-right"></span>
|
||||
</button>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
<% end %>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
|
||||
<!-- notifications -->
|
||||
<li class="dropdown">
|
||||
<a href="#"
|
||||
|
|
@ -67,18 +149,34 @@
|
|||
data-href="<%= recent_notifications_url(current_user) %>">
|
||||
<%= fa_icon 'bell'%>
|
||||
<span id="count-notifications"
|
||||
data-href="<%= unseen_notification_url(current_user) %>"></span>
|
||||
data-href="<%= unseen_notification_url(current_user) %>">
|
||||
</span>
|
||||
</a>
|
||||
<ul class="dropdown-menu dropdown-notifications">
|
||||
<li class="notifications-dropdown-header"><span><%= t('notifications.title') %></span><span class="pull-right"><%= link_to t('nav.user.settings'), preferences_path %></span></li>
|
||||
<li class="notifications-no-recent"><em><%= t('notifications.no_recent') %></em></li>
|
||||
<li class="notifications-dropdown-footer"><%= link_to t('notifications.show_all'), notifications_path %></li>
|
||||
<li class="notifications-dropdown-header">
|
||||
<span><%= t('notifications.title') %></span>
|
||||
<span class="pull-right">
|
||||
<%= link_to t('nav.user.settings'), preferences_path %>
|
||||
</span>
|
||||
</li>
|
||||
<li class="notifications-no-recent">
|
||||
<em><%= t('notifications.no_recent') %></em>
|
||||
</li>
|
||||
<li class="notifications-dropdown-footer">
|
||||
<%= link_to t('notifications.show_all'), notifications_path %>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
|
||||
<!-- help -->
|
||||
<li class="dropdown">
|
||||
<a href="#" id="help-link" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
|
||||
<a href="#"
|
||||
id="help-link"
|
||||
class="dropdown-toggle"
|
||||
data-toggle="dropdown"
|
||||
role="button"
|
||||
aria-haspopup="true"
|
||||
aria-expanded="false">
|
||||
<span class="glyphicon glyphicon-info-sign"></span>
|
||||
</a>
|
||||
<ul class="dropdown-menu">
|
||||
|
|
@ -100,73 +198,38 @@
|
|||
</ul>
|
||||
</li>
|
||||
|
||||
<!-- Global team switch -->
|
||||
<% if current_user.organizations.length > 0 %>
|
||||
<li class="dropdown" id="team-switch">
|
||||
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
|
||||
<%= fa_icon 'users' %>
|
||||
<!-- greetings -->
|
||||
<li class="dropdown">
|
||||
<a href="#"
|
||||
class="dropdown-toggle"
|
||||
data-toggle="dropdown"
|
||||
role="button"
|
||||
aria-haspopup="true"
|
||||
aria-expanded="false">
|
||||
<span>
|
||||
<%= truncate_organization_name(current_organization.name) %>
|
||||
<%= t('nav.user_greeting', full_name: current_user.full_name) %>
|
||||
</span>
|
||||
<%= image_tag avatar_path(current_user, :icon_small),
|
||||
class: "avatar" %>
|
||||
</a>
|
||||
|
||||
<ul class="dropdown-menu ">
|
||||
<%= form_for(current_user,
|
||||
url: user_current_organization_path,
|
||||
method: :post) do |f| %>
|
||||
<%= hidden_field(:user, :current_organization_id) %>
|
||||
<% current_user.organizations.each do |org| %>
|
||||
<% next unless org != current_organization %>
|
||||
<li>
|
||||
<a href="#"
|
||||
data-id="<%= org.id %>"
|
||||
class="text-center change-team">
|
||||
<%= org.name %>
|
||||
</a>
|
||||
</li>
|
||||
<% end %>
|
||||
<% end %>
|
||||
<ul class="dropdown-menu">
|
||||
<li>
|
||||
<%= link_to new_organization_path do %>
|
||||
<span class="glyphicon glyphicon-plus"></span>
|
||||
<%= t('users.settings.organizations.index.new_organization') %>
|
||||
<% end %>
|
||||
<%= link_to t('nav.user.profile'), edit_user_registration_path %>
|
||||
</li>
|
||||
<li>
|
||||
<%= link_to t('nav.user.settings'), preferences_path %>
|
||||
</li>
|
||||
<li role="separator" class="divider"></li>
|
||||
<li>
|
||||
<%= link_to t('nav.user.logout'),
|
||||
destroy_user_session_path,
|
||||
method: :delete %>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
<% end %>
|
||||
|
||||
<!-- greetings -->
|
||||
<li class="dropdown">
|
||||
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
|
||||
<span><%= t('nav.user_greeting', full_name: current_user.full_name) %></span>
|
||||
<%= image_tag avatar_path(current_user, :icon_small), class: "avatar" %>
|
||||
</a>
|
||||
<ul class="dropdown-menu">
|
||||
<li><%= link_to t('nav.user.profile'), edit_user_registration_path %></li>
|
||||
<li><%= link_to t('nav.user.settings'), preferences_path %></li>
|
||||
<li role="separator" class="divider"></li>
|
||||
<li><%= link_to t('nav.user.logout'), destroy_user_session_path, :method => :delete %></li>
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<!-- search form -->
|
||||
<%= form_tag search_path, method: :get, id: 'search-bar', class: 'navbar-form navbar-right', role: 'search' do %>
|
||||
<div class="form-group">
|
||||
<div class="input-group">
|
||||
<input class="form-control" type="text" name="q" placeholder="<%= t('nav.search') %>">
|
||||
<span class="input-group-btn">
|
||||
<button id="search-button" class="btn btn-default" type="submit">
|
||||
<span class="glyphicon glyphicon-search"></span>
|
||||
</button>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
</div>
|
||||
</nav>
|
||||
<div id="loading-animation"></div>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue