Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'master' of git@github.com:easysoft/zentaopms

Browse Source
This commit is contained in:
wyd621
2013-09-05 14:14:56 +08:00
parent ca105a77ee e33122c70a
commit 3d8e60309f
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/git/model.php
+2 -2
View File
@@ -556,8 +556,8 @@ class gitModel extends model
foreach($actionFiles as $file)
{
$param = array('url' => helper::safe64Encode($repoRoot . $file), 'revision' => $log->revision);
$catLink = trim(html::a(helper::createLink('git', 'cat', $param, 'html'), 'view', '', "class='gitlink'"));
$diffLink = trim(html::a(helper::createLink('git', 'diff', $param, 'html'), 'diff', '', "class='gitlink'"));
$catLink = trim(html::a(helper::createLink('git', 'cat', $param, 'html'), 'view', '', "class='repolink'"));
$diffLink = trim(html::a(helper::createLink('git', 'diff', $param, 'html'), 'diff', '', "class='repolink'"));
$diff .= $action . " " . $file . " $catLink ";
$diff .= $action == 'M' ? "$diffLink\n" : "\n" ;
}
module/svn/model.php
+2 -2
View File
@@ -549,8 +549,8 @@ class svnModel extends model
foreach($actionFiles as $file)
{
$param = array('url' => helper::safe64Encode($repoRoot . $file), 'revision' => $log->revision);
$catLink = trim(html::a(helper::createLink('svn', 'cat', $param, 'html'), 'view', '', "class='svnlink'"));
$diffLink = trim(html::a(helper::createLink('svn', 'diff', $param, 'html'), 'diff', '', "class='svnlink'"));
$catLink = trim(html::a(helper::createLink('svn', 'cat', $param, 'html'), 'view', '', "class='repolink'"));
$diffLink = trim(html::a(helper::createLink('svn', 'diff', $param, 'html'), 'diff', '', "class='repolink'"));
$diff .= $action . " " . $file . " $catLink ";
$diff .= $action == 'M' ? "$diffLink\n" : "\n" ;
}
www/js/my.full.js
+4 -4
View File
@@ -531,14 +531,14 @@ function setImageSize(image, maxWidth)
}
/**
* Set the subversion link.
* Set the repo link.
*
* @access public
* @return void
*/
function setSubversionLink()
function setRepoLink()
{
if($('.svnlink').size()) $('.svnlink').colorbox({width:960, height:600, iframe:true, transition:'elastic', speed:350, scrolling:true});
if($('.repolink').size()) $('.repolink').colorbox({width:960, height:600, iframe:true, transition:'elastic', speed:350, scrolling:true});
}
/* Set the colorbox of export. */
@@ -917,7 +917,7 @@ $(document).ready(function()
setAbout();
setQRCode();
setExport();
setSubversionLink();
setRepoLink();
autoCheck();
toggleSearch();