pencil 0.2.9 → 0.2.10

data/lib/views/partials/cluster_selector.erb

@@ -1,4 +1,4 @@
-<select class="select2" onchange="window.open(this.options[this.selectedIndex].value,'_top')">
+<select class="select2 inline-dropdown" onchange="window.open(this.options[this.selectedIndex].value,'_top')">
   <option value="/dash/<%= append_query_string(@cluster) %>" selected="selected"><%= @cluster %></option>
   <% (@clusters - [@cluster]).each do |c| %>
   <option value="/dash/<%= append_query_string(c) %>"><%= c %></option>

data/lib/views/partials/cluster_switcher.erb

@@ -1,13 +1,13 @@
-clusters:
-<%= @clusters.sort.collect do |c|
-    sub = append_query_string(request.path.sub(@cluster, c))
-    @cluster == c ? "#{c}" : "<a href=\"#{sub}\">#{c}</a>"
-    end.join(" ") %>
-
-<%= if @cluster == "global"
-    " (global)"
-    else
-    # this sub works because the cluster should be first
-    " <a href=\"#{append_query_string(request.path.sub(@cluster, 'global'))}\">(global)</a>"
-    end %>
-<br>
+<div class="group_container ui-corner-top first">
+  <h4>clusters:</h4>
+  <%= @clusters.sort.collect do |c|
+      sub = append_query_string(request.path.sub(@cluster, c))
+      @cluster == c ? "#{c}" : "<a href=\"#{sub}\">#{c}</a>"
+      end.join(" ") %>
+  <%= if @cluster == "global"
+      " (global)"
+      else
+      # this sub works because the cluster should be first
+      " <a href=\"#{append_query_string(request.path.sub(@cluster, 'global'))}\">(global)</a>"
+      end %>
+</div>

data/lib/views/partials/dash_switcher.erb

@@ -1,11 +1,12 @@
-<span class="graphtitle">
-  dashboards:
-  <%= @dashboards.select do |d|
-      @cluster == "global" || d.clusters.member?(@cluster)
-      end.sort.collect do |d|
-      # this works unless you have a cluster with the same name as a dashboard
-      sub = append_query_string(request.path.sub(@dash.name, d.name))
-      @dash == d ? "#{d}" : "<a href=\"#{sub}\">#{d}</a>"
-      end.join(" ") %>
-</span>
-<br>
+<div class="group_container ui-corner-bottom last">
+  <h4>dashboards:</h4>
+  <span class="graphtitle">
+    <%= @dashboards.select do |d|
+        @cluster == "global" || d.clusters.member?(@cluster)
+        end.sort.collect do |d|
+        # this works unless you have a cluster with the same name as a dashboard
+        sub = append_query_string(request.path.sub(@dash.name, d.name))
+        @dash == d ? "#{d}" : "<a href=\"#{sub}\">#{d}</a>"
+        end.join(" ") %>
+  </span>
+</div>

data/lib/views/partials/graph_switcher.erb

@@ -1,11 +1,12 @@
-<span class="graphtitle">
-  graphs:
-  <%= @dash.graphs.map { |g| g.name }.collect do |g|
-     reversed = request.path.split("/").reverse
-     i = reversed.index(@zoom.name)
-     reversed[i] = g
-     sub = append_query_string(reversed.reverse.join('/'))
-     @zoom.name == g ? "#{g}" : "<a href=\"#{sub}\">#{g}</a>"
-     end.join(" ") %>
-</span>
-<br>
+<div class="group_container ui-corner-bottom last">
+  <h4>graphs:</h4>
+  <span class="graphtitle">
+    <%= @dash.graphs.map { |g| g.name }.collect do |g|
+        reversed = request.path.split("/").reverse
+        i = reversed.index(@zoom.name)
+        reversed[i] = g
+        sub = append_query_string(reversed.reverse.join('/'))
+        @zoom.name == g ? "#{g}" : "<a href=\"#{sub}\">#{g}</a>"
+        end.join(" ") %>
+  </span>
+</div>

data/lib/views/partials/hosts_selector.erb

@@ -2,8 +2,8 @@
   <option value="">-select host-</option>
   <% @hosts.sort.each do |h|
      option = "#{h.name}"
