bootstrap_widgets 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46301614810e9b3192290335414a0c28fe422918
-  data.tar.gz: db668ecdcd0775c3738895276f452c13480ea0d7
+  metadata.gz: 6976493224d556fbe0cf68ed6c580f7a6fa9b9ab
+  data.tar.gz: d5c841209b7ad24d904f89e6b7bb40ca007744e2
 SHA512:
-  metadata.gz: 1e4ad395b3a4880ef9016589188ea1581d13fc60650651d124e8e6aeb74326e5f72bb0cdbd1dc9fcf24b1788228a65a29783bc3b41b8e847189672a315e4e4a2
-  data.tar.gz: 84a5af371dae284d8045a5d9e1cb591c120be984d0ecb981fa93ec9c8235c0db595a3267ae828c876c96e187ec8f27c06c8fa0eadb05917d9dc86a53319c039b
+  metadata.gz: 510a54bd2d22f2f076e777776c2619eee127603ce5ddb9282b1c2423d70c5d3afa1483de857d5203f9cfeec3b7359bc48da10095f3ed55edd1eabacd543631a1
+  data.tar.gz: 3a6e87a837abc05ebacbc881a071822e6ce628fe54e94db5ee74f5c5fd53fb473f049fbdc783fe24fbc150716402b81418c22260726ca62c1d229d554f2b79e1

data/lib/bootstrap_widgets/version.rb

@@ -1,3 +1,3 @@
 module BootstrapWidgets
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/lib/widgets/graph_widget.rb

@@ -11,8 +11,12 @@ class GraphWidget < Widget
   end
 
   def self.graph(data={}, title, graph, labels, opts)
-    output = "<div id='#{graph}-#{title.parameterize}' class='graph'></div>"
-    output << "<script>#{graph}(#{json_data(data)},#{labels},'#{title.parameterize}',#{opts.to_json})</script>"
+    json_data = json_data(data)
+    link_data = link_data(data)
+    extra_classes = link_data.size > 0 ? "clickable_graph" : ""
+
+    output = "<div id='#{graph}-#{title.parameterize}' class='graph #{extra_classes}'></div>"
+    output << "<script>#{graph}(#{json_data},#{labels},'#{title.parameterize}',#{opts.to_json}, #{link_data.to_json.html_safe})</script>"
     output
   end
 

data/lib/widgets/widget.rb

@@ -37,8 +37,24 @@ protected
 
   def self.json_data(data={})
     jsdata = []
-    data.each {|key, value| jsdata << { label: "#{key}", value: value } }
+    data.each do |key, value|
+      if value.is_a? Hash
+        jsdata << { label: "#{key}", value: value[:data] }
+      else
+        jsdata << { label: "#{key}", value: value }
+      end
+    end
     jsdata.to_json.html_safe
   end
 
+  def self.link_data(data={})
+    jsdata = []
+    data.each do |key, value|
+      if value.is_a? Hash
+        jsdata << value[:link]
+      end
+    end
+    jsdata.compact
+  end
+
 end

data/vendor/assets/javascripts/bootstrap_widgets.js.coffee

@@ -6,7 +6,7 @@
 
 window.graphs = []
 
-window.bar_graph = (json_data, labels, title, opts) ->
+window.bar_graph = (json_data, labels, title, opts, links=[]) ->
   options = $.extend({},opts,{
     element: 'bar_graph-' + title,
     data:  json_data,
@@ -17,9 +17,13 @@ window.bar_graph = (json_data, labels, title, opts) ->
     resize: true
   })
   graph = new Morris.Bar options
+  graph.links = links
+  graph.on "click", (data) ->
+    if graph.links[data]
+      window.location =  graph.links[data]
   window.graphs.push graph
 
-window.line_graph = (json_data, labels, title, opts) ->
+window.line_graph = (json_data, labels, title, opts, links=[]) ->
   options = $.extend({},opts,{
     element: 'line_graph-' + title,
     parseTime: false,
@@ -30,9 +34,13 @@ window.line_graph = (json_data, labels, title, opts) ->
     resize: true
   })
   graph = new Morris.Line options
+  graph.links = links
+  graph.on "click", (data) ->
+    if graph.links[data]
+      window.location =  graph.links[data]
   window.graphs.push graph
 
-window.area_graph = (json_data, labels, title, opts) ->
+window.area_graph = (json_data, labels, title, opts, links=[]) ->
   options = $.extend({},opts,{
     element: 'area_graph-' + title,
     parseTime: false,
@@ -43,9 +51,12 @@ window.area_graph = (json_data, labels, title, opts) ->
     resize: true
   })
   graph = new Morris.Area options
+  graph.on "click", (data) ->
+    if graph.links[data]
+      window.location =  graph.links[data]
   window.graphs.push graph
 
-window.donut_graph = (json_data, labels, title, opts) ->
+window.donut_graph = (json_data, labels, title, opts, links=[]) ->
   options = $.extend({},opts,{
     element: 'donut_graph-' + title,
     parseTime: false,
@@ -53,6 +64,10 @@ window.donut_graph = (json_data, labels, title, opts) ->
     resize: true
   })
   graph = new Morris.Donut options
