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

app/views/recurring_todos/_edit_form.html.erb

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

app/views/recurring_todos/edit.js.erb

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

app/views/recurring_todos/index.html.erb

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

app/views/recurring_todos/update.js.erb

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

config/locales/en.yml

@@ -560,6 +560,7 @@ en:
       due_date: with a due date %{due_date} or earlier
     overdue: Overdue
     add_new_recurring: Add a new recurring action
+    edit_recurring_todo: Edit repeating action
     no_incomplete_actions: There are no incomplete actions
   notes:
     delete_confirmation: Are you sure that you want to delete the note '%{id}'?

features/step_definitions/recurring_todo_steps.rb

@@ -1,5 +1,6 @@
 Given /^I have a repeat pattern called "([^"]*)"$/ do |pattern_name|
   context = @current_user.contexts.first
+
   @recurring_todo = @current_user.recurring_todos.create!(
     :description => pattern_name,
     :context_id => context.id,
@@ -44,10 +45,10 @@ When /^I edit the name of the pattern "([^\"]*)" to "([^\"]*)"$/ do |pattern_nam
   wait_for_ajax
 
   fill_in "edit_recurring_todo_description", :with => new_name
-  selenium.click "recurring_todo_edit_action_submit"
+  selenium.click "recurring_todo_edit_update_button"
 
   wait_for do
-    !selenium.is_visible("overlay")
+    !selenium.is_visible("edit-recurring-todo")
   end
 end
 

public/javascripts/application.js

@@ -1011,12 +1011,8 @@ var RecurringTodosPage = {
   			width: 750,
   			modal: true,
         buttons: {
-          "Create": function() {
+          "Create": function() { submit_with_ajax_and_block_element('form.#recurring-todo-form-new-action', $(this).parents(".ui-dialog")); },
-              submit_with_ajax_and_block_element('form.#recurring-todo-form-new-action', $(this));
+          Cancel: function() { $( this ).dialog( "close" ); }
-            },
-            Cancel: function() {
-  					$( this ).dialog( "close" );
-          }
         },
         show: "fade",
         hide: "fade",
@@ -1041,12 +1037,12 @@ var RecurringTodosPage = {
   			width: 750,
   			modal: true,
         buttons: {
-          "Create": function() {
+          "Update": {
-            submit_with_ajax_and_block_element('form#recurring-todo-form-edit-action', $(this));
+            text: "Update",
+            id: 'recurring_todo_edit_update_button',
+            click: function() { submit_with_ajax_and_block_element('form#recurring-todo-form-edit-action', $(this).parents(".ui-dialog")); }
           },
-          Cancel: function() {
+          Cancel: function() { $( this ).dialog( "close" ); }
-  					$( this ).dialog( "close" );
-          }
         },
         show: "fade",
         hide: "fade",

public/stylesheets/standard.css

@@ -211,14 +211,6 @@ a.show_successors:hover, a.link_to_successors:hover {background-image: url(../im
     text-align: left;
 }
 
-.recurring_submit_box {
-    height: 25px;
-    padding: 5px 0;
-    text-align: center;
-    clear: both;
-    border: none;
-}
-
 /* Navigation links at the top */
 
 #navcontainer {

spec/factories/factories.rb

@@ -20,6 +20,7 @@ begin
     t.sequence(:description) { |n| "testtodo#{n}" }
     t.association :context
   end
+
 rescue FactoryGirl::DuplicateDefinitionError
   # No problem, apparently this file was included already.
 end