diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 7340e83d7c..8070e348ba 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -270,38 +270,38 @@ $lang->qa->menu = new stdclass(); $lang->qa->menu->bug = array('link' => 'Bug|bug|browse|productID=%s'); $lang->qa->menu->testcase = array('link' => 'Case|testcase|browse|productID=%s'); -$lang->qa->menu->testtask = array('link' => 'Test Task|testtask|browse|productID=%s'); +$lang->qa->menu->testtask = array('link' => 'Test|testtask|browse|productID=%s'); $lang->qa->menu->testsuite = array('link' => 'Suite|testsuite|browse|productID=%s'); $lang->qa->menu->report = array('link' => 'Report|testreport|browse|productID=%s'); -$lang->qa->menu->caselib = array('link' => 'Library|testsuite|library'); +$lang->qa->menu->caselib = array('link' => 'Case Library|testsuite|library'); $lang->bug = new stdclass(); $lang->bug->menu = new stdclass(); $lang->bug->menu->bug = array('link' => 'Bug|bug|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,resolve,close,activate,report,batchedit,batchactivate,confirmbug,assignto', 'subModule' => 'tree'); $lang->bug->menu->testcase = array('link' => 'Case|testcase|browse|productID=%s'); -$lang->bug->menu->testtask = array('link' => 'Test Task|testtask|browse|productID=%s'); +$lang->bug->menu->testtask = array('link' => 'Test|testtask|browse|productID=%s'); $lang->bug->menu->testsuite = array('link' => 'Suite|testsuite|browse|productID=%s'); $lang->bug->menu->report = array('link' => 'Report|testreport|browse|productID=%s'); -$lang->bug->menu->caselib = array('link' => 'Library|testsuite|library'); +$lang->bug->menu->caselib = array('link' => 'Case Library|testsuite|library'); $lang->testcase = new stdclass(); $lang->testcase->menu = new stdclass(); $lang->testcase->menu->bug = array('link' => 'Bug|bug|browse|productID=%s'); $lang->testcase->menu->testcase = array('link' => 'Case|testcase|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,batchedit,showimport,groupcase,importfromlib', 'subModule' => 'tree'); -$lang->testcase->menu->testtask = array('link' => 'Test Task|testtask|browse|productID=%s'); +$lang->testcase->menu->testtask = array('link' => 'Test|testtask|browse|productID=%s'); $lang->testcase->menu->testsuite = array('link' => 'Suite|testsuite|browse|productID=%s'); $lang->testcase->menu->report = array('link' => 'Report|testreport|browse|productID=%s'); -$lang->testcase->menu->caselib = array('link' => 'Library|testsuite|library'); +$lang->testcase->menu->caselib = array('link' => 'Case Library|testsuite|library'); $lang->testtask = new stdclass(); $lang->testtask->menu = new stdclass(); $lang->testtask->menu->bug = array('link' => 'Bug|bug|browse|productID=%s'); $lang->testtask->menu->testcase = array('link' => 'Case|testcase|browse|productID=%s'); -$lang->testtask->menu->testtask = array('link' => 'Test Task|testtask|browse|productID=%s', 'alias' => 'view,create,edit,linkcase,cases,start,close,batchrun,groupcase,report'); +$lang->testtask->menu->testtask = array('link' => 'Test|testtask|browse|productID=%s', 'alias' => 'view,create,edit,linkcase,cases,start,close,batchrun,groupcase,report'); $lang->testtask->menu->testsuite = array('link' => 'Suite|testsuite|browse|productID=%s'); $lang->testtask->menu->report = array('link' => 'Report|testreport|browse|productID=%s'); -$lang->testtask->menu->caselib = array('link' => 'Library|testsuite|library'); +$lang->testtask->menu->caselib = array('link' => 'Case Library|testsuite|library'); $lang->testsuite = new stdclass(); $lang->testsuite->menu = new stdclass(); @@ -310,13 +310,13 @@ $lang->testsuite->menu->testcase = array('link' => 'Case|testcase|browse|produc $lang->testsuite->menu->testtask = array('link' => 'Test Task|testtask|browse|productID=%s'); $lang->testsuite->menu->testsuite = array('link' => 'Suite|testsuite|browse|productID=%s', 'alias' => 'view,create,edit,linkcase'); $lang->testsuite->menu->report = array('link' => 'Report|testreport|browse|productID=%s'); -$lang->testsuite->menu->caselib = array('link' => 'Library|testsuite|library'); +$lang->testsuite->menu->caselib = array('link' => 'Case Library|testsuite|library'); $lang->testreport = new stdclass(); $lang->testreport->menu = new stdclass(); $lang->testreport->menu->bug = array('link' => 'Bug|bug|browse|productID=%s'); $lang->testreport->menu->testcase = array('link' => 'Case|testcase|browse|productID=%s'); -$lang->testreport->menu->testtask = array('link' => 'Test Task|testtask|browse|productID=%s'); +$lang->testreport->menu->testtask = array('link' => 'Test|testtask|browse|productID=%s'); $lang->testreport->menu->testsuite = array('link' => 'Suite|testsuite|browse|productID=%s'); $lang->testreport->menu->report = array('link' => 'Report|testreport|browse|productID=%s', 'alias' => 'view,create,edit'); $lang->testreport->menu->caselib = array('link' => 'Library|testsuite|library'); @@ -325,10 +325,10 @@ $lang->caselib = new stdclass(); $lang->caselib->menu = new stdclass(); $lang->caselib->menu->bug = array('link' => 'Bug|bug|browse|'); $lang->caselib->menu->testcase = array('link' => 'Case|testcase|browse|'); -$lang->caselib->menu->testtask = array('link' => 'Test Task|testtask|browse|'); +$lang->caselib->menu->testtask = array('link' => 'Test|testtask|browse|'); $lang->caselib->menu->testsuite = array('link' => 'Suite|testsuite|browse|'); $lang->caselib->menu->report = array('link' => 'Report|testreport|browse|'); -$lang->caselib->menu->caselib = array('link' => 'Library|testsuite|library', 'alias' => 'createlib,createcase,libview,edit,batchcreatecase,showimport', 'subModule' => 'tree,testcase'); +$lang->caselib->menu->caselib = array('link' => 'Case Library|testsuite|library', 'alias' => 'createlib,createcase,libview,edit,batchcreatecase,showimport', 'subModule' => 'tree,testcase'); /* Doc menu settings. */ $lang->doc = new stdclass(); @@ -397,7 +397,7 @@ $lang->admin->subMenu->data->backup = array('link' => 'Backup|backup|index', 'su $lang->admin->subMenu->data->trash = 'Recycle|action|trash'; $lang->admin->subMenu->system = new stdclass(); -$lang->admin->subMenu->system->cron = array('link' => 'Timed task|cron|index', 'subModule' => 'cron'); +$lang->admin->subMenu->system->cron = array('link' => 'Cron|cron|index', 'subModule' => 'cron'); $lang->convert = new stdclass(); $lang->upgrade = new stdclass(); diff --git a/module/common/view/footer.html.php b/module/common/view/footer.html.php index 410772b229..d26562a5fc 100755 --- a/module/common/view/footer.html.php +++ b/module/common/view/footer.html.php @@ -13,7 +13,7 @@ designedByAIUX;?>   zentaoPMS . $config->version;?>   proVersion;?> - + xxserver->installed) and $config->xuanxuan->turnon) commonModel::printClientLink();?> diff --git a/module/misc/control.php b/module/misc/control.php index 987b76783c..62c608b968 100644 --- a/module/misc/control.php +++ b/module/misc/control.php @@ -131,9 +131,9 @@ class misc extends control if($action == 'selectPackage') { - $os = 'windows64'; + $os = 'win64'; $agentOS = helper::getOS(); - if(strpos($agentOS, 'Windows') !== false) $os = 'windows64'; + if(strpos($agentOS, 'Windows') !== false) $os = 'win64'; if(strpos($agentOS, 'Linux') !== false) $os = 'linux64'; if(strpos($agentOS, 'Mac') !== false) $os = 'mac'; @@ -199,23 +199,21 @@ class misc extends control $clientDir = $this->app->getBasePath() . 'tmp/cache/client/'; if(!is_dir($clientDir)) mkdir($clientDir, 0755, true); + $version = $this->config->xuanxuan->version; + $packageDir = $clientDir . "/$version/"; + if(!is_dir($packageDir)) mkdir($packageDir, 0755, true); + $account = $this->app->user->account; $tmpDir = $clientDir . "/$account/"; if(!is_dir($tmpDir)) mkdir($tmpDir, 0755, true); - if($os == 'windows64') $clientName = "zentaoclient.win64.zip"; - if($os == 'windows32') $clientName = "zentaoclient.win32.zip"; - if($os == 'linux64') $clientName = "zentaoclient.linux.x64.zip"; - if($os == 'linux32') $clientName = "zentaoclient.linux.ia32.zip"; - if($os == 'mac') $clientName = "zentaoclient.mac.zip"; - $needCache = false; - $version = $this->config->xuanxuan->version; - $packageFile = $clientDir . $clientName; + $clientName = "zentaoclient." . $os . ".zip"; + $packageFile = $packageDir . $clientName; if(!file_exists($packageFile)) { $url = "http://dl.cnezsoft.com/zentaoclient/$version/"; - $xxFile = $url . $clientName; + $xxFile = $url . $clientName . "?t=" . rand(); $needCache = true; } else @@ -276,12 +274,11 @@ class misc extends control if(!is_dir($clientDir)) mkdir($clientDir, 0755, true); /* write login info into config file. */ - $defaultUser = new stdclass(); - $defaultUser->server = common::getSysURL(); - $defaultUser->account = $this->app->user->account; - $loginInfo = new stdclass(); - $loginInfo->ui = $defaultUser; + $loginInfo->ui = new stdclass(); + $loginInfo->ui->defaultUser = new stdclass(); + $loginInfo->ui->defaultUser->server = common::getSysURL();; + $loginInfo->ui->defaultUser->account = $this->app->user->account; $loginInfo = json_encode($loginInfo); $loginFile = $clientDir . 'config.json'; @@ -294,11 +291,11 @@ class misc extends control if($os == 'mac') { - $result = $archive->add($loginFile, PCLZIP_OPT_REMOVE_ALL_PATH, PCLZIP_OPT_ADD_PATH, 'xuanxuan.app/Contents/Resouces'); + $result = $archive->add($loginFile, PCLZIP_OPT_REMOVE_ALL_PATH, PCLZIP_OPT_ADD_PATH, 'zentaoclient/xuanxuan.app/Contents/Resouces'); } else { - $result = $archive->add($loginFile, PCLZIP_OPT_REMOVE_ALL_PATH, PCLZIP_OPT_ADD_PATH, 'resources/build-in'); + $result = $archive->add($loginFile, PCLZIP_OPT_REMOVE_ALL_PATH, PCLZIP_OPT_ADD_PATH, 'zentaoclient/resources/build-in'); } if($result == 0) diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php index 3124219929..db68829d98 100644 --- a/module/misc/lang/en.php +++ b/module/misc/lang/en.php @@ -24,13 +24,11 @@ $lang->misc->client->downloaded = 'Downloaded successful!'; $lang->misc->client->setting = 'Setting config info.'; $lang->misc->client->setted = 'Set config info successful!'; -$lang->misc->client->osList['windows64'] = 'Windows 64'; -$lang->misc->client->osList['windows32'] = 'Windows 32'; -$lang->misc->client->osList['linux64'] = 'Linux 64'; -$lang->misc->client->osList['linux32'] = 'Linux 32'; -$lang->misc->client->osList['mac'] = 'Mac'; - -$lang->misc->client->versionList['2.1.1'] = '2.1.1'; +$lang->misc->client->osList['win64'] = 'Windows 64'; +$lang->misc->client->osList['win32'] = 'Windows 32'; +$lang->misc->client->osList['linux64'] = 'Linux 64'; +$lang->misc->client->osList['linux32'] = 'Linux 32'; +$lang->misc->client->osList['mac'] = 'Mac'; $lang->misc->client->errorInfo = new stdclass(); $lang->misc->client->errorInfo->downloadError = 'Failed to download package!'; diff --git a/module/misc/lang/zh-cn.php b/module/misc/lang/zh-cn.php index 14100a02ec..a504bc9599 100644 --- a/module/misc/lang/zh-cn.php +++ b/module/misc/lang/zh-cn.php @@ -24,13 +24,11 @@ $lang->misc->client->downloaded = '成功获取安装包'; $lang->misc->client->setting = '正在设置配置信息'; $lang->misc->client->setted = '成功设置配置信息'; -$lang->misc->client->osList['windows64'] = 'Windows 64位'; -$lang->misc->client->osList['windows32'] = 'Windows 32位'; -$lang->misc->client->osList['linux64'] = 'Linux 64位'; -$lang->misc->client->osList['linux32'] = 'Linux 32位'; -$lang->misc->client->osList['mac'] = 'Mac版'; - -$lang->misc->client->versionList['2.1.1'] = '2.1.1'; +$lang->misc->client->osList['win64'] = 'Windows 64位'; +$lang->misc->client->osList['win32'] = 'Windows 32位'; +$lang->misc->client->osList['linux64'] = 'Linux 64位'; +$lang->misc->client->osList['linux32'] = 'Linux 32位'; +$lang->misc->client->osList['mac'] = 'Mac版'; $lang->misc->client->errorInfo = new stdclass(); $lang->misc->client->errorInfo->downloadError = '获取安装包失败'; diff --git a/module/task/lang/en.php b/module/task/lang/en.php index f8a12037ee..8092c0df0c 100644 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -120,7 +120,7 @@ $lang->task->noAssigned = 'Unassigned'; $lang->task->noFinished = 'Unfinished'; $lang->task->noClosed = 'Unclosed'; $lang->task->yesterdayFinished = 'Finished Yesterday'; -$lang->task->allTasks = 'All Tasks'; +$lang->task->allTasks = 'Task'; $lang->task->statusList[''] = ''; $lang->task->statusList['wait'] = 'Wait'; diff --git a/module/tutorial/lang/en.php b/module/tutorial/lang/en.php index 6ed32c64ef..3806ad875d 100644 --- a/module/tutorial/lang/en.php +++ b/module/tutorial/lang/en.php @@ -29,8 +29,8 @@ $lang->tutorial->requiredTip = '【%s】is required.'; $lang->tutorial->congratulateTask = 'Congratulations! You have finished【】!'; $lang->tutorial->serverErrorTip = 'Error!'; $lang->tutorial->ajaxSetError = 'Finished task must be defined. If you want to reset the Task, please set its value as null.'; -$lang->tutorial->novice = "For a quick start, let's go through a smart (2 min) Tutorial?"; -$lang->tutorial->dataNotSave = "Data generated in the Tutorial will not be saved!"; +$lang->tutorial->novice = "For a quick start, let's go through a two-minute Tutorial."; +$lang->tutorial->dataNotSave = "Data generated in this Tutorial will not be saved!"; $lang->tutorial->tasks = array(); diff --git a/xuanxuan/module/admin/ext/css/xuanxuan/xuanxuan.css b/xuanxuan/module/admin/ext/css/xuanxuan/xuanxuan.css index f4720d1eb5..b73183eb97 100644 --- a/xuanxuan/module/admin/ext/css/xuanxuan/xuanxuan.css +++ b/xuanxuan/module/admin/ext/css/xuanxuan/xuanxuan.css @@ -1,2 +1,2 @@ -.table-form textarea.form-control{height: 60px} -.sslTR td .form-control{width:300px} +.table-form textarea.form-control{height: 400px} +.sslTR td .form-control{width:600px} diff --git a/xuanxuan/module/my/ext/view/index.html.hook.php b/xuanxuan/module/my/ext/view/index.html.hook.php new file mode 100644 index 0000000000..e69de29bb2 diff --git a/xuanxuan/module/common/ext/view/footer.html.hook.php b/xuanxuan/module/my/ext/view/index.html.php similarity index 62% rename from xuanxuan/module/common/ext/view/footer.html.hook.php rename to xuanxuan/module/my/ext/view/index.html.php index 3222a3e623..9eead73f03 100644 --- a/xuanxuan/module/common/ext/view/footer.html.hook.php +++ b/xuanxuan/module/my/ext/view/index.html.php @@ -1,7 +1,15 @@ app->moduleName; -$methodName = $this->app->methodName; +/** + * The html template file of index method of index module of ZenTaoPMS. + * + * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) + * @license ZPL (http://zpl.pub/page/zplv12.html) + * @author Chunsheng Wang + * @package ZenTaoPMS + * @version $Id: index.html.php 1947 2011-06-29 11:58:03Z wwccss $ + */ ?> + +fetch('block', 'dashboard', 'module=my');?> +