* adjust Install module.

module/install/control.php

@@ -52,7 +52,7 @@ class install extends control
     public function license()
     {
         $this->view->title   = $this->lang->install->welcome;
-        $this->view->license = file_get_contents($this->app->getBasePath() . 'doc/LICENSE');
+        $this->view->license = $this->install->getLicense();
         $this->display();
     }
 

module/install/css/common.css

@@ -11,5 +11,5 @@ body{background: #f1f1f1;}
 
 @media (max-width: 700px){.modal-dialog{padding: 0;} .modal-content{box-shadow: none;border-width: 1px 0;border-radius: 0}}
 
-.ok{background:green; color:white}
-.fail{background:red; color:white}
+#checker .ok{background:green; color:white}
+#checker .fail{background:red; color:white}

module/install/lang/en.php

@@ -20,18 +20,18 @@ $lang->install->error   = 'Error ';
 $lang->install->start            = 'Start to Install';
 $lang->install->keepInstalling   = 'Continue installing this version.';
 $lang->install->seeLatestRelease = 'View Latest Version';
-$lang->install->welcome          = 'Welcome to ZenTao Project Management Software!';
+$lang->install->welcome          = 'Thanks for using ZenTao Project Management Software!';
 $lang->install->license          = 'ZenTao PMS is under Z PUBLIC LICENSE(ZPL) 1.2';
 $lang->install->desc             = <<<EOT
-ZenTao Project Management Software (ZenTao PMS) is originated in China and under <a href='http://zpl.pub' target='_blank'>ZPL</a>. It us an open source and free project management software, integrated with Product Management、Project Management、QA Management, as weel as Todo Management, Company Managementetc, which is the best choice for small and medium organizations to manage projects.
+ZenTao Project Management Software is an open source software released under <a href='http://zpl.pub/page/zplv12.html' target='_blank'>ZPL</a> license. It integrates with Product Management、Project Management、QA Management, Document Management, as weel as To-Dos Management, Company Managementetc. ZenTao is the best choice for software project management.
 
-ZenTao PMS uses PHP + MySQL as programming langugages and is based on ZenTaoPHP,  an independent framwork developed by our team. Third party developers/organizations can develop extensions or customization tailored to their needs.
+ZenTao PMS uses PHP + MySQL as programming langugages and is based on ZenTaoPHP, an independent framwork developed by our team. Third party developers/organizations can develop extensions or customization tailored to their needs.
 EOT;
 $lang->install->links = <<<EOT
-ZenTao PMS is developed by <strong><a href='http://www.cnezsoft.com' target='_blank' class='text-danger'>Qingdao Nature Easy Soft Co., LTD</a></strong>.
-Officila Wensite <a href='http://www.zentao.net' target='_blank'>http://www.zentao.net</a>
-Technical Support <a href='http://www.zentao.net/ask/' target='_blank'>http://www.zentao.net/ask/</a>
-Weibo：<a href='http://weibo.com/easysoft' target='_blank'>http://weibo.com/easysoft</a>
+ZenTao PMS is developed by <strong><a href='http://easysoft.ltd' target='_blank' class='text-danger'>Nature Easy Soft Co., LTD</a></strong>.
+Official Website <a href='http://www.zentao.pm' target='_blank'>http://www.zentao.pm</a>
+Technical Support <a href='http://www.zentao.pm/ask/' target='_blank'>http://www.zentao.pm/ask/</a>
+Twitter: <a href='https://twitter.com/cneasysoft' target='_blank'>cneasysoft</a>
 
 You are installing ZenTao <strong class='text-danger'>%s</strong> Version.
 EOT;
@@ -62,38 +62,38 @@ $lang->install->pdoMySQL     = 'PDO_MySQL';
 $lang->install->pdoMySQLFail = 'Edit PHP ini file to load PDO_MySQL extsion.';
 $lang->install->json         = 'JSON Extension';
 $lang->install->jsonFail     = 'Edit the php.ini file to load JSON extension.';
-$lang->install->openssl      = 'OPENSSL Extension';
+$lang->install->openssl      = 'OpenSSL Extension';
 $lang->install->opensslFail  = 'Edit the php.ini file to load openssl extension.';
-$lang->install->mbstring     = 'MBSTRING Extension';
+$lang->install->mbstring     = 'Mbstring Extension';
 $lang->install->mbstringFail = 'Edit the php.ini file to load mbstring extension.';
-$lang->install->zlib         = 'ZLIB Extension';
+$lang->install->zlib         = 'Zlib Extension';
 $lang->install->zlibFail     = 'Edit the php.ini file to load zlib extension.';
-$lang->install->curl         = 'CURL Extension';
+$lang->install->curl         = 'Curl Extension';
 $lang->install->curlFail     = 'Edit the php.ini file to load curl extension.';
-$lang->install->filter       = 'FILTER Extension';
+$lang->install->filter       = 'Filter Extension';
 $lang->install->filterFail   = 'Edit the php.ini file to load filter extension.';
 $lang->install->gd           = 'GD Extension';
 $lang->install->gdFail       = 'Edit the php.ini file to load gd extension.';
-$lang->install->iconv        = 'ICONV Extension';
+$lang->install->iconv        = 'Iconv Extension';
 $lang->install->iconvFail    = 'Edit the php.ini file to load iconv extension.';
-$lang->install->tmpRoot      = 'Temp File Directory';
+$lang->install->tmpRoot      = 'Temp Directory';
 $lang->install->dataRoot     = 'Uploaded File Directory';
 $lang->install->session      = 'Session Save Path';
 $lang->install->sessionFail  = 'Edit the php.ini file to set session.save_path.';
-$lang->install->mkdirWin     = '<p>%s directory has to be created.<br /> Run <br /> mkdir %s</p> command line.';
+$lang->install->mkdirWin     = '<p>%s directory has to be created.<br /> Run <code>mkdir %s</code> to create it.</p>';
 $lang->install->chmodWin     = ' "%s" privilege has to be changed.';
-$lang->install->mkdirLinux   = '<p>%s directory has to be created.<br /> Run <br /> mkdir -p %s</p> command line.';
-$lang->install->chmodLinux   = ' "%s" privilege has to be changed.<br /> Run <br />chmod o=rwx -R %s command line.';
+$lang->install->mkdirLinux   = '<p>%s directory has to be created.<br /> Run <code>mkdir -p %s</code> to create it.</p>';
+$lang->install->chmodLinux   = ' "%s" privilege has to be changed.<br /> Run <code>chmod o=rwx -R %s</code> to change it.';
 
-$lang->install->defaultLang    = 'Default Lang';
+$lang->install->defaultLang    = 'Default Language';
 $lang->install->dbHost         = 'Database Host';
 $lang->install->dbHostNote     = 'If 127.0.0.1 is not accessible, try localhost.';
-$lang->install->dbPort         = 'host Port';
+$lang->install->dbPort         = 'Host Port';
 $lang->install->dbUser         = 'Database User';
 $lang->install->dbPassword     = 'Database Password';
-$lang->install->dbName         = 'Database Library';
-$lang->install->dbPrefix       = 'Database Table Prefix';
-$lang->install->clearDB        = 'Clear Database';
+$lang->install->dbName         = 'Database Name';
+$lang->install->dbPrefix       = 'Table Prefix';
+$lang->install->clearDB        = 'Clean tables if already exist.';
 $lang->install->importDemoData = 'Import Demo Data';
 $lang->install->working        = 'Working way';
 
@@ -172,27 +172,27 @@ $lang->install->product = array('chanzhi', 'ranzhi');
 
 $lang->install->promotion     = "Products of Nature Easy Soft:";
 $lang->install->chanzhi       = new stdclass();
-$lang->install->chanzhi->name = 'Zsite CMS';
+$lang->install->chanzhi->name = 'ZSITE content management system.';
 $lang->install->chanzhi->logo = 'images/main/chanzhi_en.png';
 $lang->install->chanzhi->url  = 'http://www.zsite.net';
 $lang->install->chanzhi->desc = <<<EOD
 <ul>
-  <li>Professional Content Management Sysytem</li>
-  <li>Rich features and simple to apply</li>
-  <li>Aims at details for SEO</li>
-  <li>Open source and free</li>
+  <li>Article, Blog, Manual, Member, Shop, Forum, Feedback……</li>
+  <li>Customize page freely by theme, effect, widget, css, js and layout</li>
+  <li>Support desktop and mobile in one system</li>
+  <li>Deeply optimized for search engine</li>
 </ul>
 EOD;
 
 $lang->install->ranzhi = new stdclass();
-$lang->install->ranzhi->name = 'Zdoo Collaborative System';
+$lang->install->ranzhi->name = 'ZDOO Collaborative System';
 $lang->install->ranzhi->logo = 'images/main/zdoo_org.png';
 $lang->install->ranzhi->url  = 'http://www.zdoo.org';
 $lang->install->ranzhi->desc = <<<EOD
 <ul>
-  <li>Customer Management and Order Tracking</li>
-  <li>Project/Task and Announcement/Document</li>
-  <li>Income/Expense and Account In/Out </li>
-  <li>Forum/Blog and Dynamic/News</li>
+  <li>CRM: Customer Management and Order Tracking</li>
+  <li>OA: Approve, Announce, Trip, Leave and so on. </li>
+  <li>Project，Task and Document management </li>
+  <li>Money: Income, Expense, Transfer, Invest and Debt</li>
 </ul>
 EOD;

module/install/lang/zh-cn.php

@@ -80,10 +80,10 @@ $lang->install->tmpRoot      = '临时文件目录';
 $lang->install->dataRoot     = '上传文件目录';
 $lang->install->session      = 'Session存储目录';
 $lang->install->sessionFail  = '修改PHP配置文件，设置session.save_path';
-$lang->install->mkdirWin     = '<p>需要创建目录%s。命令行下面命令为：<br /> mkdir %s</p>';
+$lang->install->mkdirWin     = '<p>需要创建目录%s。命令为：<br /> mkdir %s</p>';
 $lang->install->chmodWin     = '需要修改目录 "%s" 的权限。';
-$lang->install->mkdirLinux   = '<p>需要创建目录%s。<br /> 命令行下面命令为：<br /> mkdir -p %s</p>';
-$lang->install->chmodLinux   = '需要修改目录 "%s" 的权限。<br />命令行下面命令为：<br />chmod o=rwx -R %s';
+$lang->install->mkdirLinux   = '<p>需要创建目录%s。<br /> 命令为：<br /> mkdir -p %s</p>';
+$lang->install->chmodLinux   = '需要修改目录 "%s" 的权限。<br />命令为：<br />chmod o=rwx -R %s';
 
 $lang->install->defaultLang    = '默认语言';
 $lang->install->dbHost         = '数据库服务器';

module/install/model.php

@@ -13,6 +13,23 @@
 <?php
 class installModel extends model
 {
+    /**
+     * Get license according the client lang.
+     * 
+     * @access public
+     * @return string
+     */
+    public function getLicense()
+    {
+        $clientLang = $this->app->getClientLang();
+
+        $licenseCN = file_get_contents($this->app->getBasePath() . 'doc/LICENSE.CN');
+        $licenseEN = file_get_contents($this->app->getBasePath() . 'doc/LICENSE.EN');
+
+        if($clientLang == 'zh' or $clientLang == 'zh-tw') return $licenseCN . $licenseEN;
+        return $licenseEN . $licenseCN;
+    }
+
     /**
      * Check version of zentao.
      * 

module/install/view/step1.html.php

@@ -14,9 +14,9 @@
   <div class='modal-dialog'>
     <div class='modal-header'><strong><?php echo $lang->install->checking;?></strong></div>
     <div class='modal-body'>
-      <table class='table table-bordered'>
+      <table class='table table-bordered' id='checker'>
         <thead>
-          <tr class='text-center'>
+          <tr>
             <th class='w-p20'><?php echo $lang->install->checkItem;?></th>
             <th class='w-p25'><?php echo $lang->install->current?></th>
             <th class='w-p15'><?php echo $lang->install->result?></th>

module/install/view/step2.html.php

@@ -17,9 +17,9 @@
       <div class='modal-body'>
         <table align='center' class='table table-bordered table-form'>
           <thead>
-            <tr class='text-center'>
-              <th class='w-p20'><?php echo $lang->install->key;?></th>
-              <th class='text-left' colspan='2'><?php echo $lang->install->value?></th>
+            <tr>
+              <th class='w-p20 text-right'><?php echo $lang->install->key;?></th>
+              <th colspan='2'><?php echo $lang->install->value?></th>
             </tr>
           </thead>
           <tr>