# HG changeset patch # User olivier # Date 1403789799 -7200 # Thu Jun 26 15:36:39 2014 +0200 # Node ID 806d56059988502d99939f81b2a883cd4cfd7661 # Parent 5c1d1b5e9b5f3f86c4ef5e3df2ae658d9f9e3409 Added legend diff -r 5c1d1b5e9b5f -r 806d56059988 app/views/work_time/show.html.erb --- a/app/views/work_time/show.html.erb Thu Jun 12 09:40:53 2014 +0200 +++ b/app/views/work_time/show.html.erb Thu Jun 26 15:36:39 2014 +0200 @@ -107,6 +107,22 @@ <%if User.current.allowed_to?(:view_work_time_other_member, @project) then%> <%= render :partial=>'select_user', :locals=>{:link_params=>@link_params.merge(:anchor=>"memo")} %> <%end%> + <%#------------------------- Legend for the daily table%> +
+ + + + + + + + + + +
<%=l(:wt_legend)%>
<%=l(:wt_style_default)%><%=l(:wt_style_assigned)%><%=l(:wt_style_worked)%><%=l(:wt_style__assigned_worked)%><%=l(:wt_style_overdue)%> + <%=l(:wt_style_assigned_overdue)%> + <%=l(:wt_style_overdue_worked)%><%=l(:wt_style_assigned_overdue_worked)%>
+
<%end%> <%end%> diff -r 5c1d1b5e9b5f -r 806d56059988 config/locales/en.yml --- a/config/locales/en.yml Thu Jun 12 09:40:53 2014 +0200 +++ b/config/locales/en.yml Thu Jun 26 15:36:39 2014 +0200 @@ -35,3 +35,13 @@ permission_view_work_time_other_member: "View other members' work time" permission_edit_work_time_other_member: "Edit other members' work time " wt_saved_value: "Saved timed: " + wt_legend: "Legend" + wt_style_default: "By default" + wt_style_assigned: "Assigned" + wt_style_worked: "Worked on" + wt_style__assigned_worked: "Assigned and worked on" + wt_style_overdue: "Overdue" + wt_style_assigned_overdue: "Assigned and overdue" + wt_style_overdue_worked: "Overdue and worked on" + wt_style_assigned_overdue_worked: "Assigned, overdue and worked on" + \ No newline at end of file diff -r 5c1d1b5e9b5f -r 806d56059988 config/locales/fr.yml --- a/config/locales/fr.yml Thu Jun 12 09:40:53 2014 +0200 +++ b/config/locales/fr.yml Thu Jun 26 15:36:39 2014 +0200 @@ -35,3 +35,13 @@ permission_view_work_time_other_member: "Afficher les temps des autres membres" permission_edit_work_time_other_member: "Modifier les temps des autres membres" wt_saved_value: "Temps sauvegardé : " + wt_legend: "Légende" + wt_style_default: "Par défaut" + wt_style_assigned: "Affecté" + wt_style_worked: "Travail en cours" + wt_style__assigned_worked: "Affecté et travail en cours" + wt_style_overdue: "En retard" + wt_style_assigned_overdue: "Affecté et en retard" + wt_style_overdue_worked: "En retard et travail en cours" + wt_style_assigned_overdue_worked: "Affecté, en retard et travail en cours" +