Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-03-07 21:22:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix #1114. also update locales for last merges/commits

Browse source
This commit is contained in:
Reinier Balt 2011-11-18 11:43:06 +01:00
parent 6aa8b8d2f9
commit eb2f071c80
13 changed files with 1494 additions and 1453 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,3 @@
<label>Edit Recurring Todo</label><br/>
<div class="recurring_container">
<% #form_remote_tag(
#url => recurring_todo_path(@recurring_todo), :method => :put,
@ -99,17 +98,5 @@
<%= radio_button_tag('recurring_todo[recurring_target]', 'show_from_date', @recurring_todo.target == 'show_from_date', {:tabindex => next_tab_index})%> <%= t('todos.recurrence.from_tickler') %><br/>
<br/>
</div>
<div class="recurring_submit_box">
<div class="widgets">
<button type="submit" class="positive" id="recurring_todo_edit_action_submit" tabindex="<%=next_tab_index%>">
<%=image_tag("accept.png", :alt => "") %>
<%= t('common.update') %>
</button>
<button type="button" class="positive" id="recurring_todo_edit_action_cancel" tabindex="<%=next_tab_index%>">
<%=image_tag("cancel.png", :alt => "") %>
<%= t('common.cancel') %>
</button>
</div>
</div>
<% end %>
</div>

7
app/views/recurring_todos/edit.js.erb
View file

@ -1,9 +1,6 @@
$('#new-recurring-todo').hide();
$('#edit-recurring-todo').html(html_for_edit_form());
$('#edit-recurring-todo').show();
RecurringTodosPage.toggle_overlay();
enable_rich_interaction();
$('#edit-recurring-todo').dialog( "open" );
function html_for_edit_form() {
return "<%= escape_javascript(render(:partial => 'edit_form')) %>"
return "<%= escape_javascript(render(:partial => 'edit_form')) %>";
}

2
app/views/recurring_todos/index.html.erb
View file

@ -29,6 +29,6 @@
<div id="new-recurring-todo" class="new-form" title="<%= t('todos.add_new_recurring') %>">
<%= render :partial => "recurring_todo_form" %>
</div>
<div id="edit-recurring-todo" class="edit-form" style="display:none">
<div id="edit-recurring-todo" class="edit-form" style="display:none" title="<%= t('todos.edit_recurring_todo') %>">
<div class='placeholder'>This should not be visible</div>
</div>

2
app/views/recurring_todos/update.js.erb
View file

@ -1,5 +1,5 @@
<%- if @saved -%>
RecurringTodosPage.toggle_overlay();
$( "#edit-recurring-todo" ).dialog( "close" );
TracksPages.page_notify('notice', text_for_status_message(), 5);
replace_old_recurring_todo_with_updated();
<%- else -%>