Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

hy delaitre, issue #42 done #44

Merged
merged 3 commits into from

2 participants

@otaviofcs

hope it's ok. I also update locale files for pt.

regards

Otávio de Fr... added some commits
Otávio de Freitas e Castro Sampaio placing pause status at time_tracker index action. Issue #42 915bf6b
Otávio de Freitas e Castro Sampaio updating translations for en and pt. 9fad792
Otávio de Freitas e Castro Sampaio fixing css and index. Issue #42 85ac968
@fernandokosh fernandokosh merged commit 64f05b9 into fernandokosh:master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Feb 10, 2011
  1. placing pause status at time_tracker index action. Issue #42

    Otávio de Freitas e Castro Sampaio authored
  2. updating translations for en and pt.

    Otávio de Freitas e Castro Sampaio authored
  3. fixing css and index. Issue #42

    Otávio de Freitas e Castro Sampaio authored
This page is out of date. Refresh to see the latest.
View
4 app/views/time_trackers/index.rhtml
@@ -14,6 +14,7 @@
<th class="issue"><%= l(:label_issue) %></th>
<th class="start-date"><%= l(:time_tracker_label_start_date) %></th>
<th class="spent-time"><%= l(:label_spent_time) %></th>
+ <th class="suspended-status"><%= l(:time_tracker_label_suspended_status) %></th>
<th class="buttons"><%= l(:time_tracker_label_action) %></th>
</tr>
</thead>
@@ -30,6 +31,7 @@
<td class="issue"><%= link_to_issue issue_from_id(time_tracker[:issue_id]), :project => true %></td>
<td class="start-date"><%= format_time(time_tracker[:started_on]) %></td>
<td class="spent-time"><%= time_tracker.time_spent_to_s %></td>
+ <td class="suspended_status"><%= time_tracker.paused? %></td>
<td class="buttons">
<%= link_to_remote l(:time_tracker_label_delete),
:url => { :controller => 'time_trackers', :action => 'delete', :id => time_tracker.id },
@@ -61,6 +63,7 @@
<th class="issue"><%= l(:label_issue) %></th>
<th class="start-date"><%= l(:time_tracker_label_start_date) %></th>
<th class="spent-time"><%= l(:label_spent_time) %></th>
+ <th class="suspended-status"><%= l(:time_tracker_label_suspended_status) %></th>
<th class="buttons"><%= l(:time_tracker_label_action) %></th>
</tr>
</thead>
@@ -78,6 +81,7 @@
<td class="issue"><%= link_to_issue issue_from_id(time_tracker[:issue_id]), :project => true %></td>
<td class="start-date"><%= format_time(time_tracker[:started_on]) %></td>
<td class="spent-time"><%= time_tracker.time_spent_to_s %></td>
+ <td class="suspended-status"><%= time_tracker.paused? %></td>
<td class="buttons">
<% if User.current.allowed_to?(:delete_others_time_trackers, nil, :global => true) %>
<%= link_to_remote l(:time_tracker_label_delete),
View
1  assets/stylesheets/time_tracker.css
@@ -25,6 +25,7 @@
#time-tracker-admin td.start-date,
#time-tracker-admin td.spent-time,
+#time-tracker-admin td.suspended-status,
#time-tracker-admin td.msg {
text-align: center;
}
View
1  config/locales/en.yml
@@ -20,6 +20,7 @@ en:
time_tracker_label_action: "Action"
time_tracker_label_delete: "Delete"
time_tracker_label_start_date: "Start date"
+ time_tracker_label_suspended_status: "Suspended?"
time_tracker_label_transition_journal: "Status transition applied automatically due to the start of a time tracker."
time_tracker_label_your_time_trackers: "Your time tracker"
time_tracker_label_other_time_trackers: "Other user's time trackers"
View
5 config/locales/pt.yml
@@ -5,13 +5,18 @@ pt:
time_tracker_not_running: "Não está em execução"
start_time_tracker_error: "Falha ao iniciar o time tracker"
time_tracker_already_running_error: "Um time tracker já está em execução"
+ no_time_tracker: "Nenhum time tracker"
no_time_tracker_running: "Nenhum time tracker em execução"
+ no_time_tracker_suspended: "Nenhum time tracker pausado"
+ suspend_time_tracker: "pausado"
+ suspend_time_tracker_error: "Falha ao suspender o time tracker"
time_tracker_hour_sym: ":"
time_tracker_refresh_rate: "Taxa de actualização"
time_tracker_seconds: "segundos"
time_tracker_admin_menu: "Time trackers"
time_tracker_admin_title: "Time trackers"
time_tracker_label_start_date: "Data inicial"
+ time_tracker_label_suspended_status: "Pausado?"
time_tracker_label_action: "Acção"
time_tracker_label_delete: "Eliminar"
time_tracker_delete_success: "Time tracker eliminado com sucesso"
Something went wrong with that request. Please try again.