+  graph.links = links
+  graph.on "click", (data) ->
+    if graph.links[data]
+      window.location =  graph.links[data]
   window.graphs.push graph
 
 # ===== REDRAWING/RESIZING ====
@@ -71,12 +86,9 @@ window.redraw = (idx) ->
 $(window).resize ->
   if window.graphs.length > 0
     $('.loading-view').show()
-    if window.graphs.length > 3
-      waitForFinalEvent (->
-        resize()
-      ), 250, "bootstrap-widgets.resize.redrawing"
-    else
+    waitForFinalEvent (->
       resize()
+    ), 250, "bootstrap-widgets.resize.redrawing"
 
 $(document).on "ready page:change", ->
   if $('.masonry').length

data/vendor/assets/stylesheets/bootstrap_widgets.css.scss

@@ -1,4 +1,6 @@
-$break-small:1024px;
+//= require morris.min
+
+$break-small-dpi: 2.0;
 
 /**** LOADING ****/
 .loading-view {
@@ -67,17 +69,23 @@ $break-small:1024px;
         width: 40%;
         float: left;
         text-align: right;
-        @media screen and (max-width: $break-small) {
-        font-size: 13px;
-       }
+        @media only screen and (min--moz-device-pixel-ratio: $break-small-dpi),
+        (-o-min-device-pixel-ratio: $break-small-dpi),
+        (-webkit-min-device-pixel-ratio: $break-small-dpi),
+        (min-device-pixel-ratio: $break-small-dpi) {
+          font-size: 13px;
+        }
       }
       .right-text {
         width: 60%;
         float: left;
         text-align: center;
-        @media screen and (max-width: $break-small) {
-        font-size: 13px;
-       }
+        @media only screen and (min--moz-device-pixel-ratio: $break-small-dpi),
+        (-o-min-device-pixel-ratio: $break-small-dpi),
+        (-webkit-min-device-pixel-ratio: $break-small-dpi),
+        (min-device-pixel-ratio: $break-small-dpi) {
+          font-size: 13px;
+        }
       }
     }
   }
@@ -152,21 +160,27 @@ $break-small:1024px;
         line-height: 31px;
         margin-top: 20px;
         margin-bottom: 10px;
-       @media screen and (max-width: $break-small) {
-        line-height: 18px;
-        font-size: 20px;
-        float:right;
-        margin-top:-50px;
-       }
+        @media only screen and (min--moz-device-pixel-ratio: $break-small-dpi),
+        (-o-min-device-pixel-ratio: $break-small-dpi),
+        (-webkit-min-device-pixel-ratio: $break-small-dpi),
+        (min-device-pixel-ratio: $break-small-dpi) {
+          line-height: 18px;
+          font-size: 20px;
+          float:right;
+          margin-top:-50px;
+        }
       }
       .desc {
         font-size: 30px;
         font-weight: 100;
         color: rgba(255, 255, 255, 0.5);
-        @media screen and (max-width: $break-small) {
-        font-size: 24px;
-        float: right;
-       }
+        @media only screen and (min--moz-device-pixel-ratio: $break-small-dpi),
+        (-o-min-device-pixel-ratio: $break-small-dpi),
+        (-webkit-min-device-pixel-ratio: $break-small-dpi),
+        (min-device-pixel-ratio: $break-small-dpi) {
+          font-size: 24px;
+          float: right;
+        }
       }
       .desc, .number {
         text-align: right;
@@ -187,3 +201,15 @@ $break-small:1024px;
     text-align: right;
   }
 }
+
+/***** GRAPH SPECIFIC *******/
+
+.clickable_graph > svg > path,
+.clickable_graph > svg > rect,
+.clickable_graph > .morris-hover {
+  cursor: pointer;
+}
+
+.clickable_graph > .morris-hover:hover {
+  background: #fff;
+}

data/vendor/assets/stylesheets/morris.min.css

@@ -0,0 +1,2 @@
+.morris-hover{position:absolute;z-index:1000}.morris-hover.morris-default-style{border-radius:10px;padding:6px;color:#666;background:rgba(255,255,255,0.8);border:solid 2px rgba(230,230,230,0.8);font-family:sans-serif;font-size:12px;text-align:center}.morris-hover.morris-default-style .morris-hover-row-label{font-weight:bold;margin:0.25em 0}
+.morris-hover.morris-default-style .morris-hover-point{white-space:nowrap;margin:0.1em 0}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap_widgets
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Julian Nadeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-20 00:00:00.000000000 Z
+date: 2014-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -200,6 +200,7 @@ files:
 - vendor/assets/javascripts/morris.min.js
 - vendor/assets/javascripts/raphael.min.js
 - vendor/assets/stylesheets/bootstrap_widgets.css.scss
+- vendor/assets/stylesheets/morris.min.css
 homepage: http://github.com/jules2689/bootstrap_widgets
 licenses:
 - MIT