-     option << " [#{h.cluster}] " if @print_clusters
-     value = append_query_string("/host/#{h.cluster}/#{h}") %>
+     option << " [#{h.cluster}]" if @print_clusters
+     value = append_query_string("/host/#{h.cluster}/#{h}") -%>
   <option value="<%= value %>" <%= "selected=\"selected\"" if @host == h %>><%= option %></option>
   <% end %>
 </select>

data/lib/views/partials/input_boxes.erb

@@ -1,25 +1,36 @@
-<form name="input" method="get"><table style="font-size:small;">
-    <% @prefs.each do |label, name|
-       val = param_lookup(name) %>
-    <tr>
-      <td><%= label %>:</td>
-      <td><nobr><input <%= "value=\"#{val}\" " if val %>size="<%= name =~ /start|duration/ ? 10 : 4 %>" type="text" name="<%= name %>">
-          <% if name == "start" %>
-          <a href="http://chronic.rubyforge.org/" target="_blank">?</a>
-          <% elsif name == "duration" %>
-          <a href="https://github.com/hpoydar/chronic_duration" target="_blank">?</a>
-          <% end %></nobr>
-        <%= if name == "start"
-            "<div class=\"error\">Bad Time!</a>" unless \
-            Chronic.parse(param_lookup(name))
-            elsif name == "duration" && param_lookup(name)
-            "<div class=\"error\">Bad Interval!</a>" unless \
-            ChronicDuration.parse(param_lookup(name))
-            end %>
-      </td>
-    </tr>
+<div class="nav-box ui-corner-all" id="settings">
+  <h3 class="ui-corner-top ui-state-default">Graph Settings</h3>
+  <div class="nav-box-inner">
+    <form action="/process" name="input" method="get">
+      <% @prefs.each do |label, name|
+         val = param_lookup(name) %>
+      <label for="<%= name%>"><%= label%></label>
+      <input  <%= "value=\"#{val}\" " if val %> size="<%= name =~ /start|duration/ ? 10 : 4 %>" name="<%= name %>" id="<%= name %>" type="text"/>
+      <% if name == "start" %>
+      <a href="http://chronic.rubyforge.org/" class="inline-link" target="_blank">
+        <% if Chronic.parse(param_lookup(name)) %>
+        ?
+        <% else %>
+        <div class="error">Bad timespec!</div>
+        <% end %>
+      </a>
+      <% elsif name == "duration" %>
+      <a href="https://github.com/hpoydar/chronic_duration" class="inline-link" target="_blank">
+        <% if !param_lookup(name) || ChronicDuration.parse(param_lookup(name)) %>
+        ?
+        <% else %>
+        <div class="error">Bad interval!</div>
+        <% end %>
+      </a>
       <% end %>
-  </table> <input type="submit" value="Submit">
-</form>
-
-<form method="get"> <input type="submit" value="Clear"></form>
+      <% end %>
+      <div class="button-holder">
+        <input class="ui-state-default ui-corner-all ui-button" type="submit" value="Submit" name="action" />
+        <input class="ui-state-default ui-corner-all ui-button" type="submit" value="Clear" name="action" /><br>
+        <input class="ui-state-default ui-corner-all ui-button" type="submit" value="Save" name="action" />
+        <input class="ui-state-default ui-corner-all ui-button" type="submit" value="Reset" name="action" />
+      </div>
+    </form>
+    <div style="clear:both;"></div>
+  </div>
+</div>

data/lib/views/partials/shortcuts.erb

@@ -0,0 +1,5 @@
+<div class="group_container_small ui-corner-all">
+  <h4>shortcuts:</h4>
+  <%= @str %>
+</div>
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pencil
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 2
-  - 9
-  version: 0.2.9
+  - 10
+  version: 0.2.10
 platform: ruby
 authors: 
 - Pete Fritchman
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-17 00:00:00 Z
+date: 2011-11-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mongrel
@@ -52,12 +52,14 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 19
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 2
+        - 6
+        version: 1.2.6
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -115,38 +117,59 @@ extra_rdoc_files: []
 files: 
 - VERSION.rb
 - lib/models.rb
