Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-09-22 05:50:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git://github.com/bsag/tracks

Browse source
This commit is contained in:
Reinier Balt 2009-03-24 16:14:07 +01:00
commit 6fba06fe7f
4 changed files with 25 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/views/stats/actions_done_last12months_data.html.erb
View file

@ -14,8 +14,8 @@
&links=<% 0.upto 11 do |i| -%><%= url_for :controller => 'stats', :action => 'actions_done_last_years' %>,<% end -%><%= url_for :controller => 'stats', :action => 'actions_done_last_years' %>&
&links_2=<% 0.upto 11 do |i| -%><%= url_for :controller => 'stats', :action => 'actions_done_last_years' %>,<% end -%><%= url_for :controller => 'stats', :action => 'actions_done_last_years' %>&
&values_2=<% 0.upto 11 do |i| -%><%= @actions_done_last12months_hash[i]%>,<% end -%><%= @actions_done_last12months_hash[12]%>&
&values_3=<%0.upto 11 do |i| -%><%=@sum_actions_created_last12months/12-%>,<%end-%><%=@sum_actions_created_last12months/12-%>&
&values_4=<%0.upto 11 do |i| -%><%=@sum_actions_done_last12months/12-%>,<%end-%><%=@sum_actions_done_last12months/12-%>&
&values_3=<%0.upto 11 do |i| -%><%=@sum_actions_created_last12months/12.0-%>,<%end-%><%=@sum_actions_created_last12months/12.0-%>&
&values_4=<%0.upto 11 do |i| -%><%=@sum_actions_done_last12months/12.0-%>,<%end-%><%=@sum_actions_done_last12months/12.0-%>&
&values_5=<%0.upto 11 do |i| -%><%=@actions_created_avg_last12months_hash[i]-%>,<%end-%><%=@actions_created_avg_last12months_hash[12]-%>&
&values_6=<%0.upto 11 do |i| -%><%=@actions_done_avg_last12months_hash[i]-%>,<%end-%><%=@actions_done_avg_last12months_hash[12]-%>&
&values_7=<%=@interpolated_actions_created_this_month%>,<%=@actions_done_avg_last12months_hash[1]%>&

8
app/views/stats/actions_done_last30days_data.html.erb
View file

@ -16,14 +16,14 @@
<% end -%><%= @actions_done_last30days_hash[30]%>&
&values_3=
<%0.upto 29 do |i| -%>
<%=@sum_actions_created_last30days/30-%>,
<%=@sum_actions_created_last30days/30.0-%>,
<%end-%>
<%=@sum_actions_created_last30days/30-%>&
<%=@sum_actions_created_last30days/30.0-%>&
&values_4=
<%0.upto 29 do |i| -%>
<%=@sum_actions_done_last30days/30-%>,
<%=@sum_actions_done_last30days/30.0-%>,
<%end-%>
<%=@sum_actions_done_last30days/30-%>&
<%=@sum_actions_done_last30days/30.0-%>&
&x_labels=
<%0.upto 29 do |i|
seconds = i * 24 * 60 * 60

2
app/views/stats/context_running_actions_data.html.erb
View file

@ -10,7 +10,7 @@ end
0.upto @actions_per_context.size()-2 do | i |
%><%=truncate(@actions_per_context[i]['name'], :length => @truncate_chars, :omission => '...')%>,<%
end
-%><%=truncate(@actions_per_context[@actions_per_context.size()-1]['name'], :legnth => @truncate_chars, :omission => '...') %>&
-%><%=truncate(@actions_per_context[@actions_per_context.size()-1]['name'], :length => @truncate_chars, :omission => '...') %>&
&links=<%
0.upto @actions_per_context.size()-2 do | i |
%><%=url_for :controller => "contexts", :action => "show", :id=>@actions_per_context[i]['id']%>,<%

23
public/stylesheets/standard.css
View file

@ -109,9 +109,18 @@ a.show_notes:hover, a.link_to_notes:hover {background-image: url(/images/notes_o
}
#display_box {
float: left;
width: 55%;
margin: 0px 10px 50px 15px;
float: none;
margin-right: 310px;
padding-left: 5px;
}
body.preferences div#display_box {
margin-right:410px;
}
body.preferences div#input_box {
width:390px;
right:15px;
}
#single_box {
@ -326,8 +335,12 @@ h2 a:hover {
}
div#input_box {
margin: 0px 15px 0px 58%;
padding: 0px 15px 0px 0px;
position: absolute;
width: 265px;
margin: 0;
padding: 0px 0px 0px 0px;
top: 90px;
right: 40px;
}
#input_box h2 {