diff --git a/module/common/view/datatable.fix.html.php b/module/common/view/datatable.fix.html.php index 9f330d654f..ad2b9f087a 100644 --- a/module/common/view/datatable.fix.html.php +++ b/module/common/view/datatable.fix.html.php @@ -10,7 +10,7 @@ $(function() $btnToolbar.append("'>datatable->datatable?>"); $btnToolbar.append(""); - $('#sidebar .cell .text-center').append("datatable->showModule?>
"); + $('#sidebar .cell .text-center:last').append("datatable->showModule?>
"); $('#tableCustomBtn').modalTrigger(); $("a[data-toggle='showModuleModal']").click(function(){$('#showModuleModal').modal('show')}); diff --git a/module/extension/css/common.css b/module/extension/css/common.css index 7d8d1fce02..dadff1228d 100644 --- a/module/extension/css/common.css +++ b/module/extension/css/common.css @@ -2,3 +2,5 @@ .alert {width: 100%; display: table;} code{padding-left:0px;} .alert.with-icon .icon-ok-sign, .alert.with-icon .icon-info-sign{padding-top:18px;vertical-align:top;} +.detail-actions{margin-top:10px;} +.detail-actions .pull-right{margin-top:-10px;} diff --git a/module/extension/lang/en.php b/module/extension/lang/en.php index 895ecd3bd8..14abd7cf07 100644 --- a/module/extension/lang/en.php +++ b/module/extension/lang/en.php @@ -106,8 +106,8 @@ $lang->extension->errorPackageFileExists = '%s has existe $lang->extension->errorDownloadFailed = 'Download failed. Please try it again. If still not OK, try to download it manually and upload it to install.'; $lang->extension->errorMd5Checking = 'Incomplete File. Please download it again. If still not OK, try to download it manually and upload it to install.'; $lang->extension->errorExtracted = 'Unzip %s failed. It could be an invailid zip file. Error:
%s'; -$lang->extension->errorCheckIncompatible = 'It is incompatible with this versiosn of ZenTao. %sed it and you might not be able to use it.

Choose Force %s or Cancel

'; -$lang->extension->errorFileConflicted = '
%s

is conflicted with others. Choose Override or Cancel

'; +$lang->extension->errorCheckIncompatible = 'It is incompatible with this versiosn of ZenTao. %sed it and you might not be able to use it.
Choose Force %s or Cancel
'; +$lang->extension->errorFileConflicted = '
%s
is conflicted with others. Choose Override or Cancel
'; $lang->extension->errorPackageNotFound = '%s is not found. Downloading might be failed. Please download it again.'; $lang->extension->errorTargetPathNotWritable = '%s is not writable.'; $lang->extension->errorTargetPathNotExists = '%s is not found.'; diff --git a/module/extension/lang/zh-cn.php b/module/extension/lang/zh-cn.php index 42d0cec101..0490bcfcb6 100644 --- a/module/extension/lang/zh-cn.php +++ b/module/extension/lang/zh-cn.php @@ -106,8 +106,8 @@ $lang->extension->errorPackageFileExists = '下载路径已经有一个名 $lang->extension->errorDownloadFailed = '下载失败，请重新下载。如果多次重试还不行，请尝试手工下载，然后通过上传功能上传。'; $lang->extension->errorMd5Checking = '下载文件不完整，请重新下载。如果多次重试还不行，请尝试手工下载，然后通过上传功能上传。'; $lang->extension->errorExtracted = '包文件 %s 解压缩失败，可能不是一个有效的zip文件。错误信息如下：
%s'; -$lang->extension->errorCheckIncompatible = '该插件与禅道版本不兼容，%s后可能无法使用。

您可以选择 强制%s 或者 取消

'; -$lang->extension->errorFileConflicted = '有以下文件冲突：
%s

您可以选择 覆盖 或者 取消

'; +$lang->extension->errorCheckIncompatible = '该插件与禅道版本不兼容，%s后可能无法使用。
您可以选择 强制%s 或者 取消
'; +$lang->extension->errorFileConflicted = '有以下文件冲突：
%s
您可以选择 覆盖 或者 取消
'; $lang->extension->errorPackageNotFound = '包文件 %s 没有找到，可能是因为自动下载失败。您可以尝试再次下载。'; $lang->extension->errorTargetPathNotWritable = '目标路径 %s 不可写。'; $lang->extension->errorTargetPathNotExists = '目标路径 %s 不存在。'; diff --git a/module/extension/view/activate.html.php b/module/extension/view/activate.html.php index 577aa23d8a..b2e5962654 100644 --- a/module/extension/view/activate.html.php +++ b/module/extension/view/activate.html.php @@ -11,23 +11,27 @@ */ ?> -
-
- icons['extension']);?> +
+
+
+

+ icons['extension']);?> +

