added timestamp and author fields to codepot_file_list.

touched up some views to get rid of the infostrip class and use the title-band class.
added the database_store_gmt option which causes the database models classes to store date and time in GMT.
This commit is contained in:
hyung-hwan 2016-01-08 16:52:29 +00:00
parent 530e38ceb5
commit 070ccb3118
31 changed files with 489 additions and 243 deletions

View File

@ -187,6 +187,11 @@ CREATE TABLE file_list (
md5sum CHAR(32) NOT NULL, md5sum CHAR(32) NOT NULL,
description VARCHAR(255) NOT NULL, description VARCHAR(255) NOT NULL,
createdon DATETIME NOT NULL,
updatedon DATETIME NOT NULL,
createdby VARCHAR(32) NOT NULL,
updatedby VARCHAR(32) NOT NULL,
INDEX file_list_id (projectid, name), INDEX file_list_id (projectid, name),
UNIQUE KEY file_list_fileid (projectid, filename), UNIQUE KEY file_list_fileid (projectid, filename),
UNIQUE KEY (encname), UNIQUE KEY (encname),

View File

@ -170,6 +170,10 @@ CREATE TABLE "cpot_file_list" (
"encname" VARCHAR(255) NOT NULL, "encname" VARCHAR(255) NOT NULL,
"md5sum" CHAR(32) NOT NULL, "md5sum" CHAR(32) NOT NULL,
"description" CLOB NOT NULL, "description" CLOB NOT NULL,
"createdon" TIMESTAMP NOT NULL,
"updatedon" TIMESTAMP NOT NULL,
"createdby" VARCHAR(32) NOT NULL,
"updatedby" VARCHAR(32) NOT NULL,
UNIQUE ("projectid", "filename"), UNIQUE ("projectid", "filename"),
UNIQUE ("encname"), UNIQUE ("encname"),
CONSTRAINT file_list_projectid FOREIGN KEY ("projectid","name") REFERENCES "cpot_file"("projectid","name") CONSTRAINT file_list_projectid FOREIGN KEY ("projectid","name") REFERENCES "cpot_file"("projectid","name")

View File

@ -225,6 +225,11 @@ CREATE TABLE file_list (
md5sum CHAR(32) NOT NULL, md5sum CHAR(32) NOT NULL,
description VARCHAR(255) NOT NULL, description VARCHAR(255) NOT NULL,
createdon TIMESTAMP NOT NULL,
updatedon TIMESTAMP NOT NULL,
createdby VARCHAR(32) NOT NULL,
updatedby VARCHAR(32) NOT NULL,
UNIQUE (projectid, filename), UNIQUE (projectid, filename),
UNIQUE (encname), UNIQUE (encname),

View File

@ -28,6 +28,50 @@ if ( ! function_exists('codepot_merge_path'))
} }
} }
if ( ! function_exists('codepot_nowtodbdate'))
{
function codepot_nowtodbdate()
{
if (CODEPOT_DATABASE_STORE_GMT)
{
return gmstrftime('%Y-%m-%d %H:%M:%S');
}
else
{
return gmstrftime('%Y-%m-%d %H:%M:%S');
}
}
}
if ( ! function_exists('codepot_unixtimetodbdate'))
{
function codepot_unixtimetodbdate($unixtime)
{
if (CODEPOT_DATABASE_STORE_GMT)
{
return gmstrftime('%Y-%m-%d %H:%M:%S', $unixtime);
}
else
{
return gmstrftime('%Y-%m-%d %H:%M:%S', $unixtime);
}
}
}
if ( ! function_exists('codepot_dbdatetodispdate'))
{
function codepot_dbdatetodispdate($dbdate)
{
if (CODEPOT_DATABASE_STORE_GMT)
{
return strftime('%Y-%m-%d %H:%M:%S %z', strtotime($dbdate . ' +0000'));
}
else
{
return strftime('%Y-%m-%d %H:%M:%S %z', strtotime($dbdate));
}
}
}
if ( !function_exists ('codepot_json_encode')) if ( !function_exists ('codepot_json_encode'))
{ {

View File

@ -98,6 +98,7 @@ $lang['Site'] = 'Site';
$lang['Sites'] = 'Sites'; $lang['Sites'] = 'Sites';
$lang['Size'] = 'Size'; $lang['Size'] = 'Size';
$lang['Source'] = 'Source'; $lang['Source'] = 'Source';
$lang['State'] = 'State';
$lang['Status'] = 'Status'; $lang['Status'] = 'Status';
$lang['Summary'] = 'Summary'; $lang['Summary'] = 'Summary';
$lang['Success'] = 'Success'; $lang['Success'] = 'Success';

View File

@ -97,6 +97,7 @@ $lang['Site'] = 'Site';
$lang['Sites'] = 'Sites'; $lang['Sites'] = 'Sites';
$lang['Size'] = 'Ukuran'; $lang['Size'] = 'Ukuran';
$lang['Source'] = 'Sumber'; $lang['Source'] = 'Sumber';
$lang['State'] = 'State';
$lang['Status'] = 'Status'; $lang['Status'] = 'Status';
$lang['Success'] = 'Success'; $lang['Success'] = 'Success';
$lang['Summary'] = 'Rangkuman'; $lang['Summary'] = 'Rangkuman';

View File

@ -97,6 +97,7 @@ $lang['Sign out'] = '로그아웃';
$lang['Site'] = '사이트'; $lang['Site'] = '사이트';
$lang['Sites'] = '사이트'; $lang['Sites'] = '사이트';
$lang['Size'] = '크기'; $lang['Size'] = '크기';
$lang['State'] = '현황';
$lang['Status'] = '상태'; $lang['Status'] = '상태';
$lang['Source'] = '소스'; $lang['Source'] = '소스';
$lang['Success'] = '성공'; $lang['Success'] = '성공';

View File

@ -59,8 +59,8 @@ class CodeReviewModel extends Model
$this->db->set ('rev', $revision); $this->db->set ('rev', $revision);
$this->db->set ('sno', $newsno); $this->db->set ('sno', $newsno);
$this->db->set ('comment', $comment); $this->db->set ('comment', $comment);
$this->db->set ('createdon', date('Y-m-d H:i:s')); $this->db->set ('createdon', codepot_nowtodbdate());
$this->db->set ('updatedon', date('Y-m-d H:i:s')); $this->db->set ('updatedon', codepot_nowtodbdate());
$this->db->set ('createdby', $userid); $this->db->set ('createdby', $userid);
$this->db->set ('updatedby', $userid); $this->db->set ('updatedby', $userid);
$this->db->insert ('code_review'); $this->db->insert ('code_review');
@ -70,7 +70,7 @@ class CodeReviewModel extends Model
$this->db->trans_rollback (); $this->db->trans_rollback ();
return FALSE; return FALSE;
} }
/*$this->db->set ('createdon', date('Y-m-d H:i:s')); /*$this->db->set ('createdon', codepot_nowtodbdate());
$this->db->set ('type', 'code_review'); $this->db->set ('type', 'code_review');
$this->db->set ('action', 'insert'); $this->db->set ('action', 'insert');
$this->db->set ('projectid', $projectid); $this->db->set ('projectid', $projectid);
@ -98,7 +98,7 @@ class CodeReviewModel extends Model
$this->db->where ('sno', $sno); $this->db->where ('sno', $sno);
if ($strict) $this->db->where ('updatedby', $userid); if ($strict) $this->db->where ('updatedby', $userid);
$this->db->set ('comment', $comment); $this->db->set ('comment', $comment);
$this->db->set ('updatedon', date('Y-m-d H:i:s')); $this->db->set ('updatedon', codepot_nowtodbdate());
$this->db->set ('updatedby', $userid); $this->db->set ('updatedby', $userid);
$this->db->update ('code_review'); $this->db->update ('code_review');
if ($this->db->trans_status() === FALSE) if ($this->db->trans_status() === FALSE)
@ -108,7 +108,7 @@ class CodeReviewModel extends Model
return FALSE; return FALSE;
} }
/*$this->db->set ('createdon', date('Y-m-d H:i:s')); /*$this->db->set ('createdon', codepot_nowtodbdate());
$this->db->set ('type', 'code_review'); $this->db->set ('type', 'code_review');
$this->db->set ('action', 'insert'); $this->db->set ('action', 'insert');
$this->db->set ('projectid', $projectid); $this->db->set ('projectid', $projectid);
@ -142,7 +142,7 @@ class CodeReviewModel extends Model
return FALSE; return FALSE;
} }
/*$this->db->set ('createdon', date('Y-m-d H:i:s')); /*$this->db->set ('createdon', codepot_nowtodbdate());
$this->db->set ('type', 'issue'); $this->db->set ('type', 'issue');
$this->db->set ('action', 'delete'); $this->db->set ('action', 'delete');
$this->db->set ('projectid', $projectid); $this->db->set ('projectid', $projectid);

View File

@ -41,7 +41,7 @@ class FileModel extends Model
$this->db->where ('projectid', $project->id); $this->db->where ('projectid', $project->id);
$this->db->where ('name', $file->name); $this->db->where ('name', $file->name);
$this->db->select ('filename,encname,md5sum,description'); $this->db->select ('filename,encname,md5sum,description,createdon,createdby');
$query = $this->db->get('file_list'); $query = $this->db->get('file_list');
if ($this->db->trans_status() === FALSE) if ($this->db->trans_status() === FALSE)
{ {
@ -90,7 +90,7 @@ class FileModel extends Model
{ {
$this->db->where ('projectid', $project->id); $this->db->where ('projectid', $project->id);
$this->db->where ('name', $f->name); $this->db->where ('name', $f->name);
$this->db->select ('filename,encname,md5sum,description'); $this->db->select ('filename,encname,md5sum,description,createdon,createdby');
$query = $this->db->get('file_list'); $query = $this->db->get('file_list');
if ($this->db->trans_status() === FALSE) if ($this->db->trans_status() === FALSE)
{ {
@ -116,13 +116,13 @@ class FileModel extends Model
$this->db->set ('tag', $file->tag); $this->db->set ('tag', $file->tag);
$this->db->set ('md5sum', $file->md5sum); $this->db->set ('md5sum', $file->md5sum);
$this->db->set ('description', $file->description); $this->db->set ('description', $file->description);
$this->db->set ('createdon', date('Y-m-d H:i:s')); $this->db->set ('createdon', codepot_nowtodbdate());
$this->db->set ('createdby', $userid); $this->db->set ('createdby', $userid);
$this->db->set ('updatedon', date('Y-m-d H:i:s')); $this->db->set ('updatedon', codepot_nowtodbdate());
$this->db->set ('updatedby', $userid); $this->db->set ('updatedby', $userid);
$this->db->insert ('file'); $this->db->insert ('file');
$this->db->set ('createdon', date('Y-m-d H:i:s')); $this->db->set ('createdon', codepot_nowtodbdate());
$this->db->set ('type', 'file'); $this->db->set ('type', 'file');
$this->db->set ('action', 'create'); $this->db->set ('action', 'create');
$this->db->set ('projectid', $file->projectid); $this->db->set ('projectid', $file->projectid);
@ -144,7 +144,7 @@ class FileModel extends Model
$this->db->set ('name', $file->name); $this->db->set ('name', $file->name);
$this->db->set ('tag', $file->tag); $this->db->set ('tag', $file->tag);
$this->db->set ('description', $file->description); $this->db->set ('description', $file->description);
$this->db->set ('updatedon', date('Y-m-d H:i:s')); $this->db->set ('updatedon', codepot_nowtodbdate());
$this->db->set ('updatedby', $userid); $this->db->set ('updatedby', $userid);
$this->db->update ('file'); $this->db->update ('file');
// file_list gets updated for the schema itself (reference/trigger) // file_list gets updated for the schema itself (reference/trigger)
@ -158,13 +158,13 @@ class FileModel extends Model
$this->db->set ('f.name', $file->name); $this->db->set ('f.name', $file->name);
$this->db->set ('f.tag', $file->tag); $this->db->set ('f.tag', $file->tag);
$this->db->set ('f.description', $file->description); $this->db->set ('f.description', $file->description);
$this->db->set ('f.updatedon', date('Y-m-d H:i:s')); $this->db->set ('f.updatedon', codepot_nowtodbdate());
$this->db->set ('f.updatedby', $userid); $this->db->set ('f.updatedby', $userid);
$this->db->set ('fl.name', $file->name); $this->db->set ('fl.name', $file->name);
$this->db->update ('file as f, file_list as fl'); $this->db->update ('file as f, file_list as fl');
*/ */
$this->db->set ('createdon', date('Y-m-d H:i:s')); $this->db->set ('createdon', codepot_nowtodbdate());
$this->db->set ('type', 'file'); $this->db->set ('type', 'file');
$this->db->set ('action', 'update'); $this->db->set ('action', 'update');
$this->db->set ('projectid', $projectid); $this->db->set ('projectid', $projectid);
@ -226,7 +226,7 @@ class FileModel extends Model
return FALSE; return FALSE;
} }
$this->db->set ('createdon', date('Y-m-d H:i:s')); $this->db->set ('createdon', codepot_nowtodbdate());
$this->db->set ('type', 'file'); $this->db->set ('type', 'file');
$this->db->set ('action', 'delete'); $this->db->set ('action', 'delete');
$this->db->set ('projectid', $projectid); $this->db->set ('projectid', $projectid);
@ -287,9 +287,9 @@ class FileModel extends Model
$this->db->set ('name', $name); $this->db->set ('name', $name);
$this->db->set ('tag', $tag); $this->db->set ('tag', $tag);
$this->db->set ('description', $description); $this->db->set ('description', $description);
$this->db->set ('createdon', date('Y-m-d H:i:s')); $this->db->set ('createdon', codepot_nowtodbdate());
$this->db->set ('createdby', $userid); $this->db->set ('createdby', $userid);
$this->db->set ('updatedon', date('Y-m-d H:i:s')); $this->db->set ('updatedon', codepot_nowtodbdate());
$this->db->set ('updatedby', $userid); $this->db->set ('updatedby', $userid);
$this->db->insert ('file'); $this->db->insert ('file');
if ($this->db->trans_status() === FALSE) if ($this->db->trans_status() === FALSE)
@ -335,9 +335,10 @@ class FileModel extends Model
$this->db->set ('name', $name); $this->db->set ('name', $name);
$this->db->set ('filename', $f['name']); $this->db->set ('filename', $f['name']);
$this->db->set ('encname', $ud['file_name']); $this->db->set ('encname', $ud['file_name']);
$this->db->set ('md5sum', $md5sum); $this->db->set ('md5sum', $md5sum);
$this->db->set ('description', $f['desc']); $this->db->set ('description', $f['desc']);
$this->db->set ('createdby', $userid);
$this->db->set ('createdon', codepot_nowtodbdate());
$this->db->insert ('file_list'); $this->db->insert ('file_list');
if ($this->db->trans_status() === FALSE) if ($this->db->trans_status() === FALSE)
{ {
@ -348,7 +349,7 @@ class FileModel extends Model
} }
} }
$this->db->set ('createdon', date('Y-m-d H:i:s')); $this->db->set ('createdon', codepot_nowtodbdate());
$this->db->set ('type', 'file'); $this->db->set ('type', 'file');
$this->db->set ('action', 'create'); $this->db->set ('action', 'create');
$this->db->set ('projectid', $projectid); $this->db->set ('projectid', $projectid);
@ -417,9 +418,10 @@ class FileModel extends Model
$this->db->set ('name', $name); $this->db->set ('name', $name);
$this->db->set ('filename', $f['name']); $this->db->set ('filename', $f['name']);
$this->db->set ('encname', $ud['file_name']); $this->db->set ('encname', $ud['file_name']);
$this->db->set ('md5sum', $md5sum); $this->db->set ('md5sum', $md5sum);
$this->db->set ('description', $f['desc']); $this->db->set ('description', $f['desc']);
$this->db->set ('createdby', $userid);
$this->db->set ('createdon', codepot_nowtodbdate());
$this->db->insert ('file_list'); $this->db->insert ('file_list');
if ($this->db->trans_status() === FALSE) if ($this->db->trans_status() === FALSE)
{ {
@ -430,7 +432,7 @@ class FileModel extends Model
} }
} }
$this->db->set ('createdon', date('Y-m-d H:i:s')); $this->db->set ('createdon', codepot_nowtodbdate());
$this->db->set ('type', 'file'); $this->db->set ('type', 'file');
$this->db->set ('action', 'update'); $this->db->set ('action', 'update');
$this->db->set ('projectid', $projectid); $this->db->set ('projectid', $projectid);
@ -510,6 +512,8 @@ class FileModel extends Model
$this->db->where ('name', $name); $this->db->where ('name', $name);
$this->db->where ('filename', $f['name']); $this->db->where ('filename', $f['name']);
$this->db->set ('description', $f['desc']); $this->db->set ('description', $f['desc']);
$this->db->set ('updatedby', $userid);
$this->db->set ('updatedon', codepot_nowtodbdate());
$this->db->update ('file_list'); $this->db->update ('file_list');
if ($this->db->trans_status() === FALSE) if ($this->db->trans_status() === FALSE)
{ {
@ -520,7 +524,7 @@ class FileModel extends Model
} }
} }
$this->db->set ('createdon', date('Y-m-d H:i:s')); $this->db->set ('createdon', codepot_nowtodbdate());
$this->db->set ('type', 'file'); $this->db->set ('type', 'file');
$this->db->set ('action', 'update'); $this->db->set ('action', 'update');
$this->db->set ('projectid', $projectid); $this->db->set ('projectid', $projectid);

