Merge branch 'feature/edit-recurring-task'

Conflicts:
	config/locales/en.yml

app/views/tasks/_form.html.haml

@@ -1,31 +1,11 @@
-- content_for :javascript do
-  :javascript
-    $(function() {
-      $("#task_user_list").tokenInput("#{users_path(:format => :json)}", {
-        crossDomain: false,
-        prePopulate: $("#task_user_list").data("pre"),
-        hintText: '#{escape_javascript(t('.search.hint'))}',
-        noResultText: '#{escape_javascript(t('.search.noresult'))}',
-        searchingText: '#{escape_javascript(t('.search.placeholder'))}',
-        theme: 'facebook'
-      });
-    });
-
-- content_for :sidebar do
-  = render "shared/workgroup_members"
-
-= simple_form_for @task do |f|
-  = f.hidden_field :current_user_id
-  = f.input :name
-  = f.input :description, as: :text, input_html: {rows: 10}
-  = f.input :duration, :as => :select, :collection => 1..3
-  = f.input :user_list, :as => :string, :input_html => { 'data-pre' => @task.users.map(&:token_attributes).to_json }
-  = f.input :required_users
-  = f.association :workgroup
-  = f.input :due_date, as: :date_picker
-  = f.input :done
-  .form-actions
-    = f.submit class: 'btn btn-primary'
-    - if @task.new_record?
-      = f.submit t('.submit.periodic'), name: 'periodic', class: 'btn'
-    = link_to t('ui.or_cancel'), :back
+= form.hidden_field :current_user_id
+= form.input :name
+= form.input :description, as: :text, input_html: {rows: 10}
+= form.input :duration, :as => :select, :collection => 1..3
+- unless local_assigns[:periodic]
+  = form.input :user_list, :as => :string, :input_html => { 'data-pre' => form.object.users.map(&:token_attributes).to_json }
+= form.input :required_users
+= form.association :workgroup
+= form.input :due_date, as: :date_picker
+- unless local_assigns[:periodic]
+  = form.input :done

app/views/tasks/_form_sidebar.html.haml

@@ -0,0 +1,15 @@
+- content_for :javascript do
+  :javascript
+    $(function() {
+      $("#task_user_list").tokenInput("#{users_path(:format => :json)}", {
+        crossDomain: false,
+        prePopulate: $("#task_user_list").data("pre"),
+        hintText: '#{escape_javascript(t('.search.hint'))}',
+        noResultText: '#{escape_javascript(t('.search.noresult'))}',
+        searchingText: '#{escape_javascript(t('.search.placeholder'))}',
+        theme: 'facebook'
+      });
+    });
+
+- content_for :sidebar do
+  = render "shared/workgroup_members"

app/views/tasks/edit.haml

@@ -1,3 +1,15 @@
-- title t('.title')
+- title @periodic ? t('.title_periodic') : t('.title')
 
-= render 'form'
+- if @task.periodic? && !@periodic
+  .alert.alert-info= raw t('tasks.edit.warning_periodic')
+
+= render 'form_sidebar'
+
+= simple_form_for @task do |form|
+  = render 'form', form: form, periodic: @periodic
+  .form-actions
+    - if @periodic
+      = form.submit t('.submit_periodic'), name: 'periodic', class: 'btn btn-primary'
+    - else
+      = form.submit class: 'btn btn-primary'
+    = link_to t('ui.or_cancel'), :back

app/views/tasks/new.haml

@@ -1,3 +1,10 @@
 - title t('.title')
 
-= render 'form'
+= render 'form_sidebar'
+
+= simple_form_for @task do |form|
+  = render 'form', form: form, periodic: nil
+  .form-actions
+    = form.submit class: 'btn btn-primary'
+    = form.submit t('.submit_periodic'), name: 'periodic', class: 'btn'
+    = link_to t('ui.or_cancel'), :back

app/views/tasks/show.haml

@@ -10,7 +10,7 @@
       %dd= simple_format(@task.description)
     - if @task.due_date.present?
       %dt= heading_helper Task, :due_date
-      %dd 
+      %dd
         = format_date(@task.due_date)
         - if @task.periodic?
           %i.icon-repeat{title: t('tasks.repeated')}
@@ -30,8 +30,14 @@
   - unless @task.done?
     = link_to t('.mark_done'), set_done_task_path(@task), method: :post, class: 'btn'
   = link_to t('ui.edit'), edit_task_path(@task), class: 'btn'
-  = link_to t('ui.delete'), task_path(@task), :method => :delete, :data => {:confirm => t('.confirm_delete_single')},
-    class: 'btn btn-danger'
   - if @task.periodic?
-    = link_to t('.delete_group'), task_path(@task, periodic: true), method: :delete, 
-      :data => {confirm: t('.confirm_delete_group')}, class: 'btn btn-danger'
+    = link_to edit_task_path(@task, periodic: true), class: 'btn' do
+      %i.icon.icon-repeat
+      = t('.edit_group')
+  = link_to t('ui.delete'), task_path(@task), method: :delete, class: 'btn btn-danger',
+            data: {confirm: @task.periodic? ? t('.confirm_delete_single_from_group') : t('.confirm_delete_single')}
+  - if @task.periodic?
+    = link_to task_path(@task, periodic: true), method: :delete, class: 'btn btn-danger',
+              data: {confirm: t('.confirm_delete_group')} do
+      %i.icon.icon-repeat
+      = t('.delete_group')