From 1d317c5fb3eb53aff6fc5afe764965281c3db7c5 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Wed, 20 Feb 2019 18:01:00 +0800
Subject: [PATCH]  * finish task #5278.

---
 module/doc/css/common.css           |  1 +
 module/doc/js/common.js             | 13 ++++++++++++-
 module/doc/js/create.js             |  2 +-
 module/doc/js/createlib.js          |  6 +++++-
 module/doc/js/edit.js               |  2 +-
 module/doc/js/editlib.js            |  2 +-
 module/doc/lang/en.php              | 14 ++++++++++++++
 module/doc/lang/zh-cn.php           | 14 ++++++++++++++
 module/doc/view/create.html.php     |  6 +++++-
 module/doc/view/createlib.html.php  |  7 ++++++-
 module/doc/view/edit.html.php       |  6 +++++-
 module/doc/view/editlib.html.php    | 16 +++++++++++-----
 module/install/control.php          |  3 ---
 module/install/view/index.html.php  | 11 -----------
 module/product/view/browse.html.php |  2 +-
 15 files changed, 77 insertions(+), 28 deletions(-)

diff --git a/module/doc/css/common.css b/module/doc/css/common.css
index 5ca4992d28..340777fbb6 100644
--- a/module/doc/css/common.css
+++ b/module/doc/css/common.css
@@ -77,3 +77,4 @@ td.c-name a:visited{color: #082999}
 .querybox-opened{color: #0c64eb; background: rgba(0,0,0,.075);}
 
 #queryBox #groupAndOr {min-width: 65px;}
+#noticeAcl{margin-left:10px;}
diff --git a/module/doc/js/common.js b/module/doc/js/common.js
index 11963f515d..0c030b430c 100644
--- a/module/doc/js/common.js
+++ b/module/doc/js/common.js
@@ -4,7 +4,7 @@ function loadModules(libID)
     $('#moduleBox').load(link, function(){$('#moduleBox').find('select').chosen()});
 }
 
-function toggleAcl(acl)
+function toggleAcl(acl, type)
 {
     if(acl == 'custom')
     {
@@ -14,6 +14,17 @@ function toggleAcl(acl)
     {
         $('#whiteListBox').addClass('hidden');
     }
+    if(type == 'lib')
+    {
+        var libType = $('#type').val();
+        var notice  = typeof(noticeAcl[libType][acl]) != 'undefined' ? noticeAcl[libType][acl] : '';
+        $('#noticeAcl').html(notice);
+    }
+    else
+    {
+        var notice  = typeof(noticeAcl[acl]) != 'undefined' ? noticeAcl[acl] : '';
+        $('#noticeAcl').html(notice);
+    }
 }
 
 function loadDocModule(libID)
diff --git a/module/doc/js/create.js b/module/doc/js/create.js
index caa6935526..c2ba6a55e9 100644
--- a/module/doc/js/create.js
+++ b/module/doc/js/create.js
@@ -1,6 +1,6 @@
 $(function()
 {
-    toggleAcl($('#acl').val());
+    toggleAcl($('[name=acl]').val(), 'doc');
     $('input[name="type"]').change(function()
     {
         var type = $(this).val();
diff --git a/module/doc/js/createlib.js b/module/doc/js/createlib.js
index e43cb16008..ba9cfa525d 100644
--- a/module/doc/js/createlib.js
+++ b/module/doc/js/createlib.js
@@ -6,7 +6,7 @@ $(function()
         changeByLibType(libType);
     })
     changeByLibType($('#type').val());
-    toggleAcl($('#acl').val());
+    toggleAcl($('[name=acl]').val(), 'lib');
 });
 
 function changeByLibType(libType)
@@ -26,4 +26,8 @@ function changeByLibType(libType)
         $('table tr.product').addClass('hidden');
         $('table tr.project').addClass('hidden');
     }
+
+    var acl    = $('[name=acl]').val();
+    var notice = typeof(noticeAcl[libType][acl]) != 'undefined' ? noticeAcl[libType][acl] : '';
+    $('#noticeAcl').html(notice);
 }
diff --git a/module/doc/js/edit.js b/module/doc/js/edit.js
index 50d5aa0e7d..1ab517c392 100644
--- a/module/doc/js/edit.js
+++ b/module/doc/js/edit.js
@@ -1,6 +1,6 @@
 $(function()
 {
-    toggleAcl($('input[name="acl"]:checked').val());
+    toggleAcl($('input[name="acl"]').val(), 'doc');
     $('input[name="type"]').change(function()
     {
         var type = $(this).val();
diff --git a/module/doc/js/editlib.js b/module/doc/js/editlib.js
index cf352ddab1..ee655f0aa9 100644
--- a/module/doc/js/editlib.js
+++ b/module/doc/js/editlib.js
@@ -1,4 +1,4 @@
 $(function()
 {
-    toggleAcl($('input[name="acl"]:checked').val());
+    toggleAcl($('input[name="acl"]').val(), 'lib');
 })
diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php
index 0a6c5dc341..958c171a37 100644
--- a/module/doc/lang/en.php
+++ b/module/doc/lang/en.php
@@ -159,6 +159,20 @@ $lang->doc->noEditedDoc        = 'You have not edited any document.';
 $lang->doc->noOpenedDoc        = 'You have not created any document.';
 $lang->doc->noCollectedDoc     = 'You have not collected any document.';
 
+$lang->doc->noticeAcl['lib']['product']['open']    = 'Everyone can access it unless the user has no access to the associated product.';
+$lang->doc->noticeAcl['lib']['product']['custom']  = 'Users of whitelists and associated product with access rights can access them.';
+$lang->doc->noticeAcl['lib']['product']['private'] = 'Creators and users of associated product with access rights can access them.';
+$lang->doc->noticeAcl['lib']['project']['open']    = 'Everyone can access it unless the user has no access to the associated project.';
+$lang->doc->noticeAcl['lib']['project']['custom']  = 'Users of whitelists and associated project with access rights can access them.';
+$lang->doc->noticeAcl['lib']['project']['private'] = 'Creators and users of associated project with access rights can access them.';
+$lang->doc->noticeAcl['lib']['custom']['open']     = 'Everyone can visit it.';
+$lang->doc->noticeAcl['lib']['custom']['custom']   = 'Whitelist users are accessible.';
+$lang->doc->noticeAcl['lib']['custom']['private']  = 'Only the creator can access it.';
+
+$lang->doc->noticeAcl['doc']['open']    = 'Everyone can access it unless the user does not have permission to belong to the document library.';
+$lang->doc->noticeAcl['doc']['custom']  = 'Whitelist users are accessible.';
+$lang->doc->noticeAcl['doc']['private'] = 'Only the creator can access it.';
+
 $lang->doc->placeholder = new stdclass();
 $lang->doc->placeholder->url = 'Url';
 
diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php
index e5d6447eb9..949ddf8663 100644
--- a/module/doc/lang/zh-cn.php
+++ b/module/doc/lang/zh-cn.php
@@ -159,6 +159,20 @@ $lang->doc->noEditedDoc        = '您还没有编辑任何文档。';
 $lang->doc->noOpenedDoc        = '您还没有创建任何文档。';
 $lang->doc->noCollectedDoc     = '您还没有收藏任何文档。';
 
+$lang->doc->noticeAcl['lib']['product']['open']    = '所有人都可以访问，除非用户没有权限访问的关联产品。';
+$lang->doc->noticeAcl['lib']['product']['custom']  = '白名单和有权限访问的关联产品的用户可以访问。';
+$lang->doc->noticeAcl['lib']['product']['private'] = '创建人和有权限访问的关联产品的用户可以访问。';
+$lang->doc->noticeAcl['lib']['project']['open']    = '所有人都可以访问，除非用户没有权限访问的关联项目。';
+$lang->doc->noticeAcl['lib']['project']['custom']  = '白名单和有权限访问的关联项目的用户可以访问。';
+$lang->doc->noticeAcl['lib']['project']['private'] = '创建人和有权限访问的关联项目的用户可以访问。';
+$lang->doc->noticeAcl['lib']['custom']['open']     = '所有人都可以访问。';
+$lang->doc->noticeAcl['lib']['custom']['custom']   = '白名单的用户可以访问。';
+$lang->doc->noticeAcl['lib']['custom']['private']  = '只有创建人可以访问。';
+
+$lang->doc->noticeAcl['doc']['open']    = '所有人都可以访问，除非用户没有所属文档库的权限。';
+$lang->doc->noticeAcl['doc']['custom']  = '白名单的用户可以访问。';
+$lang->doc->noticeAcl['doc']['private'] = '只有自己可以访问。';
+
 $lang->doc->placeholder = new stdclass();
 $lang->doc->placeholder->url = '相应的链接地址';
 
diff --git a/module/doc/view/create.html.php b/module/doc/view/create.html.php
index d9c277225e..1d87861612 100644
--- a/module/doc/view/create.html.php
+++ b/module/doc/view/create.html.php
@@ -63,7 +63,10 @@
           </tr>
           <tr>
             <th><?php echo $lang->doclib->control;?></th>
-            <td><?php echo html::radio('acl', $lang->doc->aclList, 'open', "onchange='toggleAcl(this.value)'")?></td>
+            <td colspan='2'>
+              <?php echo html::radio('acl', $lang->doc->aclList, 'open', "onchange='toggleAcl(this.value, \"doc\")'");?>
+              <span class='text-warning' id='noticeAcl'><?php echo $lang->doc->noticeAcl['doc']['open'];?></span>
+            </td>
           </tr>
           <tr id='whiteListBox' class='hidden'>
             <th><?php echo $lang->doc->whiteList;?></th>
@@ -88,4 +91,5 @@
     </form>
   </div>
 </div>
+<?php js::set('noticeAcl', $lang->doc->noticeAcl['doc']);?>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/doc/view/createlib.html.php b/module/doc/view/createlib.html.php
index 4d4da71c29..dd05970e64 100644
--- a/module/doc/view/createlib.html.php
+++ b/module/doc/view/createlib.html.php
@@ -39,7 +39,11 @@
             </tr>
             <tr>
               <th><?php echo $lang->doclib->control;?></th>
-              <td><?php echo html::radio('acl', $lang->doc->aclList, 'open', "onchange='toggleAcl(this.value)'")?></td>
+              <td>
+                <?php echo html::radio('acl', $lang->doc->aclList, 'open', "onchange='toggleAcl(this.value, \"lib\")'")?>
+                <span class='text-warning' id='noticeAcl'><?php echo $lang->doc->noticeAcl['lib']['product']['open'];?></span>
+              </td>
+            </tr>
             </tr>
             <tr id='whiteListBox' class='hidden'>
               <th><?php echo $lang->doc->whiteList;?></th>
@@ -63,4 +67,5 @@
     </div>
   </div>
 </div>
+<?php js::set('noticeAcl', $lang->doc->noticeAcl['lib']);?>
 <?php include '../../common/view/footer.lite.html.php';?>
diff --git a/module/doc/view/edit.html.php b/module/doc/view/edit.html.php
index f2f3b2a7ba..c08a6bedd9 100644
--- a/module/doc/view/edit.html.php
+++ b/module/doc/view/edit.html.php
@@ -60,7 +60,10 @@
         </tr>
         <tr>
           <th><?php echo $lang->doclib->control;?></th>
-          <td><?php echo html::radio('acl', $lang->doc->aclList, $doc->acl, "onchange='toggleAcl(this.value)'")?></td>
+          <td colspan='2'>
+            <?php echo html::radio('acl', $lang->doc->aclList, $doc->acl, "onchange='toggleAcl(this.value, \"doc\")'")?>
+            <span class='text-warning' id='noticeAcl'><?php echo $lang->doc->noticeAcl['doc'][$doc->acl];?></span>
+          </td>
         </tr>
         <tr id='whiteListBox' class='hidden'>
           <th><?php echo $lang->doc->whiteList;?></th>
@@ -88,4 +91,5 @@
     </form>
   </div>
 </div>
+<?php js::set('noticeAcl', $lang->doc->noticeAcl['doc']);?>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/doc/view/editlib.html.php b/module/doc/view/editlib.html.php
index 560a520635..ba55992f6e 100644
--- a/module/doc/view/editlib.html.php
+++ b/module/doc/view/editlib.html.php
@@ -36,11 +36,19 @@
       <?php endif;?>
       <tr>
         <th class='w-80px'><?php echo $lang->doc->libName?></th>
-        <td><?php echo html::input('name', $lib->name, "class='form-control'")?></td>
+        <td>
+          <?php
+          echo html::input('name', $lib->name, "class='form-control'");
+          echo html::hidden('type', $lib->type);
+          ?>
+        </td>
       </tr>
       <tr>
         <th><?php echo $lang->doclib->control;?></th>
-        <td><?php echo html::radio('acl', $lang->doc->aclList, $lib->acl, "onchange='toggleAcl(this.value)'")?></td>
+        <td>
+          <?php echo html::radio('acl', $lang->doc->aclList, $lib->acl, "onchange='toggleAcl(this.value, \"lib\")'")?>
+          <span class='text-warning' id='noticeAcl'><?php echo $lang->doc->noticeAcl['lib'][$lib->type][$lib->acl];?></span>
+        </td>
       </tr>
       <tr id='whiteListBox' class='hidden'>
         <th><?php echo $lang->doc->whiteList?></th>
@@ -61,7 +69,5 @@
     </table>
   </form>
 </div>
-<script>
-$(function(){toggleAcl($('#acl').val())});
-</script>
+<?php js::set('noticeAcl', $lang->doc->noticeAcl['lib']);?>
 <?php include '../../common/view/footer.lite.html.php';?>
diff --git a/module/install/control.php b/module/install/control.php
index 1750b294eb..20c31c0ddf 100644
--- a/module/install/control.php
+++ b/module/install/control.php
@@ -37,9 +37,6 @@ class install extends control
         if(!isset($this->config->installed) or !$this->config->installed) $this->session->set('installing', true);
 
         $this->view->title = $this->lang->install->welcome;
-
-        if($release = $this->install->getLatestRelease()) $this->view->latestRelease = $release;
-
         $this->display();
     }
 
diff --git a/module/install/view/index.html.php b/module/install/view/index.html.php
index d3766fc2d0..ce3a8d3c3a 100644
--- a/module/install/view/index.html.php
+++ b/module/install/view/index.html.php
@@ -59,20 +59,9 @@
       </table>
     </div>
     <div class='modal-footer'>
-      <?php if(isset($latestRelease) and (version_compare($latestRelease->version, $config->version) > 0)):?>
-      <div class='mgb-20'><?php vprintf($lang->install->newReleased, $latestRelease);?></div>
-      <div class='form-group'>
-        <?php 
-        echo html::a($latestRelease->url, $lang->install->seeLatestRelease, '_blank', "class='btn btn-success'");
-        echo "<span class='text-muted'> &nbsp; " . $lang->install->or . ' &nbsp; </span>';
-        echo html::a($this->createLink('install', 'step1'), $lang->install->keepInstalling, '', "class='btn btn-primary'");
-        ?>
-      </div>
-      <?php else:?>
       <div class='form-group'>
         <?php echo html::a(inlink('license'), $lang->install->start, '', "class='btn btn-primary'");?>
       </div>
-      <?php endif;?>
     </div>
   </div>
 </div>
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index b7bd6c5ea5..97ab02ecd1 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -336,7 +336,7 @@
                 {
                     $searchKey = $withSearch ? ('data-key="' . zget($plansPinYin, $plan, '') . '"') : '';
                     $actionLink = $this->createLink('story', 'batchChangePlan', "planID=$planID");
-                    echo html::a('#', $plan, '', "$searchKey onclick=\"setFormAction('$actionLink', 'hiddenwin')\"");
+                    echo html::a('#', $plan, '', "$searchKey title='{$plan}' onclick=\"setFormAction('$actionLink', 'hiddenwin')\"");
                 }
                 ?>
               </div>