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

module/bug/js/create.js

@@ -75,8 +75,22 @@ function setTemplate(templateID)
 function deleteTemplate(templateID)
 {
     if(!templateID) return;
-    hiddenwin.location.href = createLink('bug', 'deleteTemplate', 'templateID=' + templateID);
-    $('#tplBox' + templateID).addClass('hidden');
+	if (confirm("您确认要删除该模板吗?")){
+		hiddenwin.location.href = createLink('bug', 'deleteTemplate', 'templateID=' + templateID);
+		$('#tplBox' + templateID).addClass('hidden');
+	}
+}
+
+/*visbile template x icon*/
+function mouseOver(delTempID)
+{
+    $('#delTemp'+delTempID).removeClass('hidden');
+}
+
+/*hidden template x icon*/
+function mouseOut(delTempID)
+{
+    $('#delTemp'+delTempID).addClass('hidden');
 }
 
 $(function()

module/bug/view/buildtemplates.html.php

@@ -1,11 +1,11 @@
 <?php 
 foreach($templates as $key => $template)
 {
-    echo "<li id='tplBox$template->id'>";
+    echo "<li id='tplBox$template->id' onmouseover='mouseOver($template->id)' onmouseout='mouseOut($template->id)'>";
     echo "<a title='{$lang->bug->applyTemplate}' class='tpl-name' id='tplTitleBox$template->id' href='javascript:setTemplate($template->id)'>";
     if($template->public) echo "<span class='label label-info label-badge'>{$lang->public}</span> ";
     echo $template->title . "</a>";
-    if(empty($template->public) or $template->account == $app->user->account)echo "<a href='###' onclick='deleteTemplate($template->id)' class='btn-delete'><i class='icon-remove'></i></a>";
+    if(empty($template->public) or $template->account == $app->user->account)echo "<a href='###' onclick='deleteTemplate($template->id)' id='delTemp$template->id' class='btn-delete hidden'><i class='icon-remove'></i></a>";
     echo "<span id='template$template->id' class='hidden'>$template->content</span>";
     echo '</li>';
 }

module/cron/lang/en.php

@@ -40,7 +40,7 @@ $lang->cron->introduction  = <<<EOD
 <p>This function need to be improved, so it is turned off by default.</p>
 EOD;
 $lang->cron->confirmOpen = <<<EOD
-<p>Do you want to turn it on?<a href="%s" target='hiddenwin'>Turn On Planned Task</a></p>
+<p>Do you want to turn it on?<a href="%s" target='hiddenwin'><i class="icon icon-toggle-on"></i><strong>Turn On Planned Task<strong></a></p>
 EOD;
 
 $lang->cron->notice = new stdclass();

module/cron/lang/zh-cn.php

@@ -40,7 +40,7 @@ $lang->cron->introduction  = <<<EOD
 <p>该功能还有待完善，所以默认关闭该功能</p>
 EOD;
 $lang->cron->confirmOpen = <<<EOD
-<p>是否开启该功能？<a href="%s" target='hiddenwin'>打开计划任务</a></p>
+<p>是否开启该功能？<a href="%s" target='hiddenwin'><i class="icon icon-toggle-on"></i><strong>打开计划任务</strong></a></p>
 EOD;
 
 $lang->cron->notice = new stdclass();

module/cron/lang/zh-tw.php

@@ -40,7 +40,7 @@ $lang->cron->introduction  = <<<EOD
 <p>該功能還有待完善，所以預設關閉該功能</p>
 EOD;
 $lang->cron->confirmOpen = <<<EOD
-<p>是否開啟該功能？<a href="%s" target='hiddenwin'>打開計劃任務</a></p>
+<p>是否開啟該功能？<a href="%s" target='hiddenwin'><i class="icon icon-toggle-on"></i><strong>打開計劃任務</strong></a></p>
 EOD;
 
 $lang->cron->notice = new stdclass();

module/testcase/view/view.html.php

@@ -79,28 +79,25 @@
         <legend><?php echo $lang->testcase->precondition;?></legend>
         <?php echo nl2br($case->precondition);?>
       </fieldset>
-      <fieldset>
-        <legend><?php echo $lang->testcase->stepDesc;?></legend>
-        <table class='table table-condensed table-hover table-striped'>
-          <thead>
-            <tr>
-              <th class='w-40px'><?php echo $lang->testcase->stepID;?></th>
-              <th class='w-p70'><?php echo $lang->testcase->stepDesc;?></th>
-              <th><?php echo $lang->testcase->stepExpect;?></th>
-            </tr>
-          </thead>
-          <?php
-          foreach($case->steps as $stepID => $step)
-          {
-              $stepID += 1;
-              echo "<tr><th class='w-id text-center strong'>$stepID</th>";
-              echo "<td>" . nl2br($step->desc) . "</td>";
-              echo "<td>" . nl2br($step->expect) . "</td>";
-              echo "</tr>";
-          }
-          ?>
-        </table>
-      </fieldset>
+      <table class='table table-condensed table-hover table-striped'>
+        <thead>
+          <tr>
+            <th class='w-40px'><?php echo $lang->testcase->stepID;?></th>
+            <th class='w-p70 text-left'><?php echo $lang->testcase->stepDesc;?></th>
+            <th class='text-left'><?php echo $lang->testcase->stepExpect;?></th>
+          </tr>
+        </thead>
+        <?php
+        foreach($case->steps as $stepID => $step)
+        {
+            $stepID += 1;
+            echo "<tr><th class='w-id text-center strong'>$stepID</th>";
+            echo "<td class='text-left'>" . nl2br($step->desc) . "</td>";
+            echo "<td class='text-left'>" . nl2br($step->expect) . "</td>";
+            echo "</tr>";
+        }
+        ?>
+      </table>
       <?php echo $this->fetch('file', 'printFiles', array('files' => $case->files, 'fieldset' => 'true'));?>
       <?php include '../../common/view/action.html.php';?>
       <div class='actions'><?php echo $actionLinks;?></div>

module/testtask/view/browse.html.php

@@ -23,24 +23,25 @@
   <thead>
   <?php $vars = "productID=$productID&branch=$branch&type=$type&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
     <tr>
-      <th class='w-id'>   <?php common::printOrderLink('id',      $orderBy, $vars, $lang->idAB);?></th>
-      <th class='w-200px'><?php common::printOrderLink('name',    $orderBy, $vars, $lang->testtask->name);?></th>
-      <th>                <?php echo $lang->testtask->project . '/' . $lang->testtask->build;?>
-      <th class='w-user'> <?php common::printOrderLink('owner',   $orderBy, $vars, $lang->testtask->owner);?></th>
-      <th class='w-100px'><?php common::printOrderLink('begin',   $orderBy, $vars, $lang->testtask->begin);?></th>
-      <th class='w-100px'><?php common::printOrderLink('end',     $orderBy, $vars, $lang->testtask->end);?></th>
-      <th class='w-80px'> <?php common::printOrderLink('status',  $orderBy, $vars, $lang->statusAB);?></th>
-      <th class='w-120px {sorter:false}'><?php echo $lang->actions;?></th>
+      <th class='w-id text-left'>   <?php common::printOrderLink('id',      $orderBy, $vars, $lang->idAB);?></th>
+      <th class='w-200px text-left'><?php common::printOrderLink('name',    $orderBy, $vars, $lang->testtask->name);?></th>
+      <th class='text-left'>        <?php echo $lang->testtask->project . '/' . $lang->testtask->build;?>
+      <th class='w-user text-left'> <?php common::printOrderLink('owner',   $orderBy, $vars, $lang->testtask->owner);?></th>
+      <th class='w-100px text-left'><?php common::printOrderLink('begin',   $orderBy, $vars, $lang->testtask->begin);?></th>
+      <th class='w-100px text-left'><?php common::printOrderLink('end',     $orderBy, $vars, $lang->testtask->end);?></th>
+      <th class='w-80px text-left'> <?php common::printOrderLink('status',  $orderBy, $vars, $lang->statusAB);?></th>
+      <th class='w-120px {sorter:false} text-left'><?php echo $lang->actions;?></th>
     </tr>
   </thead>
   <tbody>
   <?php foreach($tasks as $task):?>
-  <tr class='text-center'>
+  <tr class='text-left'>
     <td><?php echo html::a(inlink('view', "taskID=$task->id"), sprintf('%03d', $task->id));?></td>
     <td class='text-left' title="<?php echo $task->name?>"><?php echo html::a(inlink('cases', "taskID=$task->id"), $task->name);?></td>
     <td title="<?php echo $task->projectName . '/' . $task->buildName?>">
       <?php
-      echo html::a($this->createLink('project', 'story', "projectID=$task->project"), $task->projectName) . '/'; 
+      echo $task->projectName . '/'; 
+      //echo html::a($this->createLink('project', 'story', "projectID=$task->project"), $task->projectName) . '/'; 
       $task->build == 'trunk' ? print($lang->trunk) : print(html::a($this->createLink('build', 'view', "buildID=$task->build"), $task->buildName));;
       ?>
     </td>