+
+ +
+
+
+ +
+
+

+
+

extension->viewInstalled, 'onclick=parent.location.href="' . inlink('browse', 'type=installed') . '"');?>

+
+
+
- -
-
-
- -
-
-

-
-

extension->viewInstalled, 'onclick=parent.location.href="' . inlink('browse', 'type=installed') . '"');?>

-
-
- diff --git a/module/extension/view/browse.html.php b/module/extension/view/browse.html.php index 2120e7145e..d666592d48 100644 --- a/module/extension/view/browse.html.php +++ b/module/extension/view/browse.html.php @@ -11,53 +11,57 @@ */ ?> -
- -
-
name;?>
-
desc;?>
-
-
-
- code"), $lang->extension->structure, '', "class='btn iframe'"); - $deactivateCode = html::a(inlink('deactivate', "extension=$extension->code"), $lang->extension->deactivate, '', "class='btn iframe'"); - $activateCode = html::a(inlink('activate', "extension=$extension->code"), $lang->extension->activate, '', "class='btn iframe'"); - $uninstallCode = html::a(inlink('uninstall', "extension=$extension->code"), $lang->extension->uninstall, '', "class='btn iframe'"); - $installCode = html::a(inlink('install', "extension=$extension->code"), $lang->extension->install, '', "class='btn iframe'"); - $eraseCode = html::a(inlink('erase', "extension=$extension->code"), $lang->extension->erase, '', "class='btn iframe'"); - - if(isset($extension->viewLink)) - { - echo html::a($extension->viewLink, $lang->extension->view, '', "class='btn extension'"); - } - if($extension->status == 'installed') - { - echo $structureCode; - } - if($extension->status == 'installed' and !empty($extension->upgradeLink)) - { - echo html::a($extension->upgradeLink, $lang->extension->upgrade, '', "class='btn iframe'"); - } - - if($extension->type != 'patch') - { - if($extension->status == 'installed') echo $deactivateCode . $uninstallCode; - if($extension->status == 'deactivated') echo $activateCode . $uninstallCode; - if($extension->status == 'available') echo $installCode . $eraseCode; - } - echo html::a($extension->site, $lang->extension->site, '_blank', 'class=btn'); - ?> +
+
+ +
+
+
name;?>
+
desc;?>
+
+
+
+ code"), $lang->extension->structure, '', "class='btn iframe'"); + $deactivateCode = html::a(inlink('deactivate', "extension=$extension->code"), $lang->extension->deactivate, '', "class='btn iframe'"); + $activateCode = html::a(inlink('activate', "extension=$extension->code"), $lang->extension->activate, '', "class='btn iframe'"); + $uninstallCode = html::a(inlink('uninstall', "extension=$extension->code"), $lang->extension->uninstall, '', "class='btn iframe'"); + $installCode = html::a(inlink('install', "extension=$extension->code"), $lang->extension->install, '', "class='btn iframe'"); + $eraseCode = html::a(inlink('erase', "extension=$extension->code"), $lang->extension->erase, '', "class='btn iframe'"); + + if(isset($extension->viewLink)) + { + echo html::a($extension->viewLink, $lang->extension->view, '', "class='btn extension'"); + } + if($extension->status == 'installed') + { + echo $structureCode; + } + if($extension->status == 'installed' and !empty($extension->upgradeLink)) + { + echo html::a($extension->upgradeLink, $lang->extension->upgrade, '', "class='btn iframe'"); + } + + if($extension->type != 'patch') + { + if($extension->status == 'installed') echo $deactivateCode . $uninstallCode; + if($extension->status == 'deactivated') echo $activateCode . $uninstallCode; + if($extension->status == 'available') echo $installCode . $eraseCode; + } + echo html::a($extension->site, $lang->extension->site, '_blank', 'class=btn'); + ?> +
+
+ extension->version}: {$extension->version} "; + echo "{$lang->extension->author}: {$extension->author} "; + $expireDate = $this->extension->getExpireDate($extension); + if(!empty($expireDate)) echo "{$lang->extension->expireDate}: {$expireDate}"; + ?> +
- extension->version}: {$extension->version} "; - echo "{$lang->extension->author}: {$extension->author} "; - $expireDate = $this->extension->getExpireDate($extension); - if(!empty($expireDate)) echo "{$lang->extension->expireDate}: {$expireDate}"; - ?> +
-
-
diff --git a/module/extension/view/checkscore.html.php b/module/extension/view/checkscore.html.php index 4e4afa2268..02b10d2973 100644 --- a/module/extension/view/checkscore.html.php +++ b/module/extension/view/checkscore.html.php @@ -11,22 +11,24 @@ */ ?> -
-
- icons['extension']);?> - +
+
+
+

