Merge branch 'sprint/241_dyl_70025' into 'master'

Sprint/241 dyl 70025

See merge request easycorp/zentaopms!5531

module/execution/css/bug.css

@@ -9,4 +9,4 @@
 td.delayed {color: #fff; background: #e84e0f !important;}
 
 .c-severity {width: 80px;}
-.c-confirmed {overflow: hidden; text-align: center;}
+.c-confirmed {overflow: hidden;}

module/program/css/browse.css

@@ -14,7 +14,8 @@ tbody.sortable > tr > td.sort-handler {color: #3c4353 !important;}
 
 .has-suffix > a {padding-right: 5px; color: #0c60e1; display: inline-block; max-width: calc(100% - 50px);}
 
-.is-nest-child span.table-nest-icon {visibility: hidden; width: 0;}
+tr[data-type="project"] span.table-nest-icon {visibility: hidden; width: 0;}
+tr[data-type="project"].no-nest .c-name {padding-left: 12px;}
 div.checkbox-primary + span.table-nest-icon {margin-left: 0px !important;}
 
 #checkAll + label.hover:after {border-width: 0px;}

module/program/view/browsebylist.html.php

@@ -48,7 +48,7 @@
       $originOrders[] = $program->order;
       ?>
 
-      <tr <?php echo $trAttrs;?>>
+      <tr <?php echo $trAttrs;?> data-type="<?php echo $program->type;?>">
         <td class='c-name text-left <?php if($canOrder) echo 'sort-handler';?> has-prefix has-suffix' title='<?php echo $program->name?>'>
           <?php
           $icon = '';
@@ -58,6 +58,7 @@
           ?>
           <span class="table-nest-icon icon <?php echo $class . $icon;?>"></span>
           <?php if($program->type == 'program'):?>
+          &nbsp;<span class="icon icon-cards-view" style="color: #888fa1;"></span>
           <?php echo ($app->user->admin or strpos(",{$app->user->view->programs},", ",$program->id,") !== false) ? html::a($this->createLink('program', 'product', "programID=$program->id"), $program->name) : $program->name;?>
           <?php else:?>
           <?php echo html::a($this->createLink('project', 'index', "projectID=$program->id", '', '', $program->id), $program->name, '', 'class="text-ellipsis text-primary"');?>
@@ -117,9 +118,8 @@
 #programTableList .icon-scrum:before {content: '\e9a2';}
 #programTableList .icon-waterfall:before {content: '\e9a4';}
 #programTableList .icon-kanban:before {content: '\e983';}
-#programTableList .is-top-level {font-weight: bold;}
-#programTableList .has-nest-child > .c-name > a {color: #0b0f18!important;}
-/* #programTableList .is-nest-child > .c-name > a {color: #2463C7!important;} */
+/* #programTableList .has-nest-child > .c-name > a {color: #0b0f18!important;}
+#programTableList .is-nest-child > .c-name > a {color: #2463c7!important;} */
 #programTableList .c-name .label-danger {position: absolute; right: 10px; padding: 2px 4px;}
 </style>
 <?php js::set('originOrders', $originOrders);?>

www/theme/default/style.css

@@ -54,6 +54,7 @@ a.showMoreImage:hover {opacity: 1;}
 #visionSwitcher>div {margin: 10px 5px;}
 #visionSwitcher li.switchTo {padding-top: 5px;}
 
+th.c-confirmed, th.c-confirm {text-align: center;}
 .c-icon {width: 20px;}
 .c-count {width: 30px;}
 .c-pri {width: 40px;}