GitHub-Mirror/huginn
2
0
Fork 0
mirror of https://github.com/Fishwaldo/huginn.git synced 2025-03-19 21:31:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request from dsander/fix-navigation-line-break

Browse source 
Fixed navigation bar when many events are pending
This commit is contained in:
Dominik Sander 2014-09-23 22:27:21 +02:00
commit 7e662ead90
2 changed files with 10 additions and 5 deletions
app
assets/stylesheets
application.css.scss.erb
views/layouts
_navigation.html.erb

5
app/assets/stylesheets/application.css.scss.erb
View file

@ -86,6 +86,11 @@ span.not-applicable:after {
.nav > li {
&.job-indicator, &#event-indicator {
display: none;
a {
padding-right: 5px;
padding-left: 5px;
}
}
}

10
app/views/layouts/_navigation.html.erb
View file

@ -28,29 +28,29 @@
<ul class="nav navbar-nav navbar-right">
<% if user_signed_in? %>
<form class="navbar-form navbar-left" role="search">
<form class="navbar-form navbar-left visible-lg" role="search">
<div class="form-group">
<input type="text" class="form-control" id='agent-navigate' autocomplete="off" placeholder="Search">
<%= image_tag "spinner-arrows.gif", :class => "spinner" %>
</div>
</form>
<li class='job-indicator' role='pending'>
<li class='job-indicator visible-lg' role='pending'>
<%= link_to current_user.admin? ? jobs_path : '#' do %>
<span class="badge"><span class="glyphicon glyphicon-refresh icon-white"></span> <span class='number'>0</span></span>
<% end %>
</li>
<li class='job-indicator' role='awaiting_retry'>
<li class='job-indicator visible-lg' role='awaiting_retry'>
<%= link_to current_user.admin? ? jobs_path : '#' do %>
<span class="badge"><span class="glyphicon glyphicon-question-sign icon-yellow"></span> <span class='number'>0</span></span>
<% end %>
</li>
<li class='job-indicator' role='recent_failures'>
<li class='job-indicator hidden-sm hidden-xs' role='recent_failures'>
<%= link_to current_user.admin? ? jobs_path : '#' do %>
<span class="badge"><span class="glyphicon glyphicon-exclamation-sign icon-white"></span> <span class='number'>0</span></span>
<% end %>
</li>
<li id='event-indicator'>
<li id='event-indicator' class='hidden-sm hidden-xs'>
<a href="#">
<span class="badge"><span class="glyphicon glyphicon-random icon-white"></span> <span class='number'>0</span> new events</span>
</a>