Merge branch 'sprint/285_tsj' into 'sprint/285'

Sprint/285 tsj

See merge request easycorp/zentaopms!6906

module/admin/config.php

@@ -22,7 +22,6 @@ $config->admin->menuModuleGroup['model']['custom|set']        = array('project',
 $config->admin->menuModuleGroup['model']['custom|required']   = array('project', 'build');
 $config->admin->menuModuleGroup['feature']['custom|set']      = array('todo', 'block', 'story', 'task', 'bug', 'testcase', 'testtask', 'feedback', 'user', 'ticket');
 $config->admin->menuModuleGroup['feature']['custom|required'] = array('bug', 'doc', 'product', 'story', 'productplan', 'release', 'task', 'testcase', 'testsuite', 'testtask', 'testreport', 'caselib', 'doc', 'feedback', 'user');
-$config->admin->menuModuleGroup['template']['custom|set']     = array('baseline');
 if($config->vision == 'lite')
 {
     $config->admin->menuModuleGroup['model']['custom|set']        = array();
@@ -87,7 +86,7 @@ $config->admin->helpURL['convert']   = 'https://www.zentao.net/book/zentaopms/65
 
 $config->admin->navsGroup['my']        = ',todo,block,';
 $config->admin->navsGroup['product']   = ',product,story,productplan,release,';
-$config->admin->navsGroup['execution'] = ',execution,';
+$config->admin->navsGroup['execution'] = ',execution,task,';
 $config->admin->navsGroup['project']   = ',project,story,';
 $config->admin->navsGroup['qa']        = ',bug,testcase,testsuite,testtask,testreport,caselib,';
 if($config->vision == 'lite') $config->admin->navsGroup['my'] .= 'task,';

module/custom/css/browsestoryconcept.css

@@ -1,3 +1,7 @@
 .table-form>tbody>tr>th{text-align: center}
 .c-default {width: 70px;}
 .setBtn {margin-top: -5px;}
+.px-0 {padding-left: 0; padding-right: 0;}
+.pl-20 {padding-left: 20px;}
+.pt-5 {padding-top: 5px;}
+.box-shadow-none {box-shadow: unset!important;}

module/custom/css/common.css

@@ -1,2 +1,3 @@
 .alert-block {border-top: 1px solid #ddd;}
 .btn-toolbar.pull-left .divider {margin-left: 0px; border-color: rgba(0,0,0,.2);}
+.main-content .main-header {padding: 10px 20px;}

module/custom/view/browsestoryconcept.html.php

@@ -12,16 +12,16 @@
 <?php include $app->getModuleRoot() . 'common/view/header.html.php';?>
 <div id='mainContent' class='main-row'>
   <?php include 'sidebar.html.php';?>
-  <div class='main-col main-content main-table'>
-    <div>
-      <div class='pull-left'>
+  <div class='main-col main-content main-table px-0'>
+    <div class="main-header">
+      <div class='pull-left pl-20 pt-5'>
         <strong><?php echo $lang->custom->product->fields['browsestoryconcept']?></strong>
       </div>
       <div class='pull-right setBtn'>
         <?php if(common::hasPriv('custom', 'setstoryconcept')) echo html::a($this->createLink('custom', 'setstoryconcept', '', '', true), $lang->custom->setStoryConcept, '', "class='btn btn-primary iframe' data-width=" . ($this->config->URAndSR ? "590px" : "405px"));?>
       </div>
     </div>
-    <table class='table table-form'>
+    <table class='table table-form box-shadow-none'>
       <thead>
         <tr>
           <?php if(common::hasPriv('custom', 'setDefaultConcept')):?>

module/custom/view/set.html.php

@@ -48,7 +48,7 @@ EOT;
 </style>
 <?php endif;?>
 <div id='mainContent' class='main-row'>
-  <?php if(!in_array($module, array('block'))) include 'sidebar.html.php';?>
+  <?php if(!in_array($module, array('block', 'baseline'))) include 'sidebar.html.php';?>
   <div class='main-col main-content'>
     <form class="load-indicator main-form form-ajax" method='post'>
       <div class='main-header'>