will/Open-Source-Access-Control-Web-Interface
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjusting wording, styling, and graph visibility

Browse Source
This commit is contained in:
Will Bradley 2013-10-02 04:45:07 -07:00
parent f11d5ebe1e
commit 7f7cd6e9ff
5 changed files with 11 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/stylesheets/users.css.scss
View File

@ -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;

1
app/views/statistics/_index.html.erb
View File

@ -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>

15
app/views/statistics/door_log.html.erb
View File

@ -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>

18
app/views/statistics/mac_log.html.erb
View File

@ -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>

6
recompile_assets.sh
View File

@ -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