hyung-hwan/codepot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed the project anchor for code commit in the log view

Browse Source
This commit is contained in:
hyung-hwan 2010-03-03 13:30:34 +00:00
parent 2d57f9e77e
commit 50d8cecdae
5 changed files with 32 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
codepot/src/codepot/language/english/common_lang.php
View File

@ -55,10 +55,10 @@ $lang['Wiki'] = 'Wiki';
$lang['Wikis'] = 'Wikis'; $lang['Wikis'] = 'Wikis';
$lang['MSG_LOG_COMMIT_BY'] = 'committed by %s'; $lang['MSG_LOG_COMMIT_BY'] = 'Committed by %s';
$lang['MSG_LOG_CREATE_BY'] = 'created by %s'; $lang['MSG_LOG_CREATE_BY'] = 'Created by %s';
$lang['MSG_LOG_DELETE_BY'] = 'deleted by %s'; $lang['MSG_LOG_DELETE_BY'] = 'Deleted by %s';
$lang['MSG_LOG_UPDATE_BY'] = 'updated by %s'; $lang['MSG_LOG_UPDATE_BY'] = 'Updated by %s';
$lang['MSG_NO_DIFF'] = 'No difference found'; $lang['MSG_NO_DIFF'] = 'No difference found';
$lang['MSG_NO_FILES_AVAIL'] = 'No files available'; $lang['MSG_NO_FILES_AVAIL'] = 'No files available';

14
codepot/src/codepot/views/project_home.php
View File

