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

fixed some bugs in the fulldiff view

Browse Source
This commit is contained in:
hyung-hwan 2015-01-30 05:54:18 +00:00
parent 5b691e780f
commit db114f4aa4
5 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
codepot/src/codepot/controllers/code.php
View File

@ -399,7 +399,7 @@ class Code extends Controller
{ {
$data['message'] = 'DATABASE ERROR'; $data['message'] = 'DATABASE ERROR';
$this->load->view ($this->VIEW_ERROR, $data); $this->load->view ($this->VIEW_ERROR, $data);
} }
else if ($project === NULL) else if ($project === NULL)
{ {
$data['message'] = $data['message'] =
@ -425,9 +425,9 @@ class Code extends Controller
else else
{ {
$file['prev_rev'] = $file['prev_rev'] =
$this->subversion->getPrevRev ($projectid, $path, $file['created_rev']); $this->subversion->getPrevRev ($projectid, $path, $file['created_rev']);
$file['next_rev'] = $file['next_rev'] =
$this->subversion->getNextRev ($projectid, $path, $file['created_rev']); $this->subversion->getNextRev ($projectid, $path, $file['created_rev']);
$file['against']['prev_rev'] = $file['against']['prev_rev'] =
$this->subversion->getPrevRev ($projectid, $path, $file['against']['created_rev']); $this->subversion->getPrevRev ($projectid, $path, $file['against']['created_rev']);
$file['against']['next_rev'] = $file['against']['next_rev'] =

13
codepot/src/codepot/models/subversionmodel.php
View File

@ -540,7 +540,6 @@ class SubversionModel extends Model
return $listing; return $listing;
} }
// //
// Given a path name at the HEAD revision, it compares the file // Given a path name at the HEAD revision, it compares the file
// between two revisions given. The actual path name at a given // between two revisions given. The actual path name at a given
@ -645,9 +644,15 @@ class SubversionModel extends Model
if ($full) if ($full)
{ {
$src1 = @svn_cat ($info2[0]['url'], $info2[0]['revision']); $old_text = @svn_cat ($info2[0]['url'], $info2[0]['revision']);
$src2 = @svn_cat ($info1[0]['url'], $info1[0]['revision']); if ($old_text === FALSE)
$fileinfo['content'] = $this->_get_diff ($diff, $src1, $src2, TRUE, FALSE); {
// if the old URL can't give the contents,
// try it with the latest url and the old revision number
$old_text = @svn_cat ($info1[0]['url'], $info2[0]['revision']);
}
$new_text = @svn_cat ($info1[0]['url'], $info1[0]['revision']);
$fileinfo['content'] = $this->_get_diff ($diff, $old_text, $new_text, TRUE, FALSE);
} }
else else
{ {

8
codepot/src/codepot/views/code_diff.php
View File

@ -114,8 +114,8 @@ $this->load->view (
print anchor ( print anchor (
"code/history/{$project->id}{$revtrailer}", "code/history/{$project->id}{$revtrailer}",
$this->lang->line('History')); $this->lang->line('History'));
} }
else else
{ {
print anchor ( print anchor (
"code/history/{$project->id}/{$xpar}", "code/history/{$project->id}/{$xpar}",
@ -157,7 +157,7 @@ function format_diff ($a, $b, $css_class)
} }
else else
{ {
if ($diffstart < 0) $diffstart = $i; if ($diffstart < 0) $diffstart = $i;
} }
} }
@ -171,7 +171,7 @@ function format_diff ($a, $b, $css_class)
{ {
if ($alen > $blen) if ($alen > $blen)
{ {
$cc .= htmlspecialchars(substr ($a, $alen, $alen - $blen)); $cc .= htmlspecialchars(substr ($a, $blen, $alen - $blen));
} }
} }

2
codepot/src/codepot/views/taskbar.php
View File

@ -20,7 +20,7 @@ function show_taskbar ($con, $login)
if ($icon_image) if ($icon_image)
{ {
$icon_src = sprintf ( $icon_src = sprintf (
'<img style="vertical-align:middle;" src="data:%s;base64,%s" alt="" />', '<img class="user_icon_img" src="data:%s;base64,%s" alt="" />',
mime_content_type($icon_path), mime_content_type($icon_path),
base64_encode($icon_image) base64_encode($icon_image)
); );

17
codepot/src/css/common.css
View File

@ -46,22 +46,31 @@ body {
} }
.content .taskbar { .content .taskbar {
font-size: 0.9em; font-size: 1em;
font-weight: bold; /*font-weight: bold;*/
text-transform: uppercase; text-transform: uppercase;
padding: 0.6em 0.2em 0.6em 0.2em; padding: 0.5em 0.2em 0.5em 0.2em;
color: #ffffff; color: #ffffff;
background-color: #203150; background-color: #203150;
line-height: 2em;
vertical-align: middle;
} }
.content .taskbar .boxa { .content .taskbar .boxa {
/*vertical-align: bottom;*/ /*vertical-align: bottom;*/
float: none;
} }
.content .taskbar .boxb { .content .taskbar .boxb {
float: right; float: right;
} }
.content .taskbar .boxb .user_icon_img {
height: 2em; /* as large as line-height of taskbar */
vertical-align: middle;
}
.content .taskbar a { .content .taskbar a {
text-decoration: none; text-decoration: none;
color: #ffffff; color: #ffffff;
@ -105,7 +114,7 @@ body {
.content .projectbar { .content .projectbar {
/*margin: 0.1em 0em 0em 0em;*/ /*margin: 0.1em 0em 0em 0em;*/
padding: 0.2em 0.2em 0.2em 0.2em; padding: 0.5em 0.5em 0.5em 0.5em;
color: #FFFFFF; color: #FFFFFF;
background-color: #4665A2; background-color: #4665A2;
} }