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

module/bug/view/view.html.php

@@ -16,7 +16,7 @@
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
     <?php if(!isonlybody()):?>
-    <?php echo html::a($browseLink, '<i class="icon icon-back icon-sm"></i> ' . $lang->goback, '', "class='btn btn-primary'");?>
+    <?php echo html::a($browseLink, '<i class="icon icon-back icon-sm"></i> ' . $lang->goback, '', "class='btn btn-secondary'");?>
     <div class="divider"></div>
     <?php endif;?>
     <div class="page-title">

module/project/css/create.css

@@ -10,8 +10,6 @@
 #copyProjectModal a.active:after {position: absolute; content: '\e92f'; font-family: ZentaoIcon; font-size: 20px; right: 25px;}
 #copyProjectModal a.cancel {color: #ff5d5d}
 
-.modal-dialog {margin-top: 10%!important;}
-
 .checkbox input[type=checkbox], .checkbox-inline input[type=checkbox], .radio input[type=radio], .radio-inline input[type=radio] {margin-top: 1px;}
 
 .type-tips {display: none;}

module/project/css/kanban.css

@@ -39,3 +39,6 @@
 #kanban .fix-table-copy-wrapper th.c-board {color: #eee;}
 #kanban .fix-table-copy-wrapper th.c-board .btn-link {color: #fff;}
 #kanban .group-title {word-break: break-all; line-height: 16px; padding: 3px 0; display: block;}
