Skip to content
This repository was archived by the owner on Dec 7, 2021. It is now read-only.

Commit 4f4bfb7

Browse files
author
Ben Whaley
committed
Revert to table so as not to constrain graph size
1 parent 1902b71 commit 4f4bfb7

File tree

8 files changed

+66
-38
lines changed

8 files changed

+66
-38
lines changed

‎Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ GEM
77
less (2.2.1)
88
commonjs (~> 0.2.6)
99
libv8 (3.3.10.4)
10-
rack (1.4.1)
10+
rack (1.4.5)
1111
rack-protection (1.2.0)
1212
rack
1313
redcarpet (2.1.1)

‎views/dashboard.erb

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,41 @@
11
<% unless @error %>
2-
<div class="row">
2+
3+
<div class="row-fluid">
4+
<div class="span2">
5+
</div>
36
<div class="span6">
47
<h1><%= @dashboard.name %>&nbsp;<small><%= @dashboard.description %></small></h1>
58
</div>
6-
<div class="span6" align=right>
9+
<div class="span4">
710
<small>Source: <a class="muted" href="<%=@dashboard.graphite_render.sub("/render","")%>"><%=@dashboard.graphite_render.sub("/render","")%></a></small>
811
</div>
912
</div>
13+
<div class="row-fluid">
14+
<div class="span2">
15+
</div>
16+
<div class="span8">
1017
<%= erb :_interval_filter, :layout => false unless @interval_filters.empty? %>
18+
</div>
19+
<div class="span2">
20+
</div>
21+
</div>
22+
<table align=center>
23+
<tr>
1124
<% span=12/@graph_columns %>
12-
<ul class="thumbnails">
1325
<% @graphs.each_with_index do |graph,i| %>
1426
<% if graph %>
1527
<% if i>0 and i%@graph_columns==0 %>
16-
</ul>
17-
<ul class="thumbnails">
28+
</tr>
29+
<tr>
1830
<%end%>
19-
<li class="span<%=span%>">
31+
<td>
2032
<%= erb(:graph, :locals => { :graph => graph }) %>
21-
</li>
33+
</td>
2234
<% end %>
2335
<% end %>
24-
</ul>
36+
</tr>
37+
</table>
38+
2539
<script>
2640
$(function () {
2741
$(".graph img")

‎views/detailed_dashboard.erb

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,28 @@
11
<% unless @error %>
2+
<div class="row-fluid">
3+
<div class="span2">
4+
</div>
5+
<div class="span6">
26
<h1><%= @dashboard.name %>&nbsp;<small><%= @dashboard.description %></small></h1>
7+
</div>
8+
</div>
9+
310
<% span=12/@graph_columns %>
4-
<ul class="thumbnails">
11+
<table align=center>
12+
<tr>
513
<% @graphs.each_with_index do |graph,i| %>
614
<% if graph %>
715
<% if i>0 and i%@graph_columns==0 %>
8-
</ul>
9-
<ul class="thumbnails">
16+
</tr>
17+
<tr>
1018
<%end%>
11-
<li class="span<%=span%>" >
19+
<td>
1220
<%= erb(:graph, :locals => { :graph => graph, :omit_link => true }) %>
13-
</li>
21+
</td>
1422
<% end %>
1523
<% end %>
16-
</ul>
24+
</tr>
25+
</table>
1726
<script>
1827
$(function () {
1928
$(".graph img")

‎views/full_size_dashboard.erb

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,21 @@
99
<body style='background: black'>
1010
<div class="container">
1111
<% span=12/@graph_columns %>
12-
<ul class="thumbnails">
12+
<table>
13+
<tr>
1314
<% @graphs.each_with_index do |graph,i| %>
1415
<% if graph %>
1516
<% if i>0 and i%@graph_columns==0 %>
16-
</ul>
17-
<ul class="thumbnails">
17+
</tr>
18+
<tr>
1819
<%end%>
19-
<div class="span<%=span%>" >
20+
<td>
2021
<%= erb(:graph, :locals => { :graph => graph, :omit_link => true }) %>
21-
</div>
22+
</td>
2223
<% end %>
2324
<% end %>
24-
</div>
25-
</ul>
25+
</tr>
26+
</table>
2627
<script>
2728
$(document).ready(function() {
2829
setInterval(reloadDash, <%= @refresh_rate * 1000 %>);

‎views/graph.erb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<% omit_link ||= false %>
22
<% unless omit_link %>
3-
<%qp=""; params['p'].each {|k,v| qp+="?p[#{k}]=#{v}"} unless params['p'].nil?%>
3+
<%qp="?#{request.env['rack.request.query_string']}" %>
44
<a href='<%= [@prefix, params[:category], @params[:dash], 'details', graph[:name], qp].join "/" %>'>
55
<% end %>
6-
<img style="margin: 0 auto;" src='<%= [@dashboard.graphite_render, graph[:graphite][:url]].join "?" %>' title="<%= graph[:graphite][:title] %>" data-content="<%= graph[:graphite][:description] %>">
6+
<img style="margin: 0 auto;" src='<%= [@dashboard.graphite_render, graph[:graphite][:url]].join "?" %>' title="<%= graph[:graphite][:title] %>" data-content="<%= graph[:graphite][:description] %>">
77
<% unless omit_link %>
88
</a>
99
<% end %>

‎views/layout.erb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<body>
2323
<div class="navbar">
2424
<div class="navbar-inner">
25-
<div class="container">
25+
<div class="container-fluid">
2626
<a class="brand" href="<%= @prefix %>/"><%= @dash_title %></a>
2727
<ul class="nav">
2828
<% @top_level.keys.sort.each do |category| %>
@@ -64,7 +64,7 @@
6464
</div>
6565
</div>
6666

67-
<div class="container">
67+
<div class="container-fluid">
6868
<% if @error %>
6969
<div class="alert alert-error alert-block">
7070
<button type="button" class="close" data-dismiss="alert">&times;</button>

‎views/print_dashboard.erb

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,21 @@ setTimeout("window.close();",1000);
1717
<body bgcolor="white">
1818
<h1><%= @dashboard.name %>&nbsp;<small><%= @dashboard.description %></small></h1>
1919
<% span=12/@graph_columns %>
20-
<ul class="thumbnails">
20+
<table>
21+
<tr>
2122
<% @graphs.each_with_index do |graph,i| %>
2223
<% if graph %>
2324
<% if i>0 and i%@graph_columns==0 %>
24-
</ul>
25-
<ul class="thumbnails">
25+
</tr>
26+
<tr>
2627
<%end%>
27-
<li class="span<%=span%>" >
28+
<td>
2829
<%= erb(:graph, :locals => { :graph => graph}) %>
29-
</li>
30+
</td>
3031
<% end %>
3132
<% end %>
32-
</ul>
33+
</tr>
34+
</table>
3335
<script>
3436
$(document).ready(function() {
3537
setInterval(reloadDash, <%= @refresh_rate * 1000 %>);

‎views/print_detailed_dashboard.erb

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,21 @@ setTimeout("window.close();",1000);
1717
<% else %>
1818
<h1><%= @dashboard.name %>&nbsp;<small><%= @dashboard.description %></small></h1>
1919
<% span=12/@graph_columns %>
20-
<ul class="thumbnails">
20+
<table>
21+
<tr>
2122
<% @graphs.each_with_index do |graph,i| %>
2223
<% if graph %>
2324
<% if i>0 and i%@graph_columns==0 %>
24-
</ul>
25-
<ul class="thumbnails">
25+
</tr>
26+
<tr>
2627
<%end%>
27-
<li class="span<%=span%>" >
28+
<td>
2829
<%= erb(:graph, :locals => { :graph => graph, :omit_link => true }) %>
29-
</li>
30+
</td>
3031
<% end %>
3132
<% end %>
32-
</ul>
33+
</tr>
34+
</table>
3335
<% end %>
3436
</body>
3537
</html>

0 commit comments

Comments
 (0)