View File

@ -206,8 +206,8 @@ class IssueModel extends Model
$this->db->set ('status', $issue->status); $this->db->set ('status', $issue->status);
$this->db->set ('owner', $issue->owner); $this->db->set ('owner', $issue->owner);
$this->db->set ('priority', $issue->priority); $this->db->set ('priority', $issue->priority);
$this->db->set ('createdon', date('Y-m-d H:i:s')); $this->db->set ('createdon', codepot_nowtodbdate());
$this->db->set ('updatedon', date('Y-m-d H:i:s')); $this->db->set ('updatedon', codepot_nowtodbdate());
$this->db->set ('createdby', $userid); $this->db->set ('createdby', $userid);
$this->db->set ('updatedby', $userid); $this->db->set ('updatedby', $userid);
$this->db->insert ('issue'); $this->db->insert ('issue');
@ -220,11 +220,11 @@ class IssueModel extends Model
$this->db->set ('owner', $issue->owner); $this->db->set ('owner', $issue->owner);
$this->db->set ('comment', ''); $this->db->set ('comment', '');
$this->db->set ('priority', $issue->priority); $this->db->set ('priority', $issue->priority);
$this->db->set ('updatedon', date('Y-m-d H:i:s')); $this->db->set ('updatedon', codepot_nowtodbdate());
$this->db->set ('updatedby', $userid); $this->db->set ('updatedby', $userid);
$this->db->insert ('issue_change'); $this->db->insert ('issue_change');
$this->db->set ('createdon', date('Y-m-d H:i:s')); $this->db->set ('createdon', codepot_nowtodbdate());
$this->db->set ('type', 'issue'); $this->db->set ('type', 'issue');
$this->db->set ('action', 'create'); $this->db->set ('action', 'create');
$this->db->set ('projectid', $issue->projectid); $this->db->set ('projectid', $issue->projectid);
@ -245,11 +245,11 @@ class IssueModel extends Model
$this->db->where ('id', $issue->id); $this->db->where ('id', $issue->id);
$this->db->set ('summary', $issue->summary); $this->db->set ('summary', $issue->summary);
$this->db->set ('description', $issue->description); $this->db->set ('description', $issue->description);
$this->db->set ('updatedon', date('Y-m-d H:i:s')); $this->db->set ('updatedon', codepot_nowtodbdate());
$this->db->set ('updatedby', $userid); $this->db->set ('updatedby', $userid);
$this->db->update ('issue'); $this->db->update ('issue');
$this->db->set ('createdon', date('Y-m-d H:i:s')); $this->db->set ('createdon', codepot_nowtodbdate());
$this->db->set ('type', 'issue'); $this->db->set ('type', 'issue');
$this->db->set ('action', 'update'); $this->db->set ('action', 'update');
$this->db->set ('projectid', $issue->projectid); $this->db->set ('projectid', $issue->projectid);
@ -275,7 +275,7 @@ class IssueModel extends Model
$this->db->set ('status', $issue->status); $this->db->set ('status', $issue->status);
$this->db->set ('owner', $issue->owner); $this->db->set ('owner', $issue->owner);
$this->db->set ('priority', $issue->priority); $this->db->set ('priority', $issue->priority);
$this->db->set ('updatedon', date('Y-m-d H:i:s')); $this->db->set ('updatedon', codepot_nowtodbdate());
$this->db->set ('updatedby', $userid); $this->db->set ('updatedby', $userid);
$this->db->update ('issue'); $this->db->update ('issue');
@ -287,11 +287,11 @@ class IssueModel extends Model
$this->db->set ('owner', $issue->owner); $this->db->set ('owner', $issue->owner);
$this->db->set ('priority', $issue->priority); $this->db->set ('priority', $issue->priority);
$this->db->set ('comment', ''); $this->db->set ('comment', '');
$this->db->set ('updatedon', date('Y-m-d H:i:s')); $this->db->set ('updatedon', codepot_nowtodbdate());
$this->db->set ('updatedby', $userid); $this->db->set ('updatedby', $userid);
$this->db->update ('issue_change'); $this->db->update ('issue_change');
$this->db->set ('createdon', date('Y-m-d H:i:s')); $this->db->set ('createdon', codepot_nowtodbdate());
$this->db->set ('type', 'issue'); $this->db->set ('type', 'issue');
$this->db->set ('action', 'update'); $this->db->set ('action', 'update');
$this->db->set ('projectid', $issue->projectid); $this->db->set ('projectid', $issue->projectid);
@ -330,7 +330,7 @@ class IssueModel extends Model
$this->db->set ('owner', $change->owner); $this->db->set ('owner', $change->owner);
$this->db->set ('priority', $change->priority); $this->db->set ('priority', $change->priority);
$this->db->set ('comment', $change->comment); $this->db->set ('comment', $change->comment);
$this->db->set ('updatedon', date('Y-m-d H:i:s')); $this->db->set ('updatedon', codepot_nowtodbdate());
$this->db->set ('updatedby', $userid); $this->db->set ('updatedby', $userid);
$this->db->insert ('issue_change'); $this->db->insert ('issue_change');
@ -340,11 +340,11 @@ class IssueModel extends Model
$this->db->set ('status', $change->status); $this->db->set ('status', $change->status);
$this->db->set ('owner', $change->owner); $this->db->set ('owner', $change->owner);
$this->db->set ('priority', $change->priority); $this->db->set ('priority', $change->priority);
$this->db->set ('updatedon', date('Y-m-d H:i:s')); $this->db->set ('updatedon', codepot_nowtodbdate());
$this->db->set ('updatedby', $userid); $this->db->set ('updatedby', $userid);
$this->db->update ('issue'); $this->db->update ('issue');
$this->db->set ('createdon', date('Y-m-d H:i:s')); $this->db->set ('createdon', codepot_nowtodbdate());
$this->db->set ('type', 'issue'); $this->db->set ('type', 'issue');
$this->db->set ('action', 'change'); $this->db->set ('action', 'change');
$this->db->set ('projectid', $project->id); $this->db->set ('projectid', $project->id);
@ -439,7 +439,7 @@ class IssueModel extends Model
$this->db->where ('id', $issue->id); $this->db->where ('id', $issue->id);
$this->db->delete ('issue'); $this->db->delete ('issue');
$this->db->set ('createdon', date('Y-m-d H:i:s')); $this->db->set ('createdon', codepot_nowtodbdate());
$this->db->set ('type', 'issue'); $this->db->set ('type', 'issue');
$this->db->set ('action', 'delete'); $this->db->set ('action', 'delete');
$this->db->set ('projectid', $issue->projectid); $this->db->set ('projectid', $issue->projectid);
@ -484,8 +484,8 @@ class IssueModel extends Model
$this->db->set ('status', $issue->status); $this->db->set ('status', $issue->status);
$this->db->set ('owner', $issue->owner); $this->db->set ('owner', $issue->owner);
$this->db->set ('priority', $issue->priority); $this->db->set ('priority', $issue->priority);
$this->db->set ('createdon', date('Y-m-d H:i:s')); $this->db->set ('createdon', codepot_nowtodbdate());
$this->db->set ('updatedon', date('Y-m-d H:i:s')); $this->db->set ('updatedon', codepot_nowtodbdate());
$this->db->set ('createdby', $userid); $this->db->set ('createdby', $userid);
$this->db->set ('updatedby', $userid); $this->db->set ('updatedby', $userid);
$this->db->insert ('issue'); $this->db->insert ('issue');
@ -504,7 +504,7 @@ class IssueModel extends Model
$this->db->set ('owner', $issue->owner); $this->db->set ('owner', $issue->owner);
$this->db->set ('comment', ''); $this->db->set ('comment', '');
$this->db->set ('priority', $issue->priority); $this->db->set ('priority', $issue->priority);
$this->db->set ('updatedon', date('Y-m-d H:i:s')); $this->db->set ('updatedon', codepot_nowtodbdate());
$this->db->set ('updatedby', $userid); $this->db->set ('updatedby', $userid);
$this->db->insert ('issue_change'); $this->db->insert ('issue_change');
if ($this->db->trans_status() === FALSE) if ($this->db->trans_status() === FALSE)
@ -562,7 +562,7 @@ class IssueModel extends Model
} }
} }
$this->db->set ('createdon', date('Y-m-d H:i:s')); $this->db->set ('createdon', codepot_nowtodbdate());
$this->db->set ('type', 'issue'); $this->db->set ('type', 'issue');
$this->db->set ('action', 'create'); $this->db->set ('action', 'create');
$this->db->set ('projectid', $issue->projectid); $this->db->set ('projectid', $issue->projectid);
@ -600,7 +600,7 @@ class IssueModel extends Model
$this->db->where ('id', $issue->id); $this->db->where ('id', $issue->id);
$this->db->set ('summary', $issue->summary); $this->db->set ('summary', $issue->summary);
$this->db->set ('description', $issue->description); $this->db->set ('description', $issue->description);
$this->db->set ('updatedon', date('Y-m-d H:i:s')); $this->db->set ('updatedon', codepot_nowtodbdate());
$this->db->set ('updatedby', $userid); $this->db->set ('updatedby', $userid);
$this->db->update ('issue'); $this->db->update ('issue');
if ($this->db->trans_status() === FALSE) if ($this->db->trans_status() === FALSE)
@ -610,7 +610,7 @@ class IssueModel extends Model
return FALSE; return FALSE;
} }
$this->db->set ('createdon', date('Y-m-d H:i:s')); $this->db->set ('createdon', codepot_nowtodbdate());
$this->db->set ('type', 'issue'); $this->db->set ('type', 'issue');
$this->db->set ('action', 'update'); $this->db->set ('action', 'update');
$this->db->set ('projectid', $issue->projectid); $this->db->set ('projectid', $issue->projectid);
@ -679,7 +679,7 @@ class IssueModel extends Model
return FALSE; return FALSE;
} }
$this->db->set ('createdon', date('Y-m-d H:i:s')); $this->db->set ('createdon', codepot_nowtodbdate());
$this->db->set ('type', 'issue'); $this->db->set ('type', 'issue');
$this->db->set ('action', 'delete'); $this->db->set ('action', 'delete');
$this->db->set ('projectid', $projectid); $this->db->set ('projectid', $projectid);
@ -781,7 +781,7 @@ class IssueModel extends Model
} }
} }
$this->db->set ('createdon', date('Y-m-d H:i:s')); $this->db->set ('createdon', codepot_nowtodbdate());
$this->db->set ('type', 'issue'); $this->db->set ('type', 'issue');
$this->db->set ('action', 'update'); $this->db->set ('action', 'update');
$this->db->set ('projectid', $projectid); $this->db->set ('projectid', $projectid);
@ -871,7 +871,7 @@ class IssueModel extends Model
} }
} }
$this->db->set ('createdon', date('Y-m-d H:i:s')); $this->db->set ('createdon', codepot_nowtodbdate());
$this->db->set ('type', 'issue'); $this->db->set ('type', 'issue');
$this->db->set ('action', 'update'); $this->db->set ('action', 'update');
$this->db->set ('projectid', $projectid); $this->db->set ('projectid', $projectid);

