fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-06 10:11:38 +09:00
Code Issues Projects Releases Packages Wiki Activity

fix minor bugs

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/sandbox@6932 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
haneul 2009-11-11 08:17:33 +00:00
parent f7cbed05d2
commit c17dc6c058
7 changed files with 26 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
modules/autoinstall/autoinstall.admin.view.php
View file

@ -56,6 +56,8 @@
function dispAutoinstallAdminInstall() {
$package_srl = Context::get('package_srl');
if(!$package_srl) return $this->dispAutoinstallAdminIndex();
$ftp_info = Context::getFTPInfo();
if(!$ftp_info->ftp_root_path) Context::set('show_ftp_note', true);
$params["act"] = "getResourceapiInstallInfo";
$params["package_srl"] = $package_srl;
@ -70,6 +72,7 @@
$package->title = $xmlPackage->title->body;
$package->package_description = $xmlPackage->package_description->body;
$package->version = $xmlPackage->version->body;
$package->path = $xmlPackage->path->body;
if($xmlPackage->depends)
{
if(!is_array($xmlPackage->depends->item)) $xmlPackage->depends->item = array($xmlPackage->depends->item);
@ -80,6 +83,7 @@
$dep_item->package_srl = $item->package_srl->body;
$dep_item->title = $item->title->body;
$dep_item->version = $item->version->body;
$dep_item->path = $item->path->body;
$package->depends[] = $dep_item;
$targetpackages[$dep_item->package_srl] = 1;
}
@ -121,7 +125,8 @@
function dispAutoinstallAdminIndex() {
$oModuleModel = &getModel('module');
$config = $oModuleModel->getModuleConfig('autoinstall');
if(!$config || !$config->ftp_root_path) Context::set('show_ftp_note', true);
$ftp_info = Context::getFTPInfo();
if(!$ftp_info->ftp_root_path) Context::set('show_ftp_note', true);
$this->setTemplateFile('index');

2
modules/autoinstall/lang/en.lang.php
View file

@ -25,4 +25,6 @@
$lang->require_update = "Update is required.";
$lang->require_installation = "Installation is required.";
$lang->description_install = "Installation process also install/update programs which this program depends on";
$lang->description_download = "When FTP is disabled, you should download it and extract it into target path. (if target path is ./modules/board, extract it at ./modules)";
$lang->path = "Path";
?>

2
modules/autoinstall/lang/ko.lang.php
View file

@ -25,4 +25,6 @@
$lang->require_update = "업데이트가 필요합니다.";
$lang->require_installation = "설치가 필요합니다.";
$lang->description_install = "설치를 진행하면, 이 프로그램이 의존하고 있는 모든 프로그램을 업데이트/설치 합니다.";
$lang->description_download = "FTP를 이용할 수 없는 경우, 직접 다운로드 하여 해당 path에 설치하셔야 합니다. (한칸 상위에서 압축을 푸시면 됩니다. ./modules/board의 경우 ./modules에서 tar를 푸세요)";
$lang->path = "설치경로";
?>

6
modules/autoinstall/lang/zh-CN.lang.php
View file

@ -20,5 +20,11 @@
$lang->description_update = "新安装(更新)模块的版本信息，点击Update按钮后才能正常显示。";
$lang->install = "Install";
$lang->update = "Update";
$lang->depending_programs = "This program depends on ";
$lang->require_update = "Update is required.";
$lang->require_installation = "Installation is required.";
$lang->description_install = "Installation process also install/update programs which this program depends on";
$lang->current_version = "Installed version";
$lang->description_download = "When FTP is disabled, you should download it and extract it into target path. (if target path is ./modules/board, extract it at ./modules)";
$lang->path = "Path";
?>

2
modules/autoinstall/tpl/header.html
View file

@ -1 +1 @@
<h3 class="xeAdmin">{$lang->autoinstall}</h3>
<h3 class="xeAdmin">{$lang->autoinstall} <span class="gray">Beta</span></h3>

2
modules/autoinstall/tpl/index.html
View file

@ -3,7 +3,7 @@
<!--%import("js/autoinstall.js")-->
<div class="infoText">
<!--@if($show_ftp_note)-->
<p class="warning">{$lang->description_ftp_note} <a href="#ftpSetup">FTP Setup</a> </p>
<p class="warning">{$lang->description_ftp_note} <a href="{getUrl('','module','admin','act','dispAdminConfig')}#ftpSetup">FTP Setup</a> </p>
<!--@end-->
<!--@if($need_update)-->
<p class="update">{$lang->need_update}</p>

10
modules/autoinstall/tpl/install.html
View file

@ -6,13 +6,19 @@
<!--@foreach($package->depends as $dep)-->
<dl>
<dt><strong>{$lang->depending_programs} :</strong></dt>
<dd>sdfgsdfg
{$dep->title} ver. {$dep->version} -
<dd> {$dep->title} ver. {$dep->version} -
<!--@if($dep->installed)-->{$lang->current_version}: {$dep->cur_version} <!--@if($dep->need_update)--> ({$lang->require_update})<!--@end--> <!--@else-->{$lang->require_installation}<!--@end-->
<!--@if($dep->need_update || !$dep->installed)--><a href="http://download.xpressengine.com/?module=resourceapi&act=procResourceapiDownload&package_srl={$dep->package_srl}">{$lang->download}</a> ({$lang->path} : {$dep->path})<!--@end-->
</dd>
</dl>
<!--@end-->
<!--@if($show_ftp_note)-->
<p class="warning">{$lang->description_download}. (<a href="{getUrl('','module','admin','act','dispAdminConfig')}#ftpSetup">FTP Setup</a>) </p>
<p>{$lang->path} : {$package->path}</p>
<p><a href="http://download.xpressengine.com/?module=resourceapi&act=procResourceapiDownload&package_srl={$package->package_srl}" class="button large green strong"><span>{$lang->download}</span></a></p>
<!--@else-->
<p>{$lang->description_install}. </p>
<p><!--@if(!$package->installed || $package->need_update)--><a href="#" onclick="doInstallPackage('{$package->package_srl}')" class="button large green strong"><span>{$lang->install}</span></a><!--@end--></p>
<!--@end-->
</div>