-- lib/config.ru
-- lib/helpers.rb
-- lib/dash.rb
+- lib/public/js/jquery-ui-1.8.16.custom.min.js
+- lib/public/js/jquery-1.6.2.min.js
+- lib/public/js/cufon.js
+- lib/public/js/product-design.font.js
+- lib/public/js/pencil.js
+- lib/public/js/gotham.font.js
+- lib/public/css/jquery_themes/pencil/images/ui-bg_highlight-soft_80_eeeeee_1x100.png
+- lib/public/css/jquery_themes/pencil/images/ui-icons_a83300_256x240.png
+- lib/public/css/jquery_themes/pencil/images/ui-icons_cccccc_256x240.png
+- lib/public/css/jquery_themes/pencil/images/ui-icons_4b8e0b_256x240.png
+- lib/public/css/jquery_themes/pencil/images/ui-bg_gloss-wave_25_333333_500x100.png
+- lib/public/css/jquery_themes/pencil/images/ui-bg_inset-soft_30_ff4e0a_1x100.png
+- lib/public/css/jquery_themes/pencil/images/ui-bg_glass_40_000000_1x400.png
+- lib/public/css/jquery_themes/pencil/images/ui-icons_ffffff_256x240.png
+- lib/public/css/jquery_themes/pencil/images/ui-bg_glass_20_333333_1x400.png
+- lib/public/css/jquery_themes/pencil/images/ui-icons_222222_256x240.png
+- lib/public/css/jquery_themes/pencil/images/ui-bg_flat_50_5c5c5c_40x100.png
+- lib/public/css/jquery_themes/pencil/images/ui-bg_highlight-soft_15_000000_1x100.png
+- lib/public/css/jquery_themes/pencil/images/ui-bg_flat_30_cccccc_40x100.png
+- lib/public/css/jquery_themes/pencil/images/ui-bg_glass_40_ffc73d_1x400.png
+- lib/public/css/jquery_themes/pencil/jquery-ui-1.8.16.custom.css
+- lib/public/css/thedoc.css
+- lib/public/style.css
+- lib/public/favicon.ico
 - lib/config.rb
-- lib/models/dashboard.rb
+- lib/models/host.rb
 - lib/models/graph.rb
+- lib/models/dashboard.rb
 - lib/models/base.rb
-- lib/models/host.rb
-- lib/views/dash-global.erb
-- lib/views/host.erb
-- lib/views/dash-cluster-zoom.erb
+- lib/views/cluster.erb
 - lib/views/global.erb
-- lib/views/layout.erb
+- lib/views/dash-cluster-zoom.erb
 - lib/views/dash-global-zoom.erb
+- lib/views/dash-global.erb
+- lib/views/host.erb
 - lib/views/partials/graph_switcher.erb
 - lib/views/partials/hosts_selector.erb
-- lib/views/partials/cluster_switcher.erb
-- lib/views/partials/refresh_button.erb
-- lib/views/partials/cookies_form.erb
-- lib/views/partials/dash_switcher.erb
 - lib/views/partials/input_boxes.erb
+- lib/views/partials/shortcuts.erb
 - lib/views/partials/cluster_selector.erb
-- lib/views/cluster.erb
+- lib/views/partials/cluster_switcher.erb
+- lib/views/partials/dash_switcher.erb
+- lib/views/layout.erb
 - lib/views/dash-cluster.erb
-- lib/public/style.css
-- lib/public/favicon.ico
 - lib/rubyfixes.rb
 - lib/namespace.rb
+- lib/helpers.rb
+- lib/dash.rb
+- lib/config.ru
 - docs/pencil_options.md
-- examples/dashboards.yml
 - examples/pencil.yml
 - examples/graphs.yml
+- examples/dashboards.yml
 - bin/pencil
 homepage: https://github.com/fetep/pencil
 licenses: 
@@ -177,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: pencil -- Graphite dashboard system

data/lib/views/partials/cookies_form.erb

@@ -1,12 +0,0 @@
-<form action="/saveprefs" name="input" method="get">
-  <div class="invisible">
-    <% @prefs.each do |label, name| %>
-    <%= "<input value=\"#{params[name]}\" name=\"#{name}\"><br>" if params[name] %>
-    <% end %>
-  </div>
-  <input type="submit" value="save preferences in a cookie">
-</form>
-
-<form action="/clear" name="clear" method="get">
-  <input type="submit" value="clear cookies">
-</form>

data/lib/views/partials/refresh_button.erb

@@ -1,8 +0,0 @@
-<form action="<%= request.path %>" name="input" method="get">
-  <input type="submit" value="Refresh">
-  <div class="invisible">
-    <% @prefs.each do |label, name| %>
-    <%= "<input value=\"#{params[name]}\" name=\"#{name}\"><br>" if params[name] %>
-    <% end %>
-  </div>
-</form>