View File

@ -159,7 +159,7 @@ class LogModel extends Model
$this->db->set ('action', $log->action); $this->db->set ('action', $log->action);
$this->db->set ('projectid', $log->projectid); $this->db->set ('projectid', $log->projectid);
$this->db->set ('message', $log->message); $this->db->set ('message', $log->message);
$this->db->set ('createdon', date('Y-m-d H:i:s')); $this->db->set ('createdon', codepot_nowtodbdate());
$this->db->set ('userid', $log->userid); $this->db->set ('userid', $log->userid);
$this->db->insert ('log'); $this->db->insert ('log');
@ -200,8 +200,7 @@ class LogModel extends Model
$now = time(); $now = time();
$one_month_ago = $now - (24 * 60 * 60 * 30); $one_month_ago = $now - (24 * 60 * 60 * 30);
$this->db->where ('createdon <=', $this->db->where ('createdon <=', codepot_unixtimetodate($one_month_ago));
date ("Y-m-d H:i:s", $one_month_ago));
$this->db->delete ('log'); $this->db->delete ('log');
if ($this->db->trans_status() === FALSE) if ($this->db->trans_status() === FALSE)

View File

@ -146,9 +146,9 @@ class ProjectModel extends Model
$this->db->set ('description', $project->description); $this->db->set ('description', $project->description);
$this->db->set ('commitable', $project->commitable); $this->db->set ('commitable', $project->commitable);
$this->db->set ('public', $project->public); $this->db->set ('public', $project->public);
$this->db->set ('createdon', date('Y-m-d H:i:s')); $this->db->set ('createdon', codepot_nowtodbdate());
$this->db->set ('createdby', $userid); $this->db->set ('createdby', $userid);
$this->db->set ('updatedon', date('Y-m-d H:i:s')); $this->db->set ('updatedon', codepot_nowtodbdate());
$this->db->set ('updatedby', $userid); $this->db->set ('updatedby', $userid);
$this->db->insert ('project'); $this->db->insert ('project');
@ -173,7 +173,7 @@ class ProjectModel extends Model
$this->db->insert ('project_membership'); $this->db->insert ('project_membership');
} }
$this->db->set ('createdon', date('Y-m-d H:i:s')); $this->db->set ('createdon', codepot_nowtodbdate());
$this->db->set ('type', 'project'); $this->db->set ('type', 'project');
$this->db->set ('action', 'create'); $this->db->set ('action', 'create');
$this->db->set ('projectid', $project->id); $this->db->set ('projectid', $project->id);
@ -262,7 +262,7 @@ class ProjectModel extends Model
$this->db->set ('description', $project->description); $this->db->set ('description', $project->description);
$this->db->set ('commitable', $project->commitable); $this->db->set ('commitable', $project->commitable);
$this->db->set ('public', $project->public); $this->db->set ('public', $project->public);
$this->db->set ('updatedon', date('Y-m-d H:i:s')); $this->db->set ('updatedon', codepot_nowtodbdate());
$this->db->set ('updatedby', $userid); $this->db->set ('updatedby', $userid);
$this->db->update ('project'); $this->db->update ('project');
@ -288,7 +288,7 @@ class ProjectModel extends Model
$this->db->insert ('project_membership'); $this->db->insert ('project_membership');
} }
$this->db->set ('createdon', date('Y-m-d H:i:s')); $this->db->set ('createdon', codepot_nowtodbdate());
$this->db->set ('type', 'project'); $this->db->set ('type', 'project');
$this->db->set ('action', 'update'); $this->db->set ('action', 'update');
$this->db->set ('projectid', $project->id); $this->db->set ('projectid', $project->id);
@ -356,7 +356,7 @@ class ProjectModel extends Model
$this->db->where ('id', $project->id); $this->db->where ('id', $project->id);
$this->db->delete ('project'); $this->db->delete ('project');
$this->db->set ('createdon', date('Y-m-d H:i:s')); $this->db->set ('createdon', codepot_nowtodbdate());
$this->db->set ('type', 'project'); $this->db->set ('type', 'project');
$this->db->set ('action', 'delete'); $this->db->set ('action', 'delete');
$this->db->set ('projectid', $project->id); $this->db->set ('projectid', $project->id);

