Fixed broken links in tasks-module. Translated some views into german.
This commit is contained in:
parent
85eb27079f
commit
96442477d1
24 changed files with 141 additions and 274 deletions
|
|
@ -1,4 +1,4 @@
|
|||
- @task.assignments.each do |ass|
|
||||
= ass.user.nick
|
||||
%small= link_to _('Remove'), {:action => "drop_assignment", :id => ass}, :confirm => 'Bist du sicher?', :method => "post"
|
||||
%small= link_to icon(:delete), {:action => "drop_assignment", :id => ass}, :confirm => 'Bist du sicher?', :method => "post"
|
||||
%br/
|
||||
|
|
@ -1,37 +1,30 @@
|
|||
= error_messages_for "task"
|
||||
= form.error_messages
|
||||
%p
|
||||
%label{:for => "task_name"}
|
||||
%b=_ 'Subject'
|
||||
%b= form.label :name
|
||||
%br/
|
||||
= text_field :task, :name
|
||||
= form.text_field :name
|
||||
%p
|
||||
%label{:for => "task_description"}
|
||||
%b=_ 'Description'
|
||||
%b= form.label :description
|
||||
%br/
|
||||
= text_area :task, :description, :cols => 50, :rows => 10
|
||||
= form.text_area :description, :cols => 50, :rows => 10
|
||||
%p
|
||||
%label{:for => "task_user"}
|
||||
%b=_ 'Responsible people'
|
||||
%b= form.label :user
|
||||
%small=_ 'tasks can have multiple assignments'
|
||||
/%br/
|
||||
/= render :partial => "assignments"
|
||||
%p
|
||||
%small=_ 'use commas to seperate the names'
|
||||
%br/
|
||||
/= text_field_with_auto_complete :user, :nick, {}, {:tokens => ","}
|
||||
= text_field_with_auto_complete :task, :user_list, {}, {:tokens => ","}
|
||||
%p
|
||||
%label{:for => "task_required_users"}
|
||||
%b= _("How many users are altogether required?")
|
||||
%b= form.label :required_users, "How many users are altogether required?"
|
||||
%br/
|
||||
= text_field :task, :required_users, :size => 3
|
||||
= form.text_field :required_users, :size => 3
|
||||
%p
|
||||
%label{:for => "task_group"}
|
||||
%b=_ 'Group'
|
||||
%b= form.label :workgroup
|
||||
%br/
|
||||
= select(:task, :group_id, Group.find(:all, :conditions => "type != 'Ordergroup'", :order => 'name').collect {|g| [ g.name, g.id ] }, { :include_blank => true })
|
||||
= form.select :workgroup_id, Workgroup.all(:order => 'name').collect {|g| [ g.name, g.id ] }, { :include_blank => true }
|
||||
%p
|
||||
%label{:for => "task_due_date"}
|
||||
%b=_ 'Due date'
|
||||
%b= form.label :due_date
|
||||
%br/
|
||||
= date_select :task, :due_date, :start_year => 2007, :include_blank => true
|
||||
= form.date_select :due_date, :start_year => 2007, :include_blank => true
|
||||
|
|
@ -1,12 +1,13 @@
|
|||
%table
|
||||
%tr
|
||||
%th= _('Due date')
|
||||
%th= _('Subject')
|
||||
%th Fälligkeit
|
||||
%th Betreff
|
||||
%th{:colspan => '2'}
|
||||
= _('Who will make it?')
|
||||
%small= "(" + _("How many are still required?") + ")"
|
||||
Wer machts?
|
||||
%small (Wie viele werden noch benötigt?)
|
||||
- for task in @tasks
|
||||
%tr{:class => cycle('even','odd', :name => "tasks") + (task.done ? " done" : "") }
|
||||
- done = task.done ? " done" : ""
|
||||
%tr{:class => cycle('even','odd', :name => "tasks") + done }
|
||||
%td= format_date(task.due_date) unless task.due_date.nil?
|
||||
%td= link_to task.name, :controller => "tasks", :action => "show", :id => task
|
||||
%td
|
||||
|
|
@ -22,11 +23,11 @@
|
|||
= highlighted_required_users task
|
||||
%td
|
||||
- unless task.is_accepted?(@current_user)
|
||||
%span{:style => "float:left"}= button_to _('Accept task'), :controller => "tasks", :action => "accept", :id => task
|
||||
= button_to _("Reject task"), :controller => "tasks", :action => "reject", :id => task if task.is_assigned?(@current_user)
|
||||
%span{:style => "float:left"}= button_to "Aufgabe übernehmen", :controller => "tasks", :action => "accept", :id => task
|
||||
= button_to "Aufgabe ablehnen", :controller => "tasks", :action => "reject", :id => task if task.is_assigned?(@current_user)
|
||||
- else
|
||||
- form_for :task, :url => {:action => "update_status", :id => task} do |f|
|
||||
= _("Done") + "?"
|
||||
= f.check_box :done, {:onchange => "submit()"}
|
||||
= _("Done") if task.done
|
||||
Erledigt?
|
||||
= f.check_box :done, {:onchange => "submit()", :title => "Die Aufgabe wandert in das Archiv"}
|
||||
= "Erledigt" if task.done
|
||||
- reset_cycle("tasks")
|
||||
|
|
@ -1,19 +1,19 @@
|
|||
#start_nav{:style => "float:right"}
|
||||
%h2=_ 'TaskMenu'
|
||||
%h2 Aufgabenmenü
|
||||
%ul
|
||||
%li
|
||||
=_ 'Actions'
|
||||
Aktionen
|
||||
%ul
|
||||
%li= link_to _('New task'), :action => "new"
|
||||
%li= link_to "Neue Aufgabe erstellen", :action => "new"
|
||||
%li
|
||||
=_ 'Pages'
|
||||
Seiten
|
||||
%ul
|
||||
%li= link_to _('My tasks'), :action => "myTasks"
|
||||
%li= link_to _('All tasks'), :action => "index"
|
||||
%li= link_to _('Tasks done'), :action => "archive"
|
||||
%li= link_to "Meine Aufgaben", my_tasks_path
|
||||
%li= link_to "Alle Aufgaben", :action => "index"
|
||||
%li= link_to "Erledigt Aufgaben (Archiv)", :action => "archive"
|
||||
|
||||
%li
|
||||
=_ 'Group tasks'
|
||||
Gruppenaufgaben
|
||||
%ul
|
||||
- for group in Group.find :all, :conditions => "type != 'Ordergroup'"
|
||||
- for group in Workgroup.all
|
||||
%li= link_to group.name, :action => "workgroup", :id => group
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
- title _('Task archive')
|
||||
- title "Aufgabenarchiv"
|
||||
= render :partial => "nav"
|
||||
|
||||
%table{:style => "width: 76%"}
|
||||
%tr
|
||||
%th=_ 'Due date'
|
||||
%th=_ 'Subject'
|
||||
%th=_ 'Responsible people'
|
||||
%th Fälligkeitsdatum
|
||||
%th Betreff
|
||||
%th Verantwortliche Menschen
|
||||
%th
|
||||
- for task in @tasks
|
||||
%tr{:class => cycle('even','odd')}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
- title _('Edit task')
|
||||
- title "Aufgabe bearbeiten"
|
||||
|
||||
#form{:style => "float:left; width:39em"}
|
||||
- form_tag :action => 'update', :id => @task do
|
||||
= render :partial => 'form'
|
||||
= submit_tag _('Save changes')
|
||||
- form_for :task, @task, :url => {:action => 'update', :id => @task} do |form|
|
||||
= render :partial => 'form', :locals => {:form => form}
|
||||
= submit_tag "Speichern"
|
||||
|
|
||||
= link_to _('Cancel'), :action => "show", :id => @task
|
||||
= link_to "Abbrechen", :action => "show", :id => @task
|
||||
#workgroup_members{:style => "padding-left:41em"}
|
||||
%h3=_ 'Members of the workgroups'
|
||||
%h3 Mitglieder der Gruppe
|
||||
#list
|
||||
= render :partial => "shared/workgroup_members"
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
- title _('Arrange tasks')
|
||||
- title "Aufgabenübersicht"
|
||||
= render :partial => "nav"
|
||||
|
||||
- unless @non_group_tasks.empty?
|
||||
.left_column{:style => "width:75%"}
|
||||
- @tasks = @non_group_tasks
|
||||
.box_title
|
||||
%h2=_ 'Tasks for all'
|
||||
%h2 Aufgaben für alle!
|
||||
.column_content
|
||||
= render :partial => "list"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
- title _("My tasks")
|
||||
- title "Meine Aufgaben"
|
||||
= render :partial => "nav"
|
||||
|
||||
- @tasks = @unaccepted_tasks
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
- title _('Create new task')
|
||||
- title "Neue Aufgabe erstellen"
|
||||
|
||||
#form{:style => "float:left; width:39em"}
|
||||
- form_tag :action => 'create' do
|
||||
= render :partial => 'form'
|
||||
= submit_tag _('Create task')
|
||||
- form_for :task, @task, :url => {:action => 'create'} do |form|
|
||||
= render :partial => 'form', :locals => {:form => form}
|
||||
= submit_tag "Aufgabe erstellen"
|
||||
|
||||
#workgroup_members{:style => "padding-left:41em"}
|
||||
%h3=_ 'Members of the workgroups'
|
||||
%h3 Mitglieder der Gruppe
|
||||
#list
|
||||
= render :partial => "shared/workgroup_members"
|
||||
|
|
|
|||
|
|
@ -1,35 +1,35 @@
|
|||
- title _('Task in detail')
|
||||
- title "Aufgabe im Detail"
|
||||
= render :partial => "nav"
|
||||
|
||||
#task{:style => 'width:70%'}
|
||||
%table
|
||||
%tr
|
||||
%td{:style => "width: 10em"}= _'Name'
|
||||
%td{:style => "width: 10em"} Name
|
||||
%td
|
||||
%b= @task.name
|
||||
%tr
|
||||
%td{:style => "vertical-align:top;"}=_ 'Description'
|
||||
%td{:style => "vertical-align:top;"} Beschreibung
|
||||
%td= simple_format(@task.description)
|
||||
%tr
|
||||
%td=_ 'Due date'
|
||||
%td Fälligkeitsdatum
|
||||
%td= format_date(@task.due_date)
|
||||
%tr
|
||||
%td=_ 'Responsible people'
|
||||
%td Verantwortliche Menschen
|
||||
%td= render :partial => "assignments"
|
||||
%tr
|
||||
%td=_ 'Group'
|
||||
%td Arbeitsgruppe
|
||||
%td
|
||||
- if @task.workgroup
|
||||
= link_to @task.workgroup.name, :action => "workgroup", :id => @task.workgroup
|
||||
|
||||
%tr
|
||||
%td{:colspan => "2"}
|
||||
%div{:style => "float:left"}=_ 'Done'
|
||||
%div{:style => "float:left"} Als erledigt markieren
|
||||
- form_for :task, :url => {:action => "update_status", :id => @task} do |f|
|
||||
= f.check_box :done, {:onchange => "submit()"}
|
||||
= f.check_box :done, {:onchange => "submit()", :title => "Die Aufgabe wandert in das Archiv"}
|
||||
|
||||
|
||||
%p
|
||||
= link_to _('Edit'), :action => "edit", :id => @task
|
||||
= link_to "Bearbeiten", :action => "edit", :id => @task
|
||||
|
|
||||
= link_to _('Delete'), {:action => "destroy", :id => @task}, :method => "post", :confirm => _('Delete the task?')
|
||||
= link_to "Löschen", {:action => "destroy", :id => @task}, :method => "post", :confirm => "Die Aufgabe wirklich löschen?"
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
%h1
|
||||
= _('Arrange tasks for')
|
||||
Aufgaben verwalten für
|
||||
= @group.name
|
||||
= render :partial => "nav"
|
||||
|
||||
.left_column{:style => "width:45em"}
|
||||
.box_title
|
||||
%h2
|
||||
= _('Weekly tasks') + ':'
|
||||
Wöchentliche Aufgaben
|
||||
= @group.task_name
|
||||
.column_content
|
||||
- if @group.weekly_task
|
||||
|
|
@ -45,7 +45,8 @@
|
|||
%br/
|
||||
- else
|
||||
= _('No weekly tasks defined yet')
|
||||
= link_to _('Edit weekly tasks'), :controller => "index", :action => "editGroup", :id => @group
|
||||
- if @current_user.member_of?(@group) or @current_user.role_admin?
|
||||
= link_to _('Edit weekly tasks'), :controller => "foodcoop", :action => "edit_group", :id => @group
|
||||
|
||||
.left_column{:style => "width:75%"}
|
||||
.box_title
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue