From 6f6d4e35040d723393a76be9d0ecf9eddc22b0f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= <memory@lvtao.net>
Date: Mon, 11 Dec 2017 15:04:44 +0800
Subject: [PATCH] * Fix EN install logo

---
 module/install/lang/en.php         | 29 ++++-----------------------
 module/install/lang/zh-cn.php      |  2 ++
 module/install/lang/zh-tw.php      |  3 ++-
 module/install/view/index.html.php | 32 +++++++++---------------------
 4 files changed, 17 insertions(+), 49 deletions(-)

diff --git a/module/install/lang/en.php b/module/install/lang/en.php
index e192e63317..8a663af776 100644
--- a/module/install/lang/en.php
+++ b/module/install/lang/en.php
@@ -163,6 +163,8 @@ $lang->install->joinZentao = <<<EOT
 <p>Tou have installed ZenTao %s.<strong class='text-danger'> Please delete install.php asap</strong>.</p><p>Note: In order to get the latest news of ZenTao, please register in ZenTao(<a href='http://www.zentao.pm' class='alert-link' target='_blank'>www.zentao.pm</a>).</p>
 EOT;
 
+$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';
@@ -179,8 +181,8 @@ EOD;
 
 $lang->install->ranzhi = new stdclass();
 $lang->install->ranzhi->name = 'Ranger Collaborative System';
-$lang->install->ranzhi->logo = 'images/main/ranzhi.png';
-$lang->install->ranzhi->url  = 'http://www.ranzhi.org';
+$lang->install->ranzhi->logo = 'images/main/zdoo.png';
+$lang->install->ranzhi->url  = 'http://www.zdoo.com';
 $lang->install->ranzhi->desc = <<<EOD
 <ul>
   <li>Customer Management and Order Tracking</li>
@@ -189,26 +191,3 @@ $lang->install->ranzhi->desc = <<<EOD
   <li>Forum/Blog and Dynamic/News</li>
 </ul>
 EOD;
-
-$lang->install->zdoo = new stdclass();
-$lang->install->zdoo->name = 'Integrated Cloud Platform';
-$lang->install->zdoo->desc = <<<EOD
-<ul>
-  <li>Safe, Stable and Effective</li>
-  <li>Data isolation by docker</li>
-  <li>Code level customization</li>
-  <li>An integrated and collaborative platform</li>
-</ul>
-EOD;
-$lang->install->xuanxuan = new stdclass();
-$lang->install->xuanxuan->name = 'Xuanxuan IM';
-$lang->install->xuanxuan->logo = 'images/main/xuanxuan.png';
-$lang->install->xuanxuan->url  = 'http://www.xuan.im';
-$lang->install->xuanxuan->desc = <<<EOD
-<ul>
-  <li>lightweight and easy to deploy</li>
-  <li>complete cross platform solutions</li>
-  <li>Based on Html5 and beautiful</li>
-  <li>Open framework</li>
-</ul>
-EOD;
diff --git a/module/install/lang/zh-cn.php b/module/install/lang/zh-cn.php
index d68adae5a6..2840984611 100644
--- a/module/install/lang/zh-cn.php
+++ b/module/install/lang/zh-cn.php
@@ -163,6 +163,8 @@ $lang->install->joinZentao = <<<EOT
 <p>您已经成功安装禅道管理系统%s，<strong class='text-danger'>请及时删除install.php</strong>。</p><p>友情提示：为了您及时获得禅道的最新动态，请在禅道社区(<a href='http://www.zentao.net' class='alert-link' target='_blank'>www.zentao.net</a>)进行登记。</p>
 EOT;
 
+$lang->install->product = array('chanzhi', 'ranzhi', 'xuanxuan');
+
 $lang->install->promotion     = "为您推荐易软天创旗下其他产品：";
 $lang->install->chanzhi       = new stdclass();
 $lang->install->chanzhi->name = '蝉知企业门户系统';
