Merge branch 'master' into placeholders_graph_properties

Conflicts:
	README.md

Author: keymon

README.md

@@ -238,6 +238,18 @@ A external properties files can be also loaded from the url:
 
   http://graphite.example.net:3000/category_name/dash_name/?include_properties=white-theme.yml
 
+Special properties when printing?
+---------------------------------
+
+When printing these properties will be overrided:  
+
+    :graph_properties: 
+     :background_color: white
+     :foreground_color: black
+
+You can create an optional YAML file _templatedir/print.yml_ that will be loaded when printing.
+This way you can override additional properties or use custom colors for printing.
+
 Placeholder Parameters
 ----------------------
 

lib/gdash/dashboard.rb

@@ -40,12 +40,11 @@ def initialize(short_name, graph_templates, category, options={}, graphite_rende
         yaml_file = File.join(graph_templates, property_file)
         if File.exist?(yaml_file)
           @properties.rmerge!(YAML.load_file(yaml_file))
-        else
-          raise "Missing file #{yaml_file}' for include_properties in #{File.join(directory, 'dash.yaml')}"
         end
       end
-
+ 	
       # Properties defined in dashboard config file are overridden when given on initialization
+      @properties.rmerge!(options)
       @properties[:graph_width] = options.delete(:width) || graph_width
       @properties[:graph_height] = options.delete(:height) || graph_height
       @properties[:graph_from] = options.delete(:from) || graph_from

lib/gdash/sinatra_app.rb

@@ -73,7 +73,13 @@ def initialize(graphite_base, graph_templates, options = {})
 
     get '/:category/:dash/details/:name/?*' do
       options = {}
-
+      if query_params[:print]
+        options[:include_properties] = "print.yml"
+        options[:graph_properties] = { 
+          :background_color => "white",
+          :foreground_color => "black"
+          }
+      end
       options.merge!(query_params)
 
       if @top_level["#{params[:category]}"].list.include?(params[:dash])
@@ -98,7 +104,11 @@ def initialize(graphite_base, graph_templates, options = {})
         @error = "No such graph available"
       end
 
-      erb :detailed_dashboard
+      if !query_params[:print]
+        erb :detailed_dashboard
+      else
+        erb :print_detailed_dashboard, :layout => false
+      end
     end
 
     get '/:category/:dash/full/?*' do
@@ -115,8 +125,6 @@ def initialize(graphite_base, graph_templates, options = {})
         options[:height] = @graph_height
       end
 
-      options.merge!(query_params)
-
       if @top_level["#{params[:category]}"].list.include?(params[:dash])
         @dashboard = @top_level[@params[:category]].dashboard(params[:dash], options)
       else
@@ -138,6 +146,13 @@ def initialize(graphite_base, graph_templates, options = {})
           options[:until] = params["splat"][2] || "now"
         end
 
+      if query_params[:print]
+        options[:include_properties] = "print.yml"
+        options[:graph_properties] = { 
+          :background_color => "white",
+          :foreground_color => "black"
+          }
+      end
       options.merge!(query_params)
 
       if @top_level["#{params[:category]}"].list.include?(params[:dash])
@@ -148,7 +163,11 @@ def initialize(graphite_base, graph_templates, options = {})
 
       @graphs = @dashboard.graphs(options)
 
-      erb :dashboard
+      if !query_params[:print]
+        erb :dashboard
+      else
+        erb :print_dashboard, :layout => false
+      end
     end
 
     get '/docs/' do
@@ -178,10 +197,19 @@ def query_params
 
         hash
       end
+
       def query_alias_map(k)
         q_aliases = {'p' => 'placeholders'}
         q_aliases[k] || k
       end
+
+      def link_to_print
+        uri =  URI.parse(request.path)
+        new_query_ar = URI.decode_www_form(request.query_string) << ["print", "1"]
+        uri.query = URI.encode_www_form(new_query_ar)
+        uri.to_s
+      end
+    
     end
   end
 end

views/layout.erb

@@ -27,10 +27,22 @@
                             </li>
                         <% end %>
                         </ul>
-                        <ul class="nav pull-right">
-                            <li><a href="<%= @graphite_base %>">Data Browser</a></li>
-                            <li><a href="<%= @prefix %>/docs/">Docs</a></li>
-                        </ul>
+  			            <ul class="nav secondary-nav">
+                            <li class="dropdown">
+                                <a href="#" class="dropdown-toggle">Menu</a>
+                                <ul class="dropdown-menu">
+                                    <li><a href="<%= @graphite_base %>">Data Browser</a></li>
+                                    <li class="divider"></li>
+                                    <li><a href="<%= @prefix %>/docs/">GDash Docs</a></li>
+                                    <li><a href="http://graphite.readthedocs.org/en/1.0/functions.html">Graphite Function Reference</a></li>
+                                    <% if @dashboard %>
+                                        <li class="divider"></li>
+                                        <li><a href="<%= link_to_print %>" target="_blank">Print this page</a></li>
+                                    <% end %> 
+                                </ul>
+                            </li>
+			            </ul>
+                    </div>
                 </div>
             </div>
         </div>

views/print_dashboard.erb

@@ -0,0 +1,46 @@
+<html>
+<head>
+    <script src="<%= @prefix %>/js/jquery-1.7.2.min.js"></script>
+    <script language=Javascript>
+window.print();
+ClosePrint();
+function ClosePrint( )
+{
+setTimeout("window.close();",1000);
+}
+    </script>
+</head>
+<% if @error %>
+   <h2><%= @error %></h2>
+<% else %>
+<body bgcolor="white">
+<h1><%= @dashboard.name %>&nbsp;<small><%= @dashboard.description %></small></h1>
+
+<table width="100%" height="100%">
+    <% @graphs.in_groups_of(@graph_columns) do |graphrows| %>
+        <tr>
+        <% graphrows.each do |graph| %>
+            <td valign="middle" align="center">
+            <% if graph %>
+                <img src='<%= [@top_level[@params[:category]].graphite_render, graph[:graphite][:url]].join "?" %>'>
+            <% end %>
+            </td>
+        <% end %>
+        </tr>
+    <% end %>
+</table>
+<script>
+    $(document).ready(function() {
+        setInterval(reloadDash, <%= @refresh_rate * 1000 %>);
+    });
+    function reloadDash() {
+        var now = new Date();
+        $('img').each(function(index) {
+            var url = $(this).attr('src').replace(/&\d+$/, '');
+            $(this).attr('src', url + '&' + now.getTime());
+        });
+    }
+</script>
+</body>
+<% end %>
+</html>

views/print_detailed_dashboard.erb

@@ -0,0 +1,38 @@
+<html>
+<head>
+    <script src="<%= @prefix %>/js/jquery-1.7.2.min.js"></script>
+    <script language=Javascript>
+window.print();
+ClosePrint();
+function ClosePrint( )
+{
+setTimeout("window.close();",1000);
+}
+    </script>
+</head>
+<body bgcolor="white">
+<% if @error %>
+   <h2><%= @error %></h2>
+<% else %>
+<h1><%= @dashboard.name %>&nbsp;<small><%= @dashboard.description %></small></h1>
+<div class="row">
+    <table>
+        <% row = 1 %>
+        <% @graphs.in_groups_of(@graph_columns) do |graphrows| %>
+          <tr>
+          <% graphrows.each do |graph| %>
+            <td>
+            <% if graph %>
+              <%= erb(:graph, :locals => { :graph => graph, :omit_link => true }) %>
+            <% end %>
+            </td>
+          <% end %>
+	  </tr>
+          <% row += 1 %>
+        <% end %>
+    </table>
+</div>
+<% end %>
+</body>
+</html>
+