Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-02-27 09:34:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'feed_improvements' of git://github.com/lrbalt/tracks

Browse source
This commit is contained in:
Reinier Balt 2008-07-25 20:40:53 +02:00
commit e07cde4cbd
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/recurring_todos_controller.rb
View file

@ -32,8 +32,10 @@ class RecurringTodosController < ApplicationController
# we needed to rename the recurring_period selector in the edit form # we needed to rename the recurring_period selector in the edit form
# because the form for a new recurring todo and the edit form are on the # because the form for a new recurring todo and the edit form are on the
# same page. # same page. Same goed for start_from and end_date
params['recurring_todo']['recurring_period']=params['recurring_edit_todo']['recurring_period'] params['recurring_todo']['recurring_period']=params['recurring_edit_todo']['recurring_period']
params['recurring_todo']['end_date']=params['recurring_todo_edit_end_date']
params['recurring_todo']['start_from']=params['recurring_todo_edit_start_from']
# update project # update project
if params['recurring_todo']['project_id'].blank? && !params['project_name'].nil? if params['recurring_todo']['project_id'].blank? && !params['project_name'].nil?

8
app/views/recurring_todos/_edit_form.html.erb
View file

@ -75,13 +75,13 @@
<div id="recurring_timespan"> <div id="recurring_timespan">
<br/> <br/>
<label for="recurring_todo[start_from]">Starts on </label><%= <label for="recurring_todo[start_from]">Starts on </label><%=
text_field_tag("recurring_todo[start_from]", format_date(@recurring_todo.start_from), "size" => 12, "class" => "Date", "onfocus" => "Calendar.setup", "tabindex" => 6, "autocomplete" => "off") %><br/> text_field_tag("recurring_todo_edit_start_from", format_date(@recurring_todo.start_from), "size" => 12, "class" => "Date", "onfocus" => "Calendar.setup", "tabindex" => 6, "autocomplete" => "off") %><br/>
<br/> <br/>
<label for="recurring_todo[ends_on]">Ends on:</label><br/> <label for="recurring_todo[ends_on]">Ends on:</label><br/>
<%= radio_button_tag('recurring_todo[ends_on]', 'no_end_date', @recurring_todo.ends_on == 'no_end_date')%> No end date<br/> <%= radio_button_tag('recurring_todo[ends_on]', 'no_end_date', @recurring_todo.ends_on == 'no_end_date')%> No end date<br/>
<%= radio_button_tag('recurring_todo[ends_on]', 'ends_on_number_of_times', @recurring_todo.ends_on == 'ends_on_number_of_times')%> Ends after <%= text_field_tag("recurring_todo[number_of_occurences]", @recurring_todo.number_of_occurences, "size" => 3, "tabindex" => 7) %> times<br/> <%= radio_button_tag('recurring_todo[ends_on]', 'ends_on_number_of_times', @recurring_todo.ends_on == 'ends_on_number_of_times')%> Ends after <%= text_field_tag("recurring_todo[number_of_occurences]", @recurring_todo.number_of_occurences, "size" => 3, "tabindex" => 7) %> times<br/>
<%= radio_button_tag('recurring_todo[ends_on]', 'ends_on_end_date', @recurring_todo.ends_on == 'ends_on_end_date')%> Ends on <%= <%= radio_button_tag('recurring_todo[ends_on]', 'ends_on_end_date', @recurring_todo.ends_on == 'ends_on_end_date')%> Ends on <%=
text_field_tag('recurring_todo[end_date]', format_date(@recurring_todo.end_date), "size" => 12, "class" => "Date", "onfocus" => "Calendar.setup", "tabindex" => 8, "autocomplete" => "off") %><br/> text_field_tag('recurring_todo_edit_end_date', format_date(@recurring_todo.end_date), "size" => 12, "class" => "Date", "onfocus" => "Calendar.setup", "tabindex" => 8, "autocomplete" => "off") %><br/>
</div></div> </div></div>
<div id="recurring_edit_daily" style="display:<%= @recurring_todo.recurring_period == 'daily' ? 'block' : 'none' %> "> <div id="recurring_edit_daily" style="display:<%= @recurring_todo.recurring_period == 'daily' ? 'block' : 'none' %> ">
<label>Recurrence</label><br/> <label>Recurrence</label><br/>
@ -142,6 +142,6 @@
</div> </div>
</div> </div>
<% end %> <% end %>
<%= calendar_setup( "recurring_todo_start_from" ) %> <%= calendar_setup( "recurring_todo_edit_start_from" ) %>
<%= calendar_setup( "recurring_todo_end_date" ) %> <%= calendar_setup( "recurring_todo_edit_end_date" ) %>
</div> </div>