From 973d0e258fe75f604987cb67bc59aaa9b3e2528c Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Fri, 2 Mar 2018 10:47:36 +0800
Subject: [PATCH]  * change for license.

---
 module/install/model.php               |  2 +-
 module/install/view/index.html.php     |  2 +-
 module/upgrade/control.php             |  9 ++++++++-
 module/upgrade/css/afterexec.css       | 15 +++------------
 module/upgrade/view/afterexec.html.php | 24 ++++++++++--------------
 5 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/module/install/model.php b/module/install/model.php
index bf9e69bd7c..ea0170b1be 100644
--- a/module/install/model.php
+++ b/module/install/model.php
@@ -26,7 +26,7 @@ class installModel extends model
         $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;
+        if($clientLang == 'zh-cn' or $clientLang == 'zh-tw') return $licenseCN . $licenseEN;
         return $licenseEN . $licenseCN;
     }
 
diff --git a/module/install/view/index.html.php b/module/install/view/index.html.php
index 928ace7dde..d3766fc2d0 100644
--- a/module/install/view/index.html.php
+++ b/module/install/view/index.html.php
@@ -43,7 +43,7 @@
             <h5><?php echo $lang->install->promotion?></h5>
             <div class='row'>
               <?php foreach($lang->install->product as $product):?>
-              <div class='col-md-<?php echo 12 / count($lang->install->product);?>'>
+              <div class='col-md-<?php echo ceil(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">
diff --git a/module/upgrade/control.php b/module/upgrade/control.php
index 8052d9b7bf..44a1bf707c 100644
--- a/module/upgrade/control.php
+++ b/module/upgrade/control.php
@@ -37,8 +37,15 @@ class upgrade extends control
     {
         if($this->get->agree == true) $this->locate(inlink('backup'));
 
+        $clientLang = $this->app->getClientLang();
+        $licenseCN  = file_get_contents($this->app->getBasePath() . 'doc/LICENSE.CN');
+        $licenseEN  = file_get_contents($this->app->getBasePath() . 'doc/LICENSE.EN');
+
+        $license = $licenseEN . $licenseCN;
+        if($clientLang == 'zh-cn' or $clientLang == 'zh-tw') $license = $licenseCN . $licenseEN;
+
         $this->view->title   = $this->lang->upgrade->common;
-        $this->view->license = file_get_contents($this->app->getBasePath() . 'doc/LICENSE');
+        $this->view->license = $license;
         $this->display();
     }
 
diff --git a/module/upgrade/css/afterexec.css b/module/upgrade/css/afterexec.css
index 3151ee49a3..8d820e952d 100644
--- a/module/upgrade/css/afterexec.css
+++ b/module/upgrade/css/afterexec.css
@@ -1,19 +1,10 @@
 .adbox{margin-top:20px;}
-.card {
-  border: none;
-  border-radius: 0px;
-  box-shadow: none;
-  display: block;
-  margin-bottom: 0px;
-  overflow: hidden;
-  padding: 0;
-  position: relative;
-  transition: all 0.5s cubic-bezier(0.175, 0.885, 0.32, 1) 0s;
-}
+
+.card.ad{margin-bottom:0px;}
 .card.ad > .img-wrapper {
   background-position: center;
   background-repeat: no-repeat;
-  height: 85px;
+  height: 115px;
   width: 100%;
 }
 .card.ad > .img-wrapper > img{display: none;}
diff --git a/module/upgrade/view/afterexec.html.php b/module/upgrade/view/afterexec.html.php
index b2b1d9fc1c..0590377b09 100644
--- a/module/upgrade/view/afterexec.html.php
+++ b/module/upgrade/view/afterexec.html.php
@@ -22,22 +22,18 @@
       </div>
       <div class='panel adbox'>
         <div class='panel-heading'><strong><?php echo $lang->install->promotion?></strong></div>
-        <div class='panel-body'>
-          <div class='col-md-4'>
-            <a class="card ad" href="http://www.chanzhi.org" target="_blank">
-              <div class="img-wrapper" style="background-image:url(<?php echo $defaultTheme . 'images/main/chanzhi.png'?>)"><img src="<?php echo $defaultTheme . 'images/main/chanzhi.png'?>" alt=""></div>
-            </a>
-          </div>
-          <div class='col-md-4'>
-            <a class="card ad" href="http://www.ranzhico.com" target="_blank">
-              <div class="img-wrapper" style="background-image:url(<?php echo $defaultTheme . 'images/main/ranzhi.png'?>);background-size:230px 85px"><img src="<?php echo $defaultTheme . 'images/main/ranzhi.png'?>" alt=""></div>
-            </a>
-          </div>
-          <div class='col-md-4'>
-            <a class="card ad" href="http://www.zdoo.com" target="_blank">
-              <div class="img-wrapper" style="background-image:url(<?php echo $defaultTheme . 'images/main/zdoo.png'?>)"><img src="<?php echo $defaultTheme . 'images/main/zdoo.png'?>" alt=""></div>
+        <div class='panel-body row'>
+          <?php foreach($lang->install->product as $product):?>
+          <div class='col-md-<?php echo ceil(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->{$product}->name?></h5>
+                <div class="card-content"><?php echo $lang->install->{$product}->desc?></div>
+              </div>
             </a>
           </div>
+          <?php endforeach;?>
         </div>
       </div>
     </div>