diff --git a/module/install/lang/zh-tw.php b/module/install/lang/zh-tw.php
index af8532033b..f2f4865f37 100644
--- a/module/install/lang/zh-tw.php
+++ b/module/install/lang/zh-tw.php
@@ -161,9 +161,10 @@ $lang->install->register = '禪道社區註冊';
 
 $lang->install->joinZentao = <<<EOT
 <p>您已經成功安裝禪道管理系統%s，<strong class='text-danger'>請及時刪除install.php</strong>。</p><p>友情提示：為了您及時獲得禪道的最新動態，請在禪道社區(<a href='http://www.zentao.net' class='alert-link' target='_blank'>www.zentao.net</a>)進行登記。</p>
-
 EOT;
 
+$lang->install->product = array('chanzhi', 'ranzhi', 'xuanxuan');
+
 $lang->install->promotion = "為您推薦易軟天創旗下其他產品：";
 $lang->install->chanzhi   = new stdclass();
 $lang->install->chanzhi->name = '蟬知企業門戶系統';
diff --git a/module/install/view/index.html.php b/module/install/view/index.html.php
index 32ee960366..f6aa52dd75 100644
--- a/module/install/view/index.html.php
+++ b/module/install/view/index.html.php
@@ -33,40 +33,26 @@
         <tr>
           <td class=''><?php echo nl2br(sprintf($lang->install->links, $config->version));?></td>
           <td class='w-p25'>
+            <?php if($this->app->clientLang != 'en'):?>
             <img src="<?php echo $this->app->getWebRoot() . 'theme/default/images/main/weixin.jpg'?>" width='200' height='200'>
+            <?php endif;?>
           </td>
         </tr> 
         <tr>
           <td colspan='2'>
             <h5><?php echo $lang->install->promotion?></h5>
             <div class='row'>
-              <div class='col-md-4'>
-                <a class="card ad" href="<?php echo $lang->install->chanzhi->url;?>" target="_blank">
-                  <div class="img-wrapper" style="background-image:url(<?php echo $defaultTheme . $lang->install->chanzhi->logo;?>)"><img src="<?php echo $defaultTheme . $lang->install->chanzhi->logo;?>" alt=""></div>
+              <?php foreach($lang->install->product as $product):?>
+              <div class='col-md-<?php echo 12/count($lang->install->product);?>'>
+                <a class="card ad" href="<?php echo $lang->install->{$product}->url;?>" target="_blank">
+                  <div class="img-wrapper" style="background-image:url(<?php echo $defaultTheme . $lang->install->{$product}->logo;?>)"><img src="<?php echo $defaultTheme . $lang->install->{$product}->logo;?>" alt=""></div>
                   <div class="card-reveal">
-                    <h5 class="card-heading"><?php echo $lang->install->chanzhi->name?></h5>
-                    <div class="card-content"><?php echo $lang->install->chanzhi->desc?></div>
-                  </div>
-                </a>
-              </div>
-              <div class='col-md-4'>
-                <a class="card ad" href="<?php echo $lang->install->ranzhi->url;?>" target="_blank">
-                  <div class="img-wrapper" style="background-image:url(<?php echo $defaultTheme . $lang->install->ranzhi->logo;?>)"><img src="<?php echo $defaultTheme . $lang->install->ranzhi->logo;?>" alt=""></div>
-                  <div class="card-reveal">
-                    <h5 class="card-heading"><?php echo $lang->install->ranzhi->name?></h5>
-                    <div class="card-content"><?php echo $lang->install->ranzhi->desc?></div>
-                  </div>
-                </a>
-              </div>
-              <div class='col-md-4'>
-                <a class="card ad" href="<?php echo $lang->install->xuanxuan->logo;?>" target="_blank">
-                  <div class="img-wrapper" style="background-image:url(<?php echo $defaultTheme . $lang->install->xuanxuan->logo;?>)"><img src="<?php echo $defaultTheme . $lang->install->xuanxuan->logo;?>" alt=""></div>
-                  <div class="card-reveal">
-                    <h5 class="card-heading"><?php echo $lang->install->xuanxuan->name?></h5>
-                    <div class="card-content"><?php echo $lang->install->xuanxuan->desc?></div>
+                    <h5 class="card-heading"><?php echo $lang->install->{$product}->name?></h5>
+                    <div class="card-content"><?php echo $lang->install->{$product}->desc?></div>
                   </div>
                 </a>
               </div>
+              <?php endforeach;?>
             </div>
           </td>
         </tr>