5d1ee52de72c65d05ca4858e19fabce2064b2f29

Author: gwoo

Date: 2009-06-06 14:41:31 -0700

updating commit view in timeline

diff --git a/views/elements/timeline/commit.ctp b/views/elements/timeline/commit.ctp index c583905..0640ff6 100644 --- a/views/elements/timeline/commit.ctp +++ b/views/elements/timeline/commit.ctp @@ -29,11 +29,17 @@ echo $chaw->commit($data['Commit']['revision'], $data['Project']); } else { echo $chaw->commit($data['Commit']['revision'], $data['Project']) . "\n"; + $username = (!empty($data['User']['username'])) + ? $data['User']['username'] + : $data['Commit']['author']; + echo " " . __('by', true) . " " . + $html->tag('span', $username, array('class' => 'username')) . "\n"; + echo $html->tag('strong', __("committed", true)); } if (!empty($data['Branch'])) { - echo " to " . $html->link( + echo " " . __('to', true) . " " . $html->link( $data['Branch']['name'], $chaw->url($data['Project'], array( 'controller' => 'source', 'action' => 'branches', @@ -42,7 +48,7 @@ ); } else if (!empty($data['Commit']['branch'])) { $branch = array_pop(explode("/", $data['Commit']['branch'])); - echo " to " . $html->link( + echo " " . __('to', true) . " " . $html->link( $branch, $chaw->url($data['Project'], array( 'controller' => 'source', 'action' => 'branches',