View File

@ -67,9 +67,9 @@ class SiteModel extends Model
$this->db->set ('name', $site->name); $this->db->set ('name', $site->name);
$this->db->set ('summary', $site->summary); $this->db->set ('summary', $site->summary);
$this->db->set ('text', $site->text); $this->db->set ('text', $site->text);
$this->db->set ('createdon', date('Y-m-d H:i:s')); $this->db->set ('createdon', codepot_nowtodbdate());
$this->db->set ('createdby', $userid); $this->db->set ('createdby', $userid);
$this->db->set ('updatedon', date('Y-m-d H:i:s')); $this->db->set ('updatedon', codepot_nowtodbdate());
$this->db->set ('updatedby', $userid); $this->db->set ('updatedby', $userid);
$this->db->insert ('site'); $this->db->insert ('site');
@ -93,7 +93,7 @@ class SiteModel extends Model
$this->db->set ('name', $site->name); $this->db->set ('name', $site->name);
$this->db->set ('summary', $site->summary); $this->db->set ('summary', $site->summary);
$this->db->set ('text', $site->text); $this->db->set ('text', $site->text);
$this->db->set ('updatedon', date('Y-m-d H:i:s')); $this->db->set ('updatedon', codepot_nowtodbdate());
$this->db->set ('updatedby', $userid); $this->db->set ('updatedby', $userid);
$this->db->update ('site'); $this->db->update ('site');

View File

