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

* adjust the ui of the obtain page of extension module.

Browse Source
This commit is contained in:
wangchunsheng
2011-10-22 05:54:13 +00:00
parent 78daefb38b
commit 559eb7f492
4 changed files with 61 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/extension/css/common.css
+4
View File
@@ -2,3 +2,7 @@
.button-c {padding:1px 3px; border:1px solid gray; background:#e4e4ef; color:black; text-decoration:none}
.error {color:red; font-size:14px}
.success {color:green; font-size:14px}
.table-1 td {padding:10px 0 0 10px}
.table-1 caption{background:#e4e4e4; border-color:gray; margin-left:0}
.table-1{border-color:gray; border-top:none;}
module/extension/lang/en.php
+2
View File
@@ -18,6 +18,7 @@ $lang->extension->uninstall = 'Uninstall';
$lang->extension->activate = 'Activate';
$lang->extension->deactivate = 'Deactivate';
$lang->extension->obtain = 'Obtain';
$lang->extension->view = 'Info';
$lang->extension->download = 'Download';
$lang->extension->downloadAB = 'Down';
$lang->extension->upload = 'Upload and install';
@@ -71,6 +72,7 @@ $lang->extension->viewInstalled = 'View installed extensions.';
$lang->extension->viewAvailable = 'View available extensions';
$lang->extension->viewDeactivated = 'View deactivated extensions';
$lang->extension->errorOccurs = 'Error:';
$lang->extension->errorGetModules = "Get extensions' categories data from the www.zentao.net failed. ";
$lang->extension->errorGetExtensions = 'Get extensions from www.zentao.net failed. You can visit <a href="http://www.zentao.net/extension/" target="_blank">www.zentao.net</a> to find your extensions, download it manually and then upload to zentaopms to install it.';
$lang->extension->errorDownloadPathNotFound = 'The save path of package file <strong>%s</strong>does not exists.<br />For linux users, can execute <strong>mkdir -p %s</strong> to fix it.';
module/extension/lang/zh-cn.php
+4 -2
View File
@@ -18,9 +18,10 @@ $lang->extension->uninstall = '卸载';
$lang->extension->activate = '激活';
$lang->extension->deactivate = '禁用';
$lang->extension->obtain = '获得插件';
$lang->extension->view = '详情';
$lang->extension->download = '下载插件';
$lang->extension->downloadAB = '下载';
$lang->extension->upload = '上传安装';
$lang->extension->upload = '本地安装';
$lang->extension->erase = '清除';
$lang->extension->upgrade = '升级';
@@ -40,7 +41,7 @@ $lang->extension->site = '官网';
$lang->extension->addedTime = '添加时间';
$lang->extension->updatedTime = '更新时间';
$lang->extension->downloads = '下载量';
$lang->extension->public = '直接下载';
$lang->extension->public = '下载方式';
$lang->extension->compatible = '兼容性';
$lang->extension->publicList[0] = '手工下载';
@@ -71,6 +72,7 @@ $lang->extension->viewInstalled = '查看已安装插件';
$lang->extension->viewAvailable = '查看可安装插件';
$lang->extension->viewDeactivated = '查看已禁用插件';
$lang->extension->errorOccurs = '错误：';
$lang->extension->errorGetModules = '从www.zentao.net获得插件分类失败。可能是因为网络方面的原因，请检查后重新刷新页面。';
$lang->extension->errorGetExtensions = '从www.zentao.net获得插件失败。可能是因为网络方面的原因，您可以到<a href="http://www.zentao.net/extension/" target="_blank">www.zentao.net</a>手工下载插件，然后上传安装。';
$lang->extension->errorDownloadPathNotFound = '插件下载存储路径<strong>%s</strong>不存在。<br />linux下面请执行命令：<strong>mkdir -p %s</strong>来修正。';
module/extension/view/obtain.html.php
+51 -68
View File
@@ -26,9 +26,7 @@
<div class='box-title'><?php echo $lang->extension->bySearch;?></div>
<div class='box-content a-center'>
<form method='post' action='<?php echo inlink('obtain', 'type=bySearch');?>'>
<?php
echo html::input('key', $this->post->key, "class='text-1'") . html::submitButton($lang->extension->bySearch);
?>
<?php echo html::input('key', $this->post->key, "class='text-1'") . html::submitButton($lang->extension->bySearch);?>
</form>
</div>
<div class='box-title'><?php echo $lang->extension->byCategory;?></div>
@@ -38,76 +36,61 @@
</td>
<td class='divider'></td>
<td>
<table class='table-1 tablesorter'>
<?php if($extensions):?>
<thead>
<tr class='colhead'>
<th class='w-id'><?php echo $lang->extension->id;?></th>
<th class='w-150px'><?php echo $lang->extension->name;?></th>
<th class='w-50px'><?php echo $lang->extension->code;?></th>
<th class='w-50px'><?php echo $lang->extension->version;?></th>
<th><?php echo $lang->extension->abstract;?></th>
<th><?php echo $lang->extension->author;?></th>
<th class='w-id'><?php echo $lang->extension->downloads;?></th>
<th class='w-80px'><?php echo $lang->extension->public;?></th>
<th class='w-50px'><?php echo $lang->extension->compatible;?></th>
<th class='w-150px'><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>
<?php foreach($extensions as $extension):?>
<tr class='a-center'>
<td class='strong'><?php echo $extension->id;?></td>
<td class='a-left'><?php echo html::a($extension->viewLink, $extension->name, '', 'class=extension');?></td>
<td class='a-left'><?php echo $extension->code;?></td>
<td><?php echo $extension->releaseVersion;?></td>
<td class='a-left'><?php echo $extension->abstract;?></td>
<td><?php echo $extension->author;?></td>
<td><?php echo $extension->downloads;?></td>
<td><?php echo $lang->extension->publicList[$extension->public];?></td>
<td><?php echo $lang->extension->compatibleList[$extension->compatible];?></td>
<td class='a-right'>
<?php
$installLink = inlink('install', "extension=$extension->code&downLink=" . helper::safe64Encode($extension->downLink) . "&md5=$extension->md5&type=$extension->type&&overridePackage=no&ignoreCompitable=yes");
$downLinkClass = 'manual';
if($extension->public)
{
if($extension->type != 'computer' and $extension->type != 'mobile')
{
if(isset($installeds[$extension->code]))
{
if($installeds[$extension->code]->version != $extension->releaseVersion)
{
$upgradeLink = inlink('upgrade', "extension=$extension->code&downLink=" . helper::safe64Encode($extension->downLink) . "&md5=$extension->md5&type=$extension->type");
echo html::a($upgradeLink, $lang->extension->upgrade, '', 'class="iframe button-c"');
}
else
{
echo html::commonButton($lang->extension->installed, 'disabled=true');
}
}
else
{
$label = $extension->compatible ? $lang->extension->installAuto : $lang->extension->installForce;
echo html::a($installLink, $label, '', 'class="iframe button-c"');
$downLinkClass = 'manual';
}
}
}
echo html::a($extension->downLink, $lang->extension->downloadAB, '', 'class="manual button-c"');
echo html::a($extension->site, $lang->extension->site, '_blank', 'class=button-c');
<?php foreach($extensions as $extension):?>
<table class='table-1'>
<caption><?php echo "#$extension->id $extension->name";?></caption>
<tr valign='middle'>
<td>
<div class='mb-10px'><?php echo $extension->abstract;?></div>
<div>
<?php
echo "{$lang->extension->version}: <i>{$extension->releaseVersion}</i> ";
echo "{$lang->extension->author}: <i>{$extension->author}</i> ";
echo "{$lang->extension->downloads}: <i><strong>{$extension->downloads}</strong></i> ";
echo "{$lang->extension->public}: <i>{$lang->extension->publicList[$extension->public]}</i> ";
echo "{$lang->extension->compatible}: <i><strong>{$lang->extension->compatibleList[$extension->compatible]}</strong></i> ";
?>
</div>
</td>
<td class='w-200px a-left'>
<?php
$installLink = inlink('install', "extension=$extension->code&downLink=" . helper::safe64Encode($extension->downLink) . "&md5=$extension->md5&type=$extension->type&&overridePackage=no&ignoreCompitable=yes");
echo html::a($extension->viewLink, $lang->extension->view, '', 'class="button-c extension"');
if($extension->public)
{
if($extension->type != 'computer' and $extension->type != 'mobile')
{
if(isset($installeds[$extension->code]))
{
if($installeds[$extension->code]->version != $extension->releaseVersion)
{
$upgradeLink = inlink('upgrade', "extension=$extension->code&downLink=" . helper::safe64Encode($extension->downLink) . "&md5=$extension->md5&type=$extension->type");
echo html::a($upgradeLink, $lang->extension->upgrade, '', 'class="iframe button-c"');
}
else
{
echo html::commonButton($lang->extension->installed, "disabled='disabled' style='color:gray'");
}
}
else
{
$label = $extension->compatible ? $lang->extension->installAuto : $lang->extension->installForce;
echo html::a($installLink, $label, '', 'class="iframe button-c"');
}
}
}
echo html::a($extension->downLink, $lang->extension->downloadAB, '', 'class="manual button-c"');
echo html::a($extension->site, $lang->extension->site, '_blank', 'class=button-c');
?>
</td>
</tr>
</td></tr>
</table>
<?php endforeach;?>
</tbody>
<tfoot>
<tr><td class='a-right' colspan='10'><?php if($pager) $pager->show();?></td></tr>
</tfoot>
<?php if($pager) $pager->show();?>
<?php else:?>
<tr><td><?php echo $lang->extension->errorGetExtensions;?></td></tr>
<div class='box-title'><?php echo $lang->extension->errorOccurs;?></div>
<div class='box-content'><?php echo $lang->extension->errorGetExtensions;?></div>
<?php endif;?>
</table>
</td>
</tr>
</table>