Skip to content

Commit

Permalink
UI heading polish via @mobilutz, closes #4866
Browse files Browse the repository at this point in the history
  • Loading branch information
mperham committed May 3, 2021
1 parent 86b8fe5 commit da15276
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 8 deletions.
2 changes: 1 addition & 1 deletion web/assets/stylesheets/application.css
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ img.smallogo {
padding: 10px 0;
}

.redis-wrapper {
.stats-wrapper {
width: 100%;
text-align: center;
}
Expand Down
2 changes: 1 addition & 1 deletion web/views/busy.erb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
</div>
</div>

<div class="table_container">
<div class="stats-wrapper">
<div class="stats-container">
<div class="stat">
<h3><%= s = processes.size; number_with_delimiter(s) %></h3>
Expand Down
20 changes: 14 additions & 6 deletions web/views/dashboard.erb
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,30 @@
<div id="realtime-legend"></div>
</div>

<div class="row chart">
<h5>
<span class="history-heading"><%= t('History') %></span>
<div class="row header">
<div class="col-sm-4 pull-left flip">
<h3><%= t('History') %></h3>
</div>
</div>
<div class="row chart">
<div>
<a href="<%= root_path %>?days=7" class="history-graph <%= "active" if params[:days] == "7" %>"><%= t('OneWeek') %></a>
<a href="<%= root_path %>" class="history-graph <%= "active" if params[:days].nil? || params[:days] == "30" %>"><%= t('OneMonth') %></a>
<a href="<%= root_path %>?days=90" class="history-graph <%= "active" if params[:days] == "90" %>"><%= t('ThreeMonths') %></a>
<a href="<%= root_path %>?days=180" class="history-graph <%= "active" if params[:days] == "180" %>"><%= t('SixMonths') %></a>
</h5>
</div>

<div id="history" data-processed-label="<%= t('Processed') %>" data-failed-label="<%= t('Failed') %>" data-processed="<%= h Sidekiq.dump_json(@processed_history) %>" data-failed="<%= h Sidekiq.dump_json(@failed_history) %>" data-update-url="<%= root_path %>stats"></div>
<div id="history-legend"></div>
</div>

<br/>
<h5>Redis</h5>
<div class="redis-wrapper">
<div class="row header">
<div class="col-sm-4 pull-left flip">
<h3>Redis</h3>
</div>
</div>
<div class="stats-wrapper">
<div class="stats-container">
<% if @redis_info.fetch("redis_version", nil) %>
<div class="stat">
Expand Down

0 comments on commit da15276

Please sign in to comment.