@ -84,7 +84,7 @@ $this->load->view (
<div class="box"> <div class="box">
<div class="boxtitle"> <div class="boxtitle">
<?= anchor ("source/history/{$project->id}", $this->lang->line('Change log')) ?> <?= $this->lang->line('Change log') ?>
</div> </div>
<table id="project_home_mainarea_sidebar_log_table"> <table id="project_home_mainarea_sidebar_log_table">
<?php <?php
@ -96,10 +96,10 @@ $this->load->view (
$x = $log['message']; $x = $log['message'];
print '<tr class="odd">'; print '<tr class="odd">';
print '<td>'; print '<td class="date">';
print substr($x['time'], 5, 5); print substr($x['time'], 5, 5);
print '</td>'; print '</td>';
print '<td>'; print '<td class="object">';
print anchor ( print anchor (
"/source/revision/{$x['repo']}/{$xdot}/{$x['rev']}", "/source/revision/{$x['repo']}/{$xdot}/{$x['rev']}",
"r{$x['rev']}"); "r{$x['rev']}");
@ -110,7 +110,7 @@ $this->load->view (
print '<tr class="even">'; print '<tr class="even">';
print '<td></td>'; print '<td></td>';
print '<td colspan=1>'; print '<td colspan=1 class="details">';
print '<span class="description">'; print '<span class="description">';
$fmt = $this->lang->line ( $fmt = $this->lang->line (
'MSG_LOG_'.strtoupper($log['action']).'_BY'); 'MSG_LOG_'.strtoupper($log['action']).'_BY');
@ -127,11 +127,11 @@ $this->load->view (
else else
{ {
print '<tr class="odd">'; print '<tr class="odd">';
print '<td>'; print '<td class="date">';
print date ('m-d', strtotime($log['createdon'])); print date ('m-d', strtotime($log['createdon']));
print '</td>'; print '</td>';
print '<td>'; print '<td class="object">';
$uri = ''; $uri = '';
if ($log['type'] == 'project') if ($log['type'] == 'project')
{ {
@ -155,7 +155,7 @@ $this->load->view (
print '<tr class="even">'; print '<tr class="even">';
print '<td></td>'; print '<td></td>';
print '<td colspan=1>'; print '<td colspan=1 class="details">';
print '<span class="description">'; print '<span class="description">';
$fmt = $this->lang->line ( $fmt = $this->lang->line (
'MSG_LOG_'.strtoupper($log['action']).'_BY'); 'MSG_LOG_'.strtoupper($log['action']).'_BY');

21
codepot/src/codepot/views/user_home.php
View File

@ -23,7 +23,7 @@ function render_wiki()
<title><?=htmlspecialchars($caption)?></title> <title><?=htmlspecialchars($caption)?></title>
</head> </head>
<body onLoad="render_wiki()"> <body onLoad="render_wiki()">
<div class="content" id="user_home_content"> <div class="content" id="user_home_content">
@ -93,15 +93,18 @@ foreach ($latest_projects as $project)
$x = $log['message']; $x = $log['message'];
print '<tr class="odd">'; print '<tr class="odd">';
print '<td>'; print '<td class="date">';
print substr($x['time'], 5, 5); print substr($x['time'], 5, 5);
print '</td>'; print '</td>';
print '<td>'; print '<td class="projectid">';
/*
print anchor ( print anchor (
"/source/file/{$x['repo']}/{$xdot}/{$x['rev']}", "/source/file/{$x['repo']}/{$xdot}/{$x['rev']}",
$x['repo']); $x['repo']);
*/
print anchor ("/project/home/{$x['repo']}", $x['repo']);
print '</td>'; print '</td>';
print '<td>'; print '<td class="object">';
print anchor ( print anchor (
"/source/revision/{$x['repo']}/{$xdot}/{$x['rev']}", "/source/revision/{$x['repo']}/{$xdot}/{$x['rev']}",
"r{$x['rev']}"); "r{$x['rev']}");
@ -112,7 +115,7 @@ foreach ($latest_projects as $project)
print '<tr class="even">'; print '<tr class="even">';
print '<td></td>'; print '<td></td>';
print '<td colspan=2>'; print '<td colspan=2 class="details">';
print '<span class="description">'; print '<span class="description">';
$fmt = $this->lang->line ( $fmt = $this->lang->line (
'MSG_LOG_'.strtoupper($log['action']).'_BY'); 'MSG_LOG_'.strtoupper($log['action']).'_BY');
@ -129,15 +132,15 @@ foreach ($latest_projects as $project)
else else
{ {
print '<tr class="odd">'; print '<tr class="odd">';
print '<td>'; print '<td class="date">';
print date ('m-d', strtotime($log['createdon'])); print date ('m-d', strtotime($log['createdon']));
print '</td>'; print '</td>';
print '<td>'; print '<td class="project">';
print anchor ("/project/home/{$log['projectid']}", $log['projectid']); print anchor ("/project/home/{$log['projectid']}", $log['projectid']);
print '</td>'; print '</td>';
print '<td>'; print '<td class="object">';
$uri = ''; $uri = '';
if ($log['type'] == 'project') if ($log['type'] == 'project')
{ {
@ -161,7 +164,7 @@ foreach ($latest_projects as $project)
print '<tr class="even">'; print '<tr class="even">';
print '<td></td>'; print '<td></td>';
print '<td colspan=2>'; print '<td colspan=2 class="details">';
print '<span class="description">'; print '<span class="description">';
$fmt = $this->lang->line ( $fmt = $this->lang->line (
'MSG_LOG_'.strtoupper($log['action']).'_BY'); 'MSG_LOG_'.strtoupper($log['action']).'_BY');

13
codepot/src/codepot/views/user_sitelog.php
View File

@ -82,18 +82,7 @@ $this->load->view (
print '<td class="time">' . $time . '</td>'; print '<td class="time">' . $time . '</td>';
print '<td class="projectid">'; print '<td class="projectid">';
if ($log['type'] == 'code' && $log['action'] == 'commit') print anchor ("/project/home/{$log['projectid']}", $log['projectid']);
{
print anchor (
"/source/file/{$code['repo']}/{$xdot}/{$code['rev']}",
$log['projectid']);
}
else
{
print anchor (
"/project/home/{$log['projectid']}",
$log['projectid']);
}
print '</td>'; print '</td>';

10
codepot/src/css/project.css
View File

@ -18,10 +18,13 @@
} }
#user_home_mainarea_sidebar_log_table tr.odd td { #user_home_mainarea_sidebar_log_table tr.odd td {
width: 1px;
white-space: nowrap; white-space: nowrap;
} }
#user_home_mainarea_sidebar_log_table tr.odd td.date {
width: 1px;
}
#user_home_mainarea_sidebar_log_table tr.even { #user_home_mainarea_sidebar_log_table tr.even {
background-color: inherit; background-color: inherit;
} }
@ -104,10 +107,13 @@
} }
#project_home_mainarea_sidebar_log_table tr.odd td { #project_home_mainarea_sidebar_log_table tr.odd td {
width: 1px;
white-space: nowrap; white-space: nowrap;
} }
#project_home_mainarea_sidebar_log_table tr.odd td.date {
width: 1px;
}
#project_home_mainarea_sidebar_log_table tr.even { #project_home_mainarea_sidebar_log_table tr.even {
background-color: inherit; background-color: inherit;
/*font-size: 0.9em;*/ /*font-size: 0.9em;*/