@ -100,7 +100,7 @@ class WikiModel extends Model
// TODO: check if userid can do this.. // TODO: check if userid can do this..
$this->db->trans_begin (); // manual transaction. not using trans_start(). $this->db->trans_begin (); // manual transaction. not using trans_start().
$now = date('Y-m-d H:i:s'); $now = codepot_nowtodbdate();
$this->db->set ('projectid', $wiki->projectid); $this->db->set ('projectid', $wiki->projectid);
$this->db->set ('name', $wiki->name); $this->db->set ('name', $wiki->name);
@ -167,7 +167,7 @@ class WikiModel extends Model
// TODO: check if userid can do this.. // TODO: check if userid can do this..
$this->db->trans_begin (); // manual transaction. not using trans_start(). $this->db->trans_begin (); // manual transaction. not using trans_start().
$now = date('Y-m-d H:i:s'); $now = codepot_nowtodbdate();
if (!is_null($new_wiki_name) && $wiki->name != $new_wiki_name) if (!is_null($new_wiki_name) && $wiki->name != $new_wiki_name)
{ {
@ -293,7 +293,7 @@ class WikiModel extends Model
$this->db->where ('name', $wiki->name); $this->db->where ('name', $wiki->name);
$this->db->delete ('wiki'); $this->db->delete ('wiki');
$this->db->set ('createdon', date('Y-m-d H:i:s')); $this->db->set ('createdon', codepot_nowtodbdate());
$this->db->set ('type', 'wiki'); $this->db->set ('type', 'wiki');
$this->db->set ('action', 'delete'); $this->db->set ('action', 'delete');
$this->db->set ('projectid', $wiki->projectid); $this->db->set ('projectid', $wiki->projectid);

View File

@ -987,7 +987,7 @@ $this->load->view (
print htmlspecialchars($f['last_author']); print htmlspecialchars($f['last_author']);
print '</td>'; print '</td>';
print '<td><code>'; print '<td><code>';
print date('Y-m-d', $f['time_t']); print strftime('%Y-%m-%d', $f['time_t']);
print '</code></td>'; print '</code></td>';
print '<td></td>'; print '<td></td>';
print '<td></td>'; print '<td></td>';
@ -1023,8 +1023,7 @@ $this->load->view (
print htmlspecialchars($f['last_author']); print htmlspecialchars($f['last_author']);
print '</td>'; print '</td>';
print '<td><code>'; print '<td><code>';
//print date('r', $f['time_t']); print strftime('%Y-%m-%d', $f['time_t']);
print date('Y-m-d', $f['time_t']);
print '</code></td>'; print '</code></td>';
print '<td>'; print '<td>';

View File

@ -143,8 +143,7 @@ $this->load->view (
print '</td>'; print '</td>';
print '<td class="commit-date-td"><code>'; print '<td class="commit-date-td"><code>';
//print date('r', strtotime($h['date'])); print strftime('%Y-%m-%d', strtotime($h['date']));
print date('Y-m-d', strtotime($h['date']));
print '</code></td>'; print '</code></td>';
print '<td class="commit-message-td">'; print '<td class="commit-message-td">';

View File

@ -799,7 +799,7 @@ $history = $file['history'];
print "<div id='code_revision_mainarea_review_comment_title_{$i}' class='review_comment_title'>\n"; print "<div id='code_revision_mainarea_review_comment_title_{$i}' class='review_comment_title'>\n";
printf (" <span class='review_comment_title_no'>%d</span>", $rc->sno); printf (" <span class='review_comment_title_no'>%d</span>", $rc->sno);
printf (" <span class='review_comment_title_updatedby'>%s</span>", $rc->updatedby); printf (" <span class='review_comment_title_updatedby'>%s</span>", $rc->updatedby);
printf (" <span class='review_comment_title_updatedon'>%s</span>", $rc->updatedon); printf (" <span class='review_comment_title_updatedon'>%s</span>", codepot_dbdatetodispdate($rc->updatedon));
if ($login['id'] == $rc->updatedby) if ($login['id'] == $rc->updatedby)
{ {

View File

@ -258,9 +258,11 @@ $this->load->view (
<!-- ============================================================ --> <!-- ============================================================ -->
<div class="mainarea" id="file_home_mainarea"> <div class="mainarea" id="file_home_mainarea">
<div class="title"><?php print $this->lang->line('Files')?></div>
<div class="infostrip"> <div class="title-band" id="file_home_mainarea_title_band">
<div class="title"><?php print $this->lang->line('Files')?></div>
<div class="actions">
<?php <?php
$total_file_count = 0; $total_file_count = 0;
foreach ($files as $f) $total_file_count += count($f->file_list); foreach ($files as $f) $total_file_count += count($f->file_list);
@ -271,7 +273,9 @@ $this->load->view (
| |
<a id="file_home_mainarea_new_button" href='#'><?php print $this->lang->line('New')?></a> <a id="file_home_mainarea_new_button" href='#'><?php print $this->lang->line('New')?></a>
<?php endif; ?> <?php endif; ?>
</div>
<div style='clear: both'></div>
</div> </div>
<div class="result" id="file_home_mainarea_result"> <div class="result" id="file_home_mainarea_result">

View File

@ -166,26 +166,8 @@ var original_file_desc = [
]; ];
$(function () { $(function () {
if ($("#file_show_mainarea_result_info").is(":visible")) $('#file_show_mainarea_metadata').accordion({
btn_label = "<?php print $this->lang->line('Hide metadata')?>"; collapsible: true
else
btn_label = "<?php print $this->lang->line('Show metadata')?>";
btn = $('#file_show_mainarea_metadata_button').button({'label': btn_label}).click (function () {
if ($('#file_show_mainarea_result_info').is(':visible'))
{
$('#file_show_mainarea_result_info').hide('blind',{},200);
$('#file_show_mainarea_metadata_button').button(
'option', 'label', "<?php print $this->lang->line('Show metadata')?>");
}
else
{
$('#file_show_mainarea_result_info').show('blind',{},200);
$('#file_show_mainarea_metadata_button').button(
'option', 'label', '<?php print $this->lang->line('Hide metadata')?>');
}
}); });
$('#file_show_mainarea_files').accordion({ $('#file_show_mainarea_files').accordion({
@ -611,17 +593,34 @@ $this->load->view (
<div class="mainarea" id="file_show_mainarea"> <div class="mainarea" id="file_show_mainarea">
<div class="title"><?php print htmlspecialchars($file->name)?></div>
<div class="infostrip" id="wiki_show_mainarea_infostrip"> <div class="title-band" id="file_show_mainarea_title_band">
<div class="title"><?php print htmlspecialchars($file->name)?></div>
<div class="actions">
<?php if (isset($login['id']) && $login['id'] != ''): ?> <?php if (isset($login['id']) && $login['id'] != ''): ?>
<a id="file_show_mainarea_edit_button" href='#'><?php print $this->lang->line('Edit')?></a> <a id="file_show_mainarea_edit_button" href='#'><?php print $this->lang->line('Edit')?></a>
<a id="file_show_mainarea_delete_button" href='#'><?php print $this->lang->line('Delete')?></a> <a id="file_show_mainarea_delete_button" href='#'><?php print $this->lang->line('Delete')?></a>
<?php endif; ?> <?php endif; ?>
<a id="file_show_mainarea_metadata_button" href='#'><?php print $this->lang->line('Metadata')?></a> </div>
<div style='clear: both'></div>
</div> </div>
<div id="file_show_mainarea_result">
<div id='file_show_mainarea_result'>
<div id='file_show_mainarea_metadata' class='collapsible-box'>
<div id='file_show_mainarea_metadata_header' class='collapsible-box-header'><?php print $this->lang->line('Metadata')?></div>
<div id='file_show_mainarea_metadata_body'>
<ul>
<li><?php print $this->lang->line('Created on')?> <?php print codepot_dbdatetodispdate($file->createdon); ?></li>
<li><?php print $this->lang->line('Created by')?> <?php print htmlspecialchars($file->createdby); ?></li>
<li><?php print $this->lang->line('Last updated on')?> <?php print codepot_dbdatetodispdate($file->updatedon); ?></li>
<li><?php print $this->lang->line('Last updated by')?> <?php print htmlspecialchars($file->updatedby); ?></li>
</ul>
</div>
</div>
<div id='file_show_mainarea_files' class='collapsible-box'> <div id='file_show_mainarea_files' class='collapsible-box'>
<div id='file_show_mainarea_files_header' class='collapsible-box-header'><?php print $this->lang->line('Files')?></div> <div id='file_show_mainarea_files_header' class='collapsible-box-header'><?php print $this->lang->line('Files')?></div>
@ -634,19 +633,22 @@ $this->load->view (
</div> </div>
<?php endif; ?> <?php endif; ?>
<table> <table id='file_show_mainarea_files_table'>
<?php <?php
for ($i = 0; $i < $file_count; $i++) for ($i = 0; $i < $file_count; $i++)
{ {
$f = $file->file_list[$i]; $f = $file->file_list[$i];
$xname = $this->converter->AsciiToHex($f->filename); $xname = $this->converter->AsciiToHex($f->filename);
print '<tr><td class="file-name-td">'; print '<tr><td class="file-name-td">';
print anchor ("file/get/{$project->id}/{$xname}", '<i class="fa fa-download" /> ' . htmlspecialchars($f->filename)); print anchor ("file/get/{$project->id}/{$xname}", '<i class="fa fa-download" /> ' . htmlspecialchars($f->filename));
print '</td><td class="file-description-td">'; print '</td><td class="file-description-td">';
print htmlspecialchars($f->description); print htmlspecialchars($f->description);
print '</td><td class="file-md5sum-td">'; print '</td><td class="file-md5sum-td">';
print " <tt>{$f->md5sum}</tt>"; print "<tt>{$f->md5sum}</tt>";
print '</td><td class="file-createdon-td">';
print codepot_dbdatetodispdate($f->createdon);
print '</td><td class="file-createdby-td">';
print htmlspecialchars($f->createdby);
print '</td></tr>'; print '</td></tr>';
} }
?> ?>
@ -660,15 +662,6 @@ $this->load->view (
</pre> </pre>
</div> <!-- file_show_mainarea_wiki --> </div> <!-- file_show_mainarea_wiki -->
<div id="file_show_mainarea_result_info" class="infobox">
<ul>
<li><?php print $this->lang->line('Created on')?> <?php print $file->createdon ?></li>
<li><?php print $this->lang->line('Created by')?> <?php print $file->createdby ?></li>
<li><?php print $this->lang->line('Last updated on')?> <?php print $file->updatedon ?></li>
<li><?php print $this->lang->line('Last updated by')?> <?php print $file->updatedby ?></li>
</ul>
</div> <!-- file_show_mainarea_result_info -->
</div> <!-- file_show_mainarea_result --> </div> <!-- file_show_mainarea_result -->

View File

@ -466,10 +466,10 @@ $this->load->view (
<div class="collapsible-box-header"> <div class="collapsible-box-header">
</div> </div>
<ul class="collapsible-box-list"> <ul class="collapsible-box-list">
<li><?php print $this->lang->line('Created on')?> <?php print $project->createdon?></li> <li><?php print $this->lang->line('Created on')?> <?php print codepot_dbdatetodispdate($project->createdon);?></li>
<li><?php print $this->lang->line('Created by')?> <?php print $project->createdby?></li> <li><?php print $this->lang->line('Created by')?> <?php print htmlspecialchars($project->createdby);?></li>
<li><?php print $this->lang->line('Last updated on')?> <?php print $project->updatedon?></li> <li><?php print $this->lang->line('Last updated on')?> <?php print codepot_dbdatetodispdate($project->updatedon);?></li>
<li><?php print $this->lang->line('Last updated by')?> <?php print $project->updatedby?></li> <li><?php print $this->lang->line('Last updated by')?> <?php print htmlspecialchars($project->updatedby);?></li>
</ul> </ul>
</div> </div>
</div> --> <!-- graph_main_sidebar --> </div> --> <!-- graph_main_sidebar -->

View File

@ -308,18 +308,19 @@ $this->load->view (
<!-- ============================================================ --> <!-- ============================================================ -->
<div class="mainarea" id="issue_home_mainarea"> <div class="mainarea" id="issue_home_mainarea">
<div class="title"><?php print $this->lang->line('Issues')?></div>
<div class="infostrip"> <div class="title-band" id="issue_home_mainarea_title_band">
<?php printf ($this->lang->line('ISSUE_MSG_TOTAL_NUM_ISSUES'), $total_num_issues); ?> | <div class="title"><?php print $this->lang->line('Issues')?></div>
<?php if (isset($login['id']) && $login['id'] != ''): ?>
<a id="issue_home_mainarea_new_button" href='#'><?php print $this->lang->line('New')?></a> <div class="actions">
<?php endif; ?> <?php printf ($this->lang->line('ISSUE_MSG_TOTAL_NUM_ISSUES'), $total_num_issues); ?> |
<a id="issue_home_mainarea_search_button" href='#'><?php print $this->lang->line('Search')?></a> <?php if (isset($login['id']) && $login['id'] != ''): ?>
<a id="issue_home_mainarea_new_button" href='#'><?php print $this->lang->line('New')?></a>
<?php endif; ?>
<a id="issue_home_mainarea_search_button" href='#'><?php print $this->lang->line('Search')?></a>
</div>
</div> </div>
<div class="result" id="issue_home_mainarea_result"> <div class="result" id="issue_home_mainarea_result">
<?php <?php
if (empty($issues)) if (empty($issues))

View File

@ -208,6 +208,11 @@ var original_file_desc = [
]; ];
$(function () { $(function () {
$('#issue_show_mainarea_state').accordion({
collapsible: true
});
<?php if (isset($login['id']) && $login['id'] != ''): ?> <?php if (isset($login['id']) && $login['id'] != ''): ?>
$('#issue_show_mainarea_edit_description_tabs').tabs (); $('#issue_show_mainarea_edit_description_tabs').tabs ();
$('#issue_show_mainarea_edit_description_tabs').bind ('tabsshow', function (event, ui) { $('#issue_show_mainarea_edit_description_tabs').bind ('tabsshow', function (event, ui) {
@ -706,46 +711,17 @@ $this->load->view (
<div class="mainarea" id="issue_show_mainarea"> <div class="mainarea" id="issue_show_mainarea">
<div class="title">
<?php print $this->lang->line('Issue')?> <?php print htmlspecialchars($issue->id)?>:
<?php print htmlspecialchars($issue->summary)?>
</div>
<div class="infostrip" id="issue_show_mainarea_infostrip">
<div class="title-band" id="issue_show_mainarea_title_band">
<div class="title">
<?php print $this->lang->line('Issue')?> <?php print htmlspecialchars($issue->id)?>:
<?php print htmlspecialchars($issue->summary)?>
</div>
<div class="actions">
<?php <?php
print $this->lang->line('Type');
print ': ';
print htmlspecialchars(
array_key_exists($issue->type, $issue_type_array)?
$issue_type_array[$issue->type]: $issue->type
);
print ' | ';
print $this->lang->line('Status');
print ': ';
print htmlspecialchars(
array_key_exists($issue->status, $issue_status_array)?
$issue_status_array[$issue->status]: $issue->status
);
print ' | ';
print $this->lang->line('Priority');
print ': ';
print htmlspecialchars(
array_key_exists($issue->priority, $issue_priority_array)?
$issue_priority_array[$issue->priority]: $issue->priority
);
if ($issue->owner != '')
{
print ' | ';
print $this->lang->line('Owner');
print ': ';
print htmlspecialchars($issue->owner);
}
if (isset($login['id']) && $login['id'] != '') if (isset($login['id']) && $login['id'] != '')
{ {
print ' | ';
print '<a id="issue_show_mainarea_edit_button" href="#">'; print '<a id="issue_show_mainarea_edit_button" href="#">';
print $this->lang->line('Edit'); print $this->lang->line('Edit');
print '</a>'; print '</a>';
@ -754,8 +730,57 @@ $this->load->view (
print '</a>'; print '</a>';
} }
?> ?>
</div>
<div style='clear: both;'></div>
</div> </div>
<div id='issue_show_mainarea_state' class='collapsible-box'>
<div id='issue_show_mainarea_state_header' class='collapsible-box-header'><?php print $this->lang->line('State')?></div>
<div id='issue_show_mainarea_state_body'>
<ul>
<?php
$type = array_key_exists($issue->type, $issue_type_array)?
$issue_type_array[$issue->type]: $issue->type;
$status = array_key_exists($issue->status, $issue_status_array)?
$issue_status_array[$issue->status]: $issue->status;
$priority = array_key_exists($issue->priority, $issue_priority_array)?
$issue_priority_array[$issue->priority]: $issue->priority;
printf ('<li class="issue-type-%s">', $issue->type);
print $this->lang->line('Type');
print ': ';
print htmlspecialchars($type);
print '</li>';
printf ('<li class="issue-status-%s">', $issue->status);
print $this->lang->line('Status');
print ': ';
print htmlspecialchars($status);
print '</li>';
printf ('<li class="issue-priority-%s">', $issue->priority);
print $this->lang->line('Priority');
print ': ';
print htmlspecialchars($priority);
print '</li>';
print '<li class="issue-owner">';
if ($issue->owner != '')
{
print $this->lang->line('Owner');
print ': ';
print htmlspecialchars($issue->owner);
print '</li>';
}
?>
</ul>
</div>
</div>
<div id="issue_show_mainarea_description"> <div id="issue_show_mainarea_description">
<pre id="issue_show_mainarea_description_pre" style="visibility: hidden"> <pre id="issue_show_mainarea_description_pre" style="visibility: hidden">
<?php print htmlspecialchars($issue->description); ?> <?php print htmlspecialchars($issue->description); ?>
@ -829,7 +854,7 @@ $this->load->view (
print '<tr>'; print '<tr>';
print '<td class="date">'; print '<td class="date">';
print date ('Y-m-d H:i:s', strtotime($new->updatedon)); print codepot_dbdatetodispdate($new->updatedon);
print '</td>'; print '</td>';
print '<td class="updater">'; print '<td class="updater">';
@ -909,7 +934,7 @@ $this->load->view (
print '<tr>'; print '<tr>';
print '<td class="date">'; print '<td class="date">';
print date ('Y-m-d H:i:s', strtotime($issue->createdon)); print codepot_dbdatetodispdate($issue->createdon);
print '</td>'; print '</td>';
print '<td class="updater">'; print '<td class="updater">';

View File

@ -159,25 +159,21 @@ $this->load->view (
foreach ($log_entries as $log) foreach ($log_entries as $log)
{ {
if ($log['type'] == 'code') if ($log['type'] == 'code') $code = $log['message'];
{
$code = $log['message'];
//$date = substr($code['time'], 0, 10); if (CODEPOT_DATABASE_STORE_GMT)
//$time = substr($code['time'], 11, 5); $createdon = $log['createdon'] . ' +0000';
$date = date ('Y-m-d', strtotime($log['createdon']));
$time = date ('h:i', strtotime($log['createdon']));
}
else else
{ $createdon = $log['createdon'];
$date = date ('Y-m-d', strtotime($log['createdon']));
$time = date ('h:i', strtotime($log['createdon'])); $tzoff = strftime ('%z', strtotime($createdon));
} $date = strftime ('%Y-%m-%d', strtotime($createdon));
$time = strftime ('%H:%M:%S', strtotime($createdon));
if ($curdate != $date) if ($curdate != $date)
{ {
print "<tr class='break'><td colspan='{$numcols}' class='break'>&nbsp;</td></tr>"; print "<tr class='break'><td colspan='{$numcols}' class='break'>&nbsp;</td></tr>";
print "<tr class='header'><td colspan='{$numcols}' class='header'>$date</td></tr>"; print "<tr class='header'><td colspan='{$numcols}' class='header'>$date ($tzoff)</td></tr>";
$curdate = $date; $curdate = $date;
$rowcount = 0; $rowcount = 0;
} }

View File

@ -107,9 +107,9 @@ $this->load->view (
<div id="project_home_sidebar_info_box" class="collapsible-box"> <div id="project_home_sidebar_info_box" class="collapsible-box">
<div id="project_home_sidebar_info_header" class="collapsible-box-header"><?php print $this->lang->line('Summary')?></div> <div id="project_home_sidebar_info_header" class="collapsible-box-header"><?php print $this->lang->line('Summary')?></div>
<ul id="project_home_sidebar_info_list" class="collapsible-box-list"> <ul id="project_home_sidebar_info_list" class="collapsible-box-list">
<li><?php print $this->lang->line('Created on')?> <?php print $project->createdon?></li> <li><?php print $this->lang->line('Created on')?> <?php print codepot_dbdatetodispdate($project->createdon);?></li>
<li><?php print $this->lang->line('Created by')?> <?php print $project->createdby?></li> <li><?php print $this->lang->line('Created by')?> <?php print $project->createdby;?></li>
<li><?php print $this->lang->line('Last updated on')?> <?php print $project->updatedon?></li> <li><?php print $this->lang->line('Last updated on')?> <?php print codepot_dbdatetodispdate($project->updatedon);?></li>
<li><?php print $this->lang->line('Last updated by')?> <?php print $project->updatedby?></li> <li><?php print $this->lang->line('Last updated by')?> <?php print $project->updatedby?></li>
</ul> </ul>
</div> </div>
@ -191,14 +191,18 @@ foreach ($urls as $url)
$xdot = $this->converter->AsciiToHex ('.'); $xdot = $this->converter->AsciiToHex ('.');
foreach ($log_entries as $log) foreach ($log_entries as $log)
{ {
if (CODEPOT_DATABASE_STORE_GMT)
$createdon = $log['createdon'] . ' +0000';
else
$createdon = $log['createdon'];
if ($log['type'] == 'code') if ($log['type'] == 'code')
{ {
$x = $log['message']; $x = $log['message'];
print '<tr class="odd">'; print '<tr class="odd">';
print '<td class="date">'; print '<td class="date">';
//print substr($x['time'], 5, 5);
print date ('m-d', strtotime($log['createdon'])); print strftime ('%m-%d', strtotime($createdon));
print '</td>'; print '</td>';
print '<td class="object">'; print '<td class="object">';
print anchor ( print anchor (
@ -240,7 +244,7 @@ foreach ($urls as $url)
{ {
print '<tr class="odd">'; print '<tr class="odd">';
print '<td class="date">'; print '<td class="date">';
print date ('m-d', strtotime($log['createdon'])); print strftime ('%m-%d', strtotime($createdon));
print '</td>'; print '</td>';
print '<td class="object">'; print '<td class="object">';

View File

@ -147,14 +147,18 @@ foreach ($latest_projects as $project)
$xdot = $this->converter->AsciiToHex ('.'); $xdot = $this->converter->AsciiToHex ('.');
foreach ($log_entries as $log) foreach ($log_entries as $log)
{ {
if (CODEPOT_DATABASE_STORE_GMT)
$createdon = $log['createdon'] . ' +0000';
else
$createdon = $log['createdon'];
if ($log['type'] == 'code') if ($log['type'] == 'code')
{ {
$x = $log['message']; $x = $log['message'];
print '<tr class="odd">'; print '<tr class="odd">';
print '<td class="date">'; print '<td class="date">';
//print substr($x['time'], 5, 5); print strftime ('%m-%d', strtotime($createdon));
print date ('m-d', strtotime($log['createdon']));
print '</td>'; print '</td>';
print '<td class="projectid">'; print '<td class="projectid">';
/* /*
@ -212,7 +216,7 @@ foreach ($latest_projects as $project)
{ {
print '<tr class="odd">'; print '<tr class="odd">';
print '<td class="date">'; print '<td class="date">';
print date ('m-d', strtotime($log['createdon'])); print strftime ('%m-%d', strtotime($createdon));
print '</td>'; print '</td>';
print '<td class="project">'; print '<td class="project">';

View File

@ -59,26 +59,8 @@ function render_wiki()
} }
$(function () { $(function () {
if ($("#wiki_show_mainarea_result_info").is(":visible")) $('#wiki_show_mainarea_metadata').accordion({
btn_label = "<?php print $this->lang->line('Hide metadata')?>"; collapsible: true
else
btn_label = "<?php print $this->lang->line('Show metadata')?>";
btn = $("#wiki_show_mainarea_metadata_button").button({"label": btn_label}).click (function () {
if ($("#wiki_show_mainarea_result_info").is(":visible"))
{
$("#wiki_show_mainarea_result_info").hide("blind",{},200);
$("#wiki_show_mainarea_metadata_button").button(
"option", "label", "<?php print $this->lang->line('Show metadata')?>");
}
else
{
$("#wiki_show_mainarea_result_info").show("blind",{},200);
$("#wiki_show_mainarea_metadata_button").button(
"option", "label", "<?php print $this->lang->line('Hide metadata')?>");
}
return false;
}); });
render_wiki (); render_wiki ();
@ -121,14 +103,51 @@ $this->load->view (
<div class="mainarea" id="wiki_show_mainarea"> <div class="mainarea" id="wiki_show_mainarea">
<div class="title"><?php print htmlspecialchars($wiki->name)?></div> <div class="title-band" id="wiki_show_mainarea_title_band">
<div class="title"><?php print htmlspecialchars($wiki->name)?></div>
<div class="infostrip" id="wiki_show_mainarea_infostrip"> <div class="actions">
<a id="wiki_show_mainarea_metadata_button" href='#'><?php print $this->lang->line('Metadata')?></a> </div>
<div style='clear: both'></div>
</div> </div>
<div id="wiki_show_mainarea_result" class="result"> <div id="wiki_show_mainarea_result" class="result">
<div id='wiki_show_mainarea_metadata' class='collapsible-box'>
<div id='wiki_show_mainarea_metadata_header' class='collapsible-box-header'><?php print $this->lang->line('Metadata')?></div>
<div id='wiki_show_mainarea_metadata_body'>
<div id='wiki_show_mainarea_metadata_list_div'>
<ul id='wiki_show_mainarea_metadata_list'>
<li><?php print $this->lang->line('Created on')?> <?php print codepot_dbdatetodispdate($wiki->createdon); ?></li>
<li><?php print $this->lang->line('Created by')?> <?php print htmlspecialchars($wiki->createdby); ?></li>
<li><?php print $this->lang->line('Last updated on')?> <?php print codepot_dbdatetodispdate($wiki->updatedon); ?></li>
<li><?php print $this->lang->line('Last updated by')?> <?php print htmlspecialchars($wiki->updatedby); ?></li>
</ul>
</div>
<div id='wiki_show_mainarea_attachment_list_div'>
<ul id='wiki_show_mainarea_attachment_list'>
<?php
foreach ($wiki->attachments as $att)
{
$hexattname = $this->converter->AsciiToHex ($att->name);
print '<li>';
print anchor (
"wiki/attachment/{$project->id}/{$hexname}/{$hexattname}",
htmlspecialchars($att->name)
);
print '</li>';
}
?>
</ul>
</div>
<div style='clear: both;'></div>
</div>
</div>
<div class="result" id="wiki_show_mainarea_wiki"> <div class="result" id="wiki_show_mainarea_wiki">
<pre id="wiki_show_mainarea_wiki_text" style="visibility: hidden"> <pre id="wiki_show_mainarea_wiki_text" style="visibility: hidden">
@ -136,36 +155,6 @@ $this->load->view (
</pre> </pre>
</div> <!-- wiki_show_mainarea_wiki --> </div> <!-- wiki_show_mainarea_wiki -->
<div id="wiki_show_mainarea_result_info" class="infobox">
<ul>
<li><?php print $this->lang->line('Created on')?> <?php print $wiki->createdon ?></li>
<li><?php print $this->lang->line('Created by')?> <?php print $wiki->createdby ?></li>
<li><?php print $this->lang->line('Last updated on')?> <?php print $wiki->updatedon ?></li>
<li><?php print $this->lang->line('Last updated by')?> <?php print $wiki->updatedby ?></li>
</ul>
<?php if (!empty($wiki->attachments)): ?>
<div class="title"><?php print $this->lang->line('WIKI_ATTACHMENTS') ?></div>
<ul>
<?php
foreach ($wiki->attachments as $att)
{
$hexattname = $this->converter->AsciiToHex ($att->name);
print '<li>';
print anchor (
"wiki/attachment/{$project->id}/{$hexname}/{$hexattname}",
htmlspecialchars($att->name)
);
print '</li>';
}
?>
</ul>
<?php endif; ?>
</div> <!-- wiki_show_mainarea_result_info -->
</div> <!-- wiki_show_mainarea_result --> </div> <!-- wiki_show_mainarea_result -->
</div> <!-- wiki_show_mainarea --> </div> <!-- wiki_show_mainarea -->

View File

@ -51,6 +51,7 @@ function load_ini ($file)
array ('database_name', 'string', ''), array ('database_name', 'string', ''),
array ('database_driver', 'string', ''), array ('database_driver', 'string', ''),
array ('database_prefix', 'string', ''), array ('database_prefix', 'string', ''),
array ('database_store_gmt', 'boolean', FALSE),
array ('auth_mysql_hostname', 'string', 'localhost'), array ('auth_mysql_hostname', 'string', 'localhost'),
array ('auth_mysql_port', 'string', ''), array ('auth_mysql_port', 'string', ''),

View File

@ -375,7 +375,7 @@ textarea {
} }
.content .mainarea .result { .content .mainarea .result {
min-height: 30em; /*min-height: 30em;*/
overflow: auto; overflow: auto;
} }
@ -706,6 +706,7 @@ textarea {
.prettyprint .fun { color: #4271ae; } .prettyprint .fun { color: #4271ae; }
} }
.content .infostrip { .content .infostrip {
font-size: 0.9em; font-size: 0.9em;
@ -725,6 +726,31 @@ textarea {
text-decoration: none; text-decoration: none;
} }
.content .title-band {
font-size: 0.9em;
background: #F0F0F0 none repeat scroll 0 0;
/*border: #D4DBE8 1px solid; */
margin: 0.3em 0em 0.5em 0em;
padding: 1em 0.5em 1em 0.5em;
text-align: right;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
}
.content .title-band a {
text-decoration: none;
}
.content .title-band .title {
float: left;
text-transform: uppercase;
font-weight: bold;
}
.content .sidebar { .content .sidebar {
font-size: 0.9em; font-size: 0.9em;
float: right; float: right;

View File

@ -5,10 +5,6 @@
overflow: auto; overflow: auto;
} }
#file_home_mainarea_result_table {
margin-top: 1em;
}
#file_home_mainarea_result_table tr { #file_home_mainarea_result_table tr {
vertical-align: middle; vertical-align: middle;
} }
@ -52,12 +48,18 @@
padding-left: 0.5em; padding-left: 0.5em;
padding-right: 0.5em; padding-right: 0.5em;
line-height: 1.5em; line-height: 1.5em;
white-space: nowrap;
} }
#file_edit_mainarea_description { #file_show_mainarea_metadata_body,
width: 100%; #file_show_mainarea_files_body {
background-color: #FCFCFC;
} }
#file_show_mainarea_metadata_body ul {
padding: 0em 0.5em 0em 0.5em;
margin: 0;
}
/*----------------------------------------------- /*-----------------------------------------------
* file home view - new file dialog * file home view - new file dialog

View File

@ -1,3 +1,96 @@
li.issue-type-defect {
background-color: #D9534F;
color: #FFFFFF;
}
li.issue-type-request {
background-color: #44AD8E;
color: #FFFFFF;
}
li.issue-type-other {
background-color: #4E8BCA;
color: #FFFFFF;
}
li.issue-status-new {
background-color: #44AD8E;
color: #FFFFFF;
}
li.issue-status-accepted {
background-color: #44AD8E;
color: #FFFFFF;
}
li.issue-status-rejected {
background-color: #AD448E;
color: #FFFFFF;
}
li.issue-status-started {
background-color: #44ADAD;
color: #FFFFFF;
}
li.issue-status-stalled {
background-color: #ADAD8E;
color: #FFFFFF;
}
li.issue-status-testing {
background-color: #44ADBB;
color: #FFFFFF;
}
li.issue-status-resolved {
background-color: #34AD56;
color: #FFFFFF;
}
li.issue-status-worked-around {
background-color: #65AD67;
color: #FFFFFF;
}
li.issue-status-other {
background-color: #888888;
color: #FFFFFF;
}
li.issue-type-other {
background-color: #4E8BCA;
color: #FFFFFF;
}
li.issue-priority-critical {
background-color: #D9534F;
color: #FFFFFF;
}
li.issue-priority-high {
background-color: #B9534F;
color: #FFFFFF;
}
li.issue-priority-medium {
background-color: #99534F;
color: #FFFFFF;
}
li.issue-priority-low {
background-color: #EEE39E;
color: #FFFFFF;
}
li.issue-priority-other {
background-color: #FFF39E;
}
li.issue-owner {
background-color: #FFF39E;
}
/*--------------------------------------------- /*---------------------------------------------
* issue home * issue home
@ -6,10 +99,6 @@
overflow: auto; overflow: auto;
} }
#issue_home_mainarea_result_table {
margin-top: 1em;
}
#issue_home_mainarea_result_table tr { #issue_home_mainarea_result_table tr {
vertical-align: text-top; vertical-align: text-top;
} }
@ -82,6 +171,23 @@
/*--------------------------------------------- /*---------------------------------------------
* issue show * issue show
*---------------------------------------------*/ *---------------------------------------------*/
#issue_show_mainarea_state_body {
background-color: #FCFCFC;
padding: 1em 1em;
}
#issue_show_mainarea_state_body ul {
padding: 0;
margin: 0;
list-style: outside none none;
}
#issue_show_mainarea_state_body ul li {
padding: 0.2em 0.2em 0.2em 0.2em;
margin: 0 0.2em 0 0.2em;
float: left;
}
#issue_show_mainarea_change_form { #issue_show_mainarea_change_form {
} }

View File

@ -7,6 +7,8 @@
} }
#wiki_show_mainarea_wiki { #wiki_show_mainarea_wiki {
margin-top: 0.5em;
-moz-column-rule: 1px dotted grey; -moz-column-rule: 1px dotted grey;
-webkit-column-rule: 1px dotted grey; -webkit-column-rule: 1px dotted grey;
column-rule: 1px dotted grey; column-rule: 1px dotted grey;
@ -16,6 +18,37 @@
column-gap: 2em; column-gap: 2em;
} }
#wiki_show_mainarea_metadata_body {
background-color: #FCFCFC;
}
#wiki_show_mainarea_metadata_body ul {
padding: 0em 0.5em 0em 0.5em;
margin: 0;
}
#wiki_show_mainarea_metadata_list_div {
float: left;
}
#wiki_show_mainarea_attachment_list_div {
margin-left: 2em;
float: left;
}
#wiki_show_mainarea_attachment_list {
}
#wiki_show_mainarea_attachment_list a,
#wiki_show_mainarea_attachment_list a:visited,
#wiki_show_mainarea_attachment_list a:focus {
text-decoration: none;
color: #111111;
}
#wiki_show_mainarea_attachment_list a:hover {
background-color: #1C94C4;
color: #FFFFFF;
}
/*--------------------------------------------- /*---------------------------------------------
* wiki edit * wiki edit
*---------------------------------------------*/ *---------------------------------------------*/