Project

General

Profile

Proposal #1335 » 306-legend.patch

Olivier Houdas, 06/26/2014 10:40 PM

View differences:

app/views/work_time/show.html.erb Thu Jun 12 09:40:53 2014 +0200 → app/views/work_time/show.html.erb Thu Jun 26 15:36:39 2014 +0200
107 107
  <%if User.current.allowed_to?(:view_work_time_other_member, @project) then%>
108 108
    <%= render :partial=>'select_user', :locals=>{:link_params=>@link_params.merge(:anchor=>"memo")} %>
109 109
  <%end%>
110
  <%#------------------------- Legend for the daily table%>
111
  <div align='center'>
112
  <table>
113
    <tr><td colspan='8' align='center'><B><%=l(:wt_legend)%></B></td></tr>
114
    <tr>
115
      <td class='wt_iss_default' width='100px' align='center'><%=l(:wt_style_default)%></td>
116
      <td class='wt_iss_assigned' width='100px' align='center'><%=l(:wt_style_assigned)%></td>
117
      <td class='wt_iss_worked' width='100px' align='center'><%=l(:wt_style_worked)%></td>
118
      <td class='wt_iss_assigned_worked' width='100px' align='center'><%=l(:wt_style__assigned_worked)%></td>
119
      <td class='wt_iss_overdue' width='100px' align='center'><%=l(:wt_style_overdue)%>
120
      <td class='wt_iss_assigned_overdue' width='100px' align='center'><%=l(:wt_style_assigned_overdue)%>
121
      </td><td class='wt_iss_overdue_worked' width='100px' align='center'><%=l(:wt_style_overdue_worked)%></td>
122
      <td class='wt_iss_assigned_overdue_worked' width='100px' align='center'><%=l(:wt_style_assigned_overdue_worked)%></td>
123
    </tr>
124
  </table>
125
  </div>
110 126
<%end%>
111 127
<%end%>
112 128

  
config/locales/en.yml Thu Jun 12 09:40:53 2014 +0200 → config/locales/en.yml Thu Jun 26 15:36:39 2014 +0200
35 35
  permission_view_work_time_other_member: "View other members' work time"
36 36
  permission_edit_work_time_other_member: "Edit other members' work time "
37 37
  wt_saved_value: "Saved timed: "
38
  wt_legend: "Legend"
39
  wt_style_default: "By default"
40
  wt_style_assigned: "Assigned"
41
  wt_style_worked: "Worked on"
42
  wt_style__assigned_worked: "Assigned and worked on"
43
  wt_style_overdue: "Overdue"
44
  wt_style_assigned_overdue: "Assigned and overdue"
45
  wt_style_overdue_worked: "Overdue and worked on"
46
  wt_style_assigned_overdue_worked: "Assigned, overdue and worked on"
47
  
config/locales/fr.yml Thu Jun 12 09:40:53 2014 +0200 → config/locales/fr.yml Thu Jun 26 15:36:39 2014 +0200
35 35
  permission_view_work_time_other_member: "Afficher les temps des autres membres"
36 36
  permission_edit_work_time_other_member: "Modifier les temps des autres membres"
37 37
  wt_saved_value: "Temps sauvegardé : "
38
  wt_legend: "Légende"
39
  wt_style_default: "Par défaut"
40
  wt_style_assigned: "Affecté"
41
  wt_style_worked: "Travail en cours"
42
  wt_style__assigned_worked: "Affecté et travail en cours"
43
  wt_style_overdue: "En retard"
44
  wt_style_assigned_overdue: "Affecté et en retard"
45
  wt_style_overdue_worked: "En retard et travail en cours"
46
  wt_style_assigned_overdue_worked: "Affecté, en retard et travail en cours"
47

  
(1-1/2)