+ icons['extension']);?> + +

+
+ +
+ +
+

extension->needSorce;?>

+

+
+
+
- -
- -
-

extension->needSorce;?>

-

-
-
- - - diff --git a/module/extension/view/deactivate.html.php b/module/extension/view/deactivate.html.php index be21a09d44..120c68221b 100644 --- a/module/extension/view/deactivate.html.php +++ b/module/extension/view/deactivate.html.php @@ -11,21 +11,25 @@ */ ?> -
-
- icons['extension']);?> -
-
-
-

- -
-

extension->unremovedFiles;?>

- ');?> +
+
+
+

+ icons['extension']);?> +

- -
-

extension->viewDeactivated, 'onclick=parent.location.href="' . inlink('browse', 'type=deactivated') . '"');?>

+
+

+ +
+

extension->unremovedFiles;?>

+ ');?> +
+ +
+

extension->viewDeactivated, 'onclick=parent.location.href="' . inlink('browse', 'type=deactivated') . '"');?>

+
+
diff --git a/module/extension/view/erase.html.php b/module/extension/view/erase.html.php index ef6736da66..dce8a60375 100644 --- a/module/extension/view/erase.html.php +++ b/module/extension/view/erase.html.php @@ -11,22 +11,26 @@ */ ?> -
-
- icons['extension']);?> - - extension->erase;?> -
-
-
- -
-

- -

extension->unremovedFiles;?>

-

');?>

- -

extension->viewAvailable, 'onclick=parent.location.href="' . inlink('browse', 'type=available') . '"');?>

+
+
+
+

+ icons['extension']);?> + + extension->erase;?> +

+
+
+ +
+

+ +

extension->unremovedFiles;?>

+

');?>

+ +

extension->viewAvailable, 'onclick=parent.location.href="' . inlink('browse', 'type=available') . '"');?>

+
+
diff --git a/module/extension/view/install.html.php b/module/extension/view/install.html.php index 757a76a457..c321e49d25 100644 --- a/module/extension/view/install.html.php +++ b/module/extension/view/install.html.php @@ -11,55 +11,59 @@ */ ?> -
-
- - - - extension->upgradeVersion, $this->post->installedVersion, $this->post->upgradeVersion); - ?> - +
+
+
+

