Merge branch 'master' of https://github.com/easysoft/zentaopms

module/doc/lang/en.php

@@ -187,6 +187,10 @@ $lang->doclib->select  = 'Select';
 $lang->doclib->project = $lang->projectCommon . ' Library';
 $lang->doclib->product = $lang->productCommon . ' Library';
 
+$lang->doclib->create['product'] = 'Create ' . $lang->productCommon . ' Library';
+$lang->doclib->create['project'] = 'Create ' . $lang->projectCommon . ' Library';
+$lang->doclib->create['custom']  = 'Create Custom Library';
+
 $lang->doclib->main['product'] =  'Main Library';
 $lang->doclib->main['project'] =  'Main Library';
 

module/doc/lang/zh-cn.php

@@ -187,6 +187,10 @@ $lang->doclib->select  = '选择文档库';
 $lang->doclib->project = $lang->projectCommon . '库';
 $lang->doclib->product = $lang->productCommon . '库';
 
+$lang->doclib->create['product'] = '创建' . $lang->productCommon . '文档库';
+$lang->doclib->create['project'] = '创建' . $lang->projectCommon . '文档库';
+$lang->doclib->create['custom']  = '创建自定义文档库';
+
 $lang->doclib->main['product'] = $lang->productCommon . '主库';
 $lang->doclib->main['project'] = $lang->projectCommon . '主库';
 

module/doc/view/side.html.php

@@ -32,6 +32,14 @@ if(empty($type)) $type = 'product';
         <div class="tab-pane <?php echo $activeClass;?>" id="<?php echo "$tabValue";?>">
           <ul data-name="docsTree" data-ride="tree" data-initial-state="preserve" class="tree no-margin">
             <?php if(isset($sideSubLibs[$tabValue])):?>
+            <?php if(empty($sideLibs[$tabValue])):?>
+            <li>
+            <?php
+            $text = zget($lang->doclib->create, $tabValue, '');
+            if($text) echo html::a($this->createLink($tabValue, 'create'), $text, '', "class='text-ellipsis'");
+            ?>
+            </li>
+            <?php else:?>
             <?php foreach($sideLibs[$tabValue] as $tabMenu):?>
             <?php
             $customLibCount = 0;
@@ -110,8 +118,17 @@ if(empty($type)) $type = 'product';
               <?php endif;?>
             </li>
             <?php endforeach;?>
+            <?php endif;?>
             <?php else:?>
 
+            <?php if(empty($sideLibs[$tabValue])):?>
+            <li>
+            <?php
+            $text = zget($lang->doclib->create, $tabValue, '');
+            if($text) echo html::a($this->createLink('doc', 'createLib', "type={$tabValue}"), $text, '', "class='iframe'");
+            ?>
+            </li>
+            <?php else:?>
             <?php foreach($sideLibs[$tabValue] as $sideLibID => $sideLibName):?>
               <?php if($tabValue == 'book'):?>
               <?php include './bookside.html.php';?>
@@ -138,6 +155,7 @@ if(empty($type)) $type = 'product';
             <?php endforeach;?>
 
             <?php endif;?>
+            <?php endif;?>
           </ul>
         </div>
         <?php endforeach;?>

module/my/model.php

@@ -22,23 +22,29 @@ class myModel extends model
     public function setMenu()
     {
         /* Adjust the menu order according to the user role. */
-        $role = $this->app->user->role;
-        if($role == 'qa')
+        $flowModule = $this->config->global->flow . '_my';
+        $customMenu = isset($this->config->customMenu->$flowModule) ? $this->config->customMenu->$flowModule : array();
+
+        if(empty($customMenu))
         {
-            unset($this->lang->my->menuOrder[20]);
-            $this->lang->my->menuOrder[32] = 'task';
-        }
-        elseif($role == 'po')
-        {
-            unset($this->lang->my->menuOrder[35]);
-            unset($this->lang->my->menuOrder[20]);
-            $this->lang->my->menuOrder[17] = 'story';
-            $this->lang->my->menuOrder[42] = 'task';
-        }
-        elseif($role == 'pm')
-        {
-            unset($this->lang->my->menuOrder[40]);
-            $this->lang->my->menuOrder[17] = 'myProject';
+            $role = $this->app->user->role;
+            if($role == 'qa')
+            {
+                unset($this->lang->my->menuOrder[15]);
+                $this->lang->my->menuOrder[32] = 'task';
+                $this->lang->my->dividerMenu = str_replace(',task,', ',' , $this->lang->my->menuOrder[20] . ',', $this->lang->my->dividerMenu);
+            }
+            elseif($role == 'po')
+            {
+                $this->lang->my->menuOrder[15] = 'story';
+                $this->lang->my->menuOrder[30] = 'task';
+                $this->lang->my->dividerMenu = str_replace(',task,', ',story,', $this->lang->my->dividerMenu);
+            }
+            elseif($role == 'pm')
+            {
+                unset($this->lang->my->menuOrder[35]);
+                $this->lang->my->menuOrder[17] = 'myProject';
+            }
         }
     }
 }

module/search/view/buildform.html.php

@@ -215,7 +215,7 @@ foreach($fieldParams as $fieldName => $param)
             echo html::commonButton($lang->search->reset, '', 'btn-reset-form btn');
         }
         echo html::commonButton('<i class="icon icon-chevron-double-down"></i>', '', 'btn-expand-form btn btn-info pull-right');
-        echo html::hidden('formType', 'lite');
+        echo html::hidden('formType', zget($formSession, 'formType', 'lite'));
         ?>
       </td>
     </tr>
@@ -287,8 +287,7 @@ $(function()
             }
         }
 
-        $searchForm.find('#formType').val(expand ? 'more' : '');
-        $searchForm.toggleClass('showmore', expand);
+        $searchForm.find('#formType').val(expand ? 'more' : 'lite');
     };
 
     /**
@@ -441,6 +440,7 @@ $(function()
 
     $searchForm.find('.btn-save-form').modalTrigger({width:650, type:'iframe', title: setQueryTitle});
 
+    if($('#formType').val() == 'more') expandForm(true);
     $searchForm.on('click', '.user-query .icon-close', function(e)
     {
         var $query = $(this).closest('.user-query');
@@ -457,6 +457,6 @@ $(function()
     $searchForm.find('.table-condensed input.date').each(function()
     {
         setDateField($(this), $(this).attr('id').substr(5));
-    })
+    });
 });
 </script>