From 7f7cd6e9ffcd9319d809299d97b9d5fa678f4082 Mon Sep 17 00:00:00 2001
From: Will Bradley <bradley.will@gmail.com>
Date: Wed, 2 Oct 2013 04:45:07 -0700
Subject: [PATCH] Adjusting wording, styling, and graph visibility

---
 app/assets/stylesheets/users.css.scss  |  2 +-
 app/views/statistics/_index.html.erb   |  1 +
 app/views/statistics/door_log.html.erb | 15 ++-------------
 app/views/statistics/mac_log.html.erb  | 18 ++++--------------
 recompile_assets.sh                    |  6 +++---
 5 files changed, 11 insertions(+), 31 deletions(-)

diff --git a/app/assets/stylesheets/users.css.scss b/app/assets/stylesheets/users.css.scss
index c3c5ffa..0176045 100644
--- a/app/assets/stylesheets/users.css.scss
+++ b/app/assets/stylesheets/users.css.scss
@@ -6,7 +6,7 @@
 .hoverinfo { cursor: progress; }
 
 .payment_links { background-color: #ddd; padding: 1em; border-radius: 1em;
-  display: inline-block; float: right; }
+  display: inline-block; float: right; max-width: 30%; min-width: 10em;}
 
 .payment-highlighted {
   background-color: orange !important;
diff --git a/app/views/statistics/_index.html.erb b/app/views/statistics/_index.html.erb
index 02dcf7f..dbfe286 100644
--- a/app/views/statistics/_index.html.erb
+++ b/app/views/statistics/_index.html.erb
@@ -1,4 +1,5 @@
 <h2>Your Statistical Data</h2>
+<em>Data is power, and you've got the most detailed view: nobody else can see the below graphs but you! Make something cool!</em>
 
 <ul>
   <li><%= link_to 'MAC Address Data', mac_statistics_path %></li>
diff --git a/app/views/statistics/door_log.html.erb b/app/views/statistics/door_log.html.erb
index 8e44ef0..3680f7e 100644
--- a/app/views/statistics/door_log.html.erb
+++ b/app/views/statistics/door_log.html.erb
@@ -4,16 +4,6 @@
 <script type="text/javascript">
 $(function() {
 
-  $( "#graph" ).dialog({
-    autoOpen: false,
-    height: 325,
-    width: 525,
-    modal: true,
-  });
-  $( "#graph-button" ).click(function() {
-    $( "#graph" ).dialog( "open" );
-  });
-
   $('#graph').highcharts({
       chart: {
         type: 'column',
@@ -21,7 +11,7 @@ $(function() {
       },
       title: { 
         style : { fontSize: '10px' },
-        text: "Click and Drag to Zoom, Click the Legend to Turn Off Items" 
+        text: "Click and Drag to Zoom." 
       },
       xAxis: {
         title : { text : "Days" },
@@ -42,11 +32,10 @@ $(function() {
 });
 </script>
 
-<div id="graph" title="MAC Presence by Day" style="height: 250px; width: 500px; float: right;"></div>
 
 <h2>Your Card Access Data</h2>
-<button id="graph-button" class="btn">View Graph</button>
 <%= link_to 'Download JSON', door_statistics_path+".json", :class => 'btn' %>
+<div id="graph" title="MAC Presence by Day" style="height: 250px; width: 500px; float: right;"></div>
 <table>
   <tr>
     <th>Date</th>
diff --git a/app/views/statistics/mac_log.html.erb b/app/views/statistics/mac_log.html.erb
index 2b692d2..32625ca 100644
--- a/app/views/statistics/mac_log.html.erb
+++ b/app/views/statistics/mac_log.html.erb
@@ -4,16 +4,6 @@
 <script type="text/javascript">
 $(function() {
 
-  $( "#graph" ).dialog({
-    autoOpen: false,
-    height: 325,
-    width: 525,
-    modal: true,
-  });
-  $( "#graph-button" ).click(function() {
-    $( "#graph" ).dialog( "open" );
-  });
-
   $('#graph').highcharts({
       chart: {
         type: 'column',
@@ -21,7 +11,7 @@ $(function() {
       },
       title: { 
         style : { fontSize: '10px' },
-        text: "Click and Drag to Zoom, Click the Legend to Turn Off Items" 
+        text: "Click and Drag to Zoom, Click the Legend to Turn Off Items." 
       },
       xAxis: {
         title : { text : "Days" },
@@ -39,19 +29,19 @@ $(function() {
         data: <%= raw graph.to_json %>
       },
 <% end %>
-      ]
+      ],
+      tooltip : { valueSuffix : " hrs" }
   });
     
 
 });
 </script>
 
-<div id="graph" title="MAC Presence by Day" style="height: 250px; width: 500px; float: right;"></div>
 
 
 <h2>Your Mac Address Data</h2>
-<button id="graph-button" class="btn">View Graph</button>
 <%= link_to 'Download JSON', mac_statistics_path+".json", :class => 'btn' %>
+<div id="graph" title="MAC Presence by Day" style="height: 250px; width: 500px; float: right;"></div>
 <table>
   <tr>
     <th>Date</th>
diff --git a/recompile_assets.sh b/recompile_assets.sh
index 5681754..9419435 100755
--- a/recompile_assets.sh
+++ b/recompile_assets.sh
@@ -1,4 +1,4 @@
-sudo rake assets:clean RAILS_ENV=production
-sudo rake assets:precompile RAILS_ENV=production
-sudo touch tmp/restart.txt
+rake assets:clean RAILS_ENV=production
+rake assets:precompile RAILS_ENV=production
+touch tmp/restart.txt