+
+.table-grouped > tbody > tr,
+.table-grouped > tbody > tr:hover {background: #fff!important;}

module/project/css/storykanban.css

@@ -39,3 +39,6 @@
 #kanban .fix-table-copy-wrapper {overflow: visible!important;}
 #kanban .fix-table-copy-wrapper th.c-board {color: #eee;}
 .story-estimate{margin-right: 5px;}
+
+.table-grouped > tbody > tr,
+.table-grouped > tbody > tr:hover {background: #fff!important;}

module/project/js/create.js

@@ -5,7 +5,6 @@ function setCopyProject(projectID)
 
 $(function()
 {
-    $('#cpmBtn').click(function(){$('#copyProjectModal').modal('show')});
     $('#copyProjects a').click(function(){setCopyProject($(this).data('id')); $('#copyProjectModal').modal('hide')});
     $('#begin').on('change', function()
     {

module/project/view/create.html.php

@@ -39,7 +39,7 @@
     <div class='main-header'>
       <h2><?php echo $lang->project->create;?></h2>
       <div class="pull-right btn-toolbar">
-        <button type='button' class='btn btn-link' id='cpmBtn'><?php echo html::icon($lang->icons['copy'], 'muted') . ' ' . $lang->project->copy;?></button>
+        <button type='button' class='btn btn-link' id='cpmBtn' data-toggle='modal' data-target='#copyProjectModal'><?php echo html::icon($lang->icons['copy'], 'muted') . ' ' . $lang->project->copy;?></button>
       </div>
     </div>
     <form class='form-indicator main-form form-ajax' method='post' target='hiddenwin' id='dataform'>
@@ -154,7 +154,7 @@
     </form>
   </div>
 </div>
-<div class='modal fade' id='copyProjectModal'>
+<div class='modal fade modal-scroll-inside' id='copyProjectModal'>
   <div class='modal-dialog mw-900px'>
     <div class='modal-header'>
       <button type='button' class='close' data-dismiss='modal'><i class="icon icon-close"></i></button>

module/story/view/view.html.php

@@ -16,7 +16,7 @@
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
     <?php if(!isonlybody()):?>
-    <?php echo html::a($browseLink, '<i class="icon icon-back icon-sm"></i> ' . $lang->goback, '', "class='btn btn-primary'");?>
+    <?php echo html::a($browseLink, '<i class="icon icon-back icon-sm"></i> ' . $lang->goback, '', "class='btn btn-secondary'");?>
     <div class="divider"></div>
     <?php endif;?>
     <div class="page-title">

module/task/view/view.html.php

@@ -16,7 +16,7 @@
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
     <?php if(!isonlybody()):?>
-    <?php echo html::a($browseLink, '<i class="icon icon-back icon-sm"></i> ' . $lang->goback, '', "class='btn btn-primary'");?>
+    <?php echo html::a($browseLink, '<i class="icon icon-back icon-sm"></i> ' . $lang->goback, '', "class='btn btn-secondary'");?>
     <div class="divider"></div>
     <?php endif;?>
     <div class="page-title">

module/testcase/view/view.html.php

@@ -15,7 +15,7 @@
 <?php $browseLink  = $app->session->caseList != false ? $app->session->caseList : $this->createLink('testcase', 'browse', "productID=$case->product");?>
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
-    <?php echo html::a($browseLink, '<i class="icon icon-back icon-sm"></i> ' . $lang->goback, '', "class='btn btn-primary'");?>
+    <?php echo html::a($browseLink, '<i class="icon icon-back icon-sm"></i> ' . $lang->goback, '', "class='btn btn-secondary'");?>
     <div class="divider"></div>
     <div class="page-title">
       <span class='label label-id'><?php echo $case->id;?></span>
@@ -33,7 +33,7 @@
         for($i = $case->version; $i >= 1; $i --)
         {
             $class = $i == $version ? " class='active'" : '';
-            echo '<li' . $class .'>' . html::a(inlink('view', "caseID=$case->id&version=$i"), '#' . $i) . '</li>'; 
+            echo '<li' . $class .'>' . html::a(inlink('view', "caseID=$case->id&version=$i"), '#' . $i) . '</li>';
         }
         ?>
         </ul>
@@ -115,7 +115,7 @@
             <tr>
               <th><?php echo $lang->testcase->module;?></th>
               <td>
-                <?php 
+                <?php
                 if(empty($modulePath))
                 {
                     echo "/";
@@ -154,7 +154,7 @@
             <tr>
               <th><?php echo $lang->testcase->stage;?></th>
               <td>
-                <?php 
+                <?php
                 if($case->stage)
                 {
                     $stags = explode(',', $case->stage);
@@ -175,7 +175,7 @@
             <tr>
               <th><?php echo $lang->testcase->status;?></th>
               <td>
-                <?php 
+                <?php
                 echo $lang->testcase->statusList[$case->status];
                 if($case->version > $case->currentVersion and $from == 'testtask')
                 {
@@ -236,8 +236,8 @@
             <tr>
               <th class='w-60px' valign="top"><?php echo $lang->testcase->toBug;?></th>
               <td>
-              <?php 
-              foreach($case->toBugs as $bugID => $bugTitle) 
+              <?php
+              foreach($case->toBugs as $bugID => $bugTitle)
               {
                   echo '<p style="margin-bottom:0;">' . html::a($this->createLink('bug', 'view', "bugID=$bugID", '', true), $bugTitle, '', "class='iframe' data-width='80%'") . '</p>';
               }

module/tree/view/browse.html.php

@@ -17,7 +17,7 @@
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
     <?php $backLink = $this->session->{$viewType . 'List'} ? $this->session->{$viewType . 'List'} : 'javascript:history.go(-1)';?>
-    <a href="<?php echo $backLink;?>" class="btn btn-primary">
+    <a href="<?php echo $backLink;?>" class="btn btn-secondary">
       <i class="icon icon-back icon-sm"></i> <?php echo $lang->goback;?>
     </a>
     <div class="divider"></div>

module/tree/view/browsetask.html.php

@@ -14,7 +14,7 @@
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
     <?php $backLink = $this->session->taskList ? $this->session->taskList : 'javascript:history.go(-1)';?>
-    <a href="<?php echo $backLink;?>" class="btn btn-link">
+    <a href="<?php echo $backLink;?>" class="btn btn-secondary">
       <i class="icon icon-back icon-sm"></i> <?php echo $lang->goback;?>
     </a>
     <div class="divider"></div>