From 50d8cecdaeffe7c3d4f6aa3c370401b506efccc9 Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Wed, 3 Mar 2010 13:30:34 +0000 Subject: [PATCH] changed the project anchor for code commit in the log view --- .../codepot/language/english/common_lang.php | 8 +++---- codepot/src/codepot/views/project_home.php | 14 ++++++------- codepot/src/codepot/views/user_home.php | 21 +++++++++++-------- codepot/src/codepot/views/user_sitelog.php | 13 +----------- codepot/src/css/project.css | 10 +++++++-- 5 files changed, 32 insertions(+), 34 deletions(-) diff --git a/codepot/src/codepot/language/english/common_lang.php b/codepot/src/codepot/language/english/common_lang.php index 99125380..56cf9eb9 100644 --- a/codepot/src/codepot/language/english/common_lang.php +++ b/codepot/src/codepot/language/english/common_lang.php @@ -55,10 +55,10 @@ $lang['Wiki'] = 'Wiki'; $lang['Wikis'] = 'Wikis'; -$lang['MSG_LOG_COMMIT_BY'] = 'committed by %s'; -$lang['MSG_LOG_CREATE_BY'] = 'created by %s'; -$lang['MSG_LOG_DELETE_BY'] = 'deleted by %s'; -$lang['MSG_LOG_UPDATE_BY'] = 'updated by %s'; +$lang['MSG_LOG_COMMIT_BY'] = 'Committed by %s'; +$lang['MSG_LOG_CREATE_BY'] = 'Created by %s'; +$lang['MSG_LOG_DELETE_BY'] = 'Deleted by %s'; +$lang['MSG_LOG_UPDATE_BY'] = 'Updated by %s'; $lang['MSG_NO_DIFF'] = 'No difference found'; $lang['MSG_NO_FILES_AVAIL'] = 'No files available'; diff --git a/codepot/src/codepot/views/project_home.php b/codepot/src/codepot/views/project_home.php index ef8d5c3b..9080919d 100644 --- a/codepot/src/codepot/views/project_home.php +++ b/codepot/src/codepot/views/project_home.php @@ -84,7 +84,7 @@ $this->load->view (
-id}", $this->lang->line('Change log')) ?> +lang->line('Change log') ?>
load->view ( $x = $log['message']; print ''; - print ''; - print ''; print ''; - print ''; - print ''; - print ''; print ''; - print ''; - print ''; - print ''; - print ''; print ''; - print ''; - print ''; - print ''; - print ''; print ''; - print ''; print ''; diff --git a/codepot/src/css/project.css b/codepot/src/css/project.css index fb8d5324..83eb62d5 100644 --- a/codepot/src/css/project.css +++ b/codepot/src/css/project.css @@ -18,10 +18,13 @@ } #user_home_mainarea_sidebar_log_table tr.odd td { - width: 1px; white-space: nowrap; } +#user_home_mainarea_sidebar_log_table tr.odd td.date { + width: 1px; +} + #user_home_mainarea_sidebar_log_table tr.even { background-color: inherit; } @@ -104,10 +107,13 @@ } #project_home_mainarea_sidebar_log_table tr.odd td { - width: 1px; white-space: nowrap; } +#project_home_mainarea_sidebar_log_table tr.odd td.date { + width: 1px; +} + #project_home_mainarea_sidebar_log_table tr.even { background-color: inherit; /*font-size: 0.9em;*/
'; + print ''; print substr($x['time'], 5, 5); print ''; + print ''; print anchor ( "/source/revision/{$x['repo']}/{$xdot}/{$x['rev']}", "r{$x['rev']}"); @@ -110,7 +110,7 @@ $this->load->view ( print '
'; + print ''; print ''; $fmt = $this->lang->line ( 'MSG_LOG_'.strtoupper($log['action']).'_BY'); @@ -127,11 +127,11 @@ $this->load->view ( else { print '
'; + print ''; print date ('m-d', strtotime($log['createdon'])); print ''; + print ''; $uri = ''; if ($log['type'] == 'project') { @@ -155,7 +155,7 @@ $this->load->view ( print '
'; + print ''; print ''; $fmt = $this->lang->line ( 'MSG_LOG_'.strtoupper($log['action']).'_BY'); diff --git a/codepot/src/codepot/views/user_home.php b/codepot/src/codepot/views/user_home.php index 6ba87697..84bb63f5 100644 --- a/codepot/src/codepot/views/user_home.php +++ b/codepot/src/codepot/views/user_home.php @@ -23,7 +23,7 @@ function render_wiki() <?=htmlspecialchars($caption)?> - +
@@ -93,15 +93,18 @@ foreach ($latest_projects as $project) $x = $log['message']; print '
'; + print ''; print substr($x['time'], 5, 5); print ''; + print ''; + /* print anchor ( "/source/file/{$x['repo']}/{$xdot}/{$x['rev']}", $x['repo']); + */ + print anchor ("/project/home/{$x['repo']}", $x['repo']); print ''; + print ''; print anchor ( "/source/revision/{$x['repo']}/{$xdot}/{$x['rev']}", "r{$x['rev']}"); @@ -112,7 +115,7 @@ foreach ($latest_projects as $project) print '
'; + print ''; print ''; $fmt = $this->lang->line ( 'MSG_LOG_'.strtoupper($log['action']).'_BY'); @@ -129,15 +132,15 @@ foreach ($latest_projects as $project) else { print '
'; + print ''; print date ('m-d', strtotime($log['createdon'])); print ''; + print ''; print anchor ("/project/home/{$log['projectid']}", $log['projectid']); print ''; + print ''; $uri = ''; if ($log['type'] == 'project') { @@ -161,7 +164,7 @@ foreach ($latest_projects as $project) print '
'; + print ''; print ''; $fmt = $this->lang->line ( 'MSG_LOG_'.strtoupper($log['action']).'_BY'); diff --git a/codepot/src/codepot/views/user_sitelog.php b/codepot/src/codepot/views/user_sitelog.php index fabf693d..4894c00f 100644 --- a/codepot/src/codepot/views/user_sitelog.php +++ b/codepot/src/codepot/views/user_sitelog.php @@ -82,18 +82,7 @@ $this->load->view ( print '' . $time . ''; - if ($log['type'] == 'code' && $log['action'] == 'commit') - { - print anchor ( - "/source/file/{$code['repo']}/{$xdot}/{$code['rev']}", - $log['projectid']); - } - else - { - print anchor ( - "/project/home/{$log['projectid']}", - $log['projectid']); - } + print anchor ("/project/home/{$log['projectid']}", $log['projectid']); print '