Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3

module/common/lang/menu.php

@@ -173,7 +173,7 @@ $lang->product->menu->settings['subMenu']->module    = array('link' => "{$lang->
 $lang->product->menu->settings['subMenu']->branch    = array('link' => "@branch@|branch|manage|product=%s", 'subModule' => 'branch');
 $lang->product->menu->settings['subMenu']->whitelist = array('link' => "{$lang->whitelist}|product|whitelist|product=%s", 'subModule' => 'personnel');
 
-$lang->product->dividerMenu = $config->URAndSR ? ',requirement,set,' : ',track,set,';
+$lang->product->dividerMenu = $config->URAndSR ? ',story,requirement,settings,' : ',story,track,settings,';
 
 /* Project menu. */
 $lang->project->homeMenu = new stdclass();

module/doc/view/create.html.php

@@ -19,7 +19,15 @@
       <h2><?php echo $lang->doc->create;?></h2>
     </div>
     <?php if(isset($this->config->bizVersion)):?>
-    <div class='alert alert-warning strong'><?php printf($lang->doc->notSetOffice, zget($lang->doc->typeList, $docType), common::hasPriv('custom', 'libreoffice') ? $this->createLink('custom', 'libreoffice') : '###');?></div>
+    <div class='alert alert-warning strong'>
+      <?php
+      $isonlybody = isonlybody();
+      unset($_GET['onlybody']);
+
+      printf($lang->doc->notSetOffice, zget($lang->doc->typeList, $docType), common::hasPriv('custom', 'libreoffice') ? $this->createLink('custom', 'libreoffice') : '###');
+      if($isonlybody) $_GET['onlybody'] = 'yes';
+      ?>
+    </div>
     <?php else:?>
     <div class='alert alert-warning strong'><?php printf($lang->doc->cannotCreateOffice, zget($lang->doc->typeList, $docType));?></div>
     <?php endif;?>
@@ -39,26 +47,26 @@
       <h2><?php echo $lang->doc->create;?></h2>
     </div>
     <form class="load-indicator main-form form-ajax" id="dataform" method='post' enctype='multipart/form-data'>
-      <table class='table table-form'> 
+      <table class='table table-form'>
         <tbody>
           <tr>
             <th class='w-110px'><?php echo $lang->doc->lib;?></th>
             <td> <?php echo html::select('lib', $libs, $libID, "class='form-control chosen' onchange=loadDocModule(this.value)");?> </td><td></td>
-          </tr>  
+          </tr>
           <tr>
             <th><?php echo $lang->doc->module;?></th>
             <td>
               <span id='moduleBox'><?php echo html::select('module', $moduleOptionMenu, $moduleID, "class='form-control chosen'");?></span>
             </td><td></td>
-          </tr>  
+          </tr>
           <tr>
             <th><?php echo $lang->doc->title;?></th>
             <td colspan='2'><?php echo html::input('title', '', "class='form-control' required");?></td>
-          </tr> 
+          </tr>
           <tr>
             <th><?php echo $lang->doc->keywords;?></th>
             <td colspan='2'><?php echo html::input('keywords', '', "class='form-control'");?></td>
-          </tr>  
+          </tr>
           <tr>
             <th><?php echo $lang->doc->type;?></th>
             <?php
@@ -66,7 +74,7 @@
             foreach($lang->doc->types as $typeKey => $typeName) $typeKeyList[$typeKey] = $typeKey;
             ?>
             <td><?php echo html::radio('type', $lang->doc->types, zget($typeKeyList, $docType, 'text'));?></td>
-          </tr> 
+          </tr>
           <tr id='contentBox'>
             <th><?php echo $lang->doc->content;?></th>
             <td colspan='2'>

module/group/css/managepriv.zh-cn.css

@@ -1 +1 @@
-.thWidth {width: 150px !important;}
+.thWidth {width: 160px !important;}

module/group/css/managepriv.zh-tw.css

@@ -1 +1 @@
-.thWidth {width: 150px !important;}
+.thWidth {width: 160px !important;}

module/project/view/browse.html.php

@@ -54,6 +54,9 @@ js::set('browseType', $browseType);
     <div class="sidebar-toggle"><i class="icon icon-angle-left"></i></div>
     <div class="cell">
       <?php echo $programTree;?>
+      <div class="text-center">
+        <?php common::printLink('project', 'programTitle', '', $lang->project->moduleSetting, '', "class='btn btn-info btn-wide iframe'", true, true);?>
+      </div>
     </div>
   </div>
   <?php endif;?>