+ + + + extension->upgradeVersion, $this->post->installedVersion, $this->post->upgradeVersion); + ?> + +

+
+ +
+
+
extension->installFailed, $installType);?>
+

+
+
+ extension->refreshPage, 'onclick=location.href=location.href');?> +
+ +
+
+
extension->license;?>
+

+ extension->agreeLicense, '', "class='btn btn-primary'");?> +
+
+ +
+
extension->installFinished, $installType);?>
+
+ extension->viewInstalled, 'onclick=parent.location.href="' . inlink('browse') . '" class="btn btn-success"');?> +
+
+
+ {$lang->extension->successDownloadedPackage}"; + echo "
{$lang->extension->successCopiedFiles}
"; + echo '
    '; + foreach($files as $fileName => $md5) + { + echo "
  • $fileName
    • "; + } + echo '
'; + echo "
{$lang->extension->successInstallDB}
"; + ?> +
+
+
- -
-
-
extension->installFailed, $installType);?>
-

-
-
- extension->refreshPage, 'onclick=location.href=location.href');?> -
- -
-
-
extension->license;?>
-

- extension->agreeLicense, '', "class='btn btn-primary'");?> -
-
- -
-
extension->installFinished, $installType);?>
-
- extension->viewInstalled, 'onclick=parent.location.href="' . inlink('browse') . '" class="btn btn-success"');?> -
-
-
- {$lang->extension->successDownloadedPackage}"; - echo "
{$lang->extension->successCopiedFiles}
"; - echo '
    '; - foreach($files as $fileName => $md5) - { - echo "
  • $fileName
    • "; - } - echo '
'; - echo "
{$lang->extension->successInstallDB}
"; - ?> -
-
- diff --git a/module/extension/view/obtain.html.php b/module/extension/view/obtain.html.php index 705ff316d1..fad00824b2 100644 --- a/module/extension/view/obtain.html.php +++ b/module/extension/view/obtain.html.php @@ -11,136 +11,140 @@ */ ?> -
-
'> -
- post->key, "class='form-control' placeholder='{$lang->extension->bySearch}' autocomplete='off'");?> - - ', '', 'btn'); ?> - -
-
-
- extension->byUpdatedTime, '', "class='list-group-item' id='byupdatedtime'"); - echo html::a(inlink('obtain', 'type=byAddedTime'), $lang->extension->byAddedTime, '', "class='list-group-item' id='byaddedtime'"); - echo html::a(inlink('obtain', 'type=byDownloads'), $lang->extension->byDownloads, '', "class='list-group-item' id='bydownloads'"); - ?> -
-
-
extension->byCategory;?>
-
- extension->errorGetModules);?> -
-
-
-
- -
- - currentRelease; - $latestRelease = isset($extension->latestRelease) ? $extension->latestRelease : ''; - ?> -
-
- - releaseVersion != $currentRelease->releaseVersion) - { - printf($lang->extension->latest, $latestRelease->viewLink, $latestRelease->releaseVersion, $latestRelease->zentaoCompatible); - }?> - -
- name . "($currentRelease->releaseVersion)";?> - '>extension->obtainOfficial[$extension->offcial];?> -
-
-
- abstract;?> -
-
-
- extension->author}: {$extension->author} "; - echo "{$lang->extension->downloads}: {$extension->downloads} "; - echo "{$lang->extension->compatible}: {$lang->extension->compatibleList[$currentRelease->compatible]} "; - - echo " {$lang->extension->depends}: "; - if(!empty($currentRelease->depends)) - { - foreach(json_decode($currentRelease->depends, true) as $code => $limit) - { - echo $code; - if($limit != 'all') - { - echo '('; - if(!empty($limit['min'])) echo '>= v' . $limit['min']; - if(!empty($limit['max'])) echo '<= v' . $limit['min']; - echo ')'; - } - echo ' '; - } - } - ?> +
+