From 5236f5729d4161971f42943366415f52b9dfceae Mon Sep 17 00:00:00 2001
From: Catouse <catouse@gmail.com>
Date: Wed, 30 May 2018 08:46:10 +0800
Subject: [PATCH]  * refactor views.

---
 module/bug/view/browse.html.php           | 2 +-
 module/bug/view/create.html.php           | 4 ++--
 module/common/view/datatable.fix.html.php | 4 ++--
 module/company/view/browse.html.php       | 2 +-
 module/doc/view/objectlibs.html.php       | 2 +-
 module/message/control.php                | 2 +-
 module/product/view/all.html.php          | 2 +-
 module/product/view/browse.html.php       | 2 +-
 module/project/view/story.html.php        | 2 +-
 module/project/view/task.html.php         | 2 +-
 module/score/model.php                    | 2 +-
 module/task/view/create.html.php          | 2 +-
 module/task/view/edit.html.php            | 2 +-
 module/testcase/view/browse.html.php      | 2 +-
 module/testsuite/view/library.html.php    | 2 +-
 module/testtask/view/cases.html.php       | 2 +-
 module/testtask/view/results.html.php     | 4 ++--
 module/testtask/view/runcase.html.php     | 4 ++--
 module/tutorial/view/index.html.php       | 2 +-
 19 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index fc4222185a..7796a060e3 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -197,7 +197,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
   </div>
   <?php endif;?>
 </div>
-<div id="mainContent" class="main-row">
+<div id="mainContent" class="main-row fade">
   <div class="side-col" id="sidebar">
     <div class="sidebar-toggle"><i class="icon icon-angle-left"></i></div>
     <div class="cell">
diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php
index f013d78246..90e99789e3 100644
--- a/module/bug/view/create.html.php
+++ b/module/bug/view/create.html.php
@@ -264,11 +264,11 @@ js::set('confirmDeleteTemplate', $lang->bug->confirmDeleteTemplate);
     </form>
   </div>
 </div>
-<div class="modal fade" id="saveTplModal" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="modal fade" id="saveTplModal" tabindex="-1" role="dialog">
   <div class="modal-dialog w-600px">
     <div class="modal-content">
       <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+        <button type="button" class="close" data-dismiss="modal"><i class="icon icon-close"></i></button>
         <h4 class="modal-title"><?php echo $lang->bug->setTemplateTitle;?></h4>
       </div>
       <div class="modal-body">
diff --git a/module/common/view/datatable.fix.html.php b/module/common/view/datatable.fix.html.php
index 7513486490..2e806649d8 100644
--- a/module/common/view/datatable.fix.html.php
+++ b/module/common/view/datatable.fix.html.php
@@ -45,11 +45,11 @@ $(function()
 });
 </script>
 
-<div class="modal fade" id="showModuleModal" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="modal fade" id="showModuleModal" tabindex="-1" role="dialog">
   <div class="modal-dialog w-600px">
     <div class="modal-content">
       <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+        <button type="button" class="close" data-dismiss="modal"><i class="icon icon-close"></i></button>
         <h4 class="modal-title"><i class="icon-cog"></i> <?php echo $lang->datatable->showModule?></h4>
       </div>
       <div class="modal-body">
diff --git a/module/company/view/browse.html.php b/module/company/view/browse.html.php
index c22a260ad1..d8118af5df 100644
--- a/module/company/view/browse.html.php
+++ b/module/company/view/browse.html.php
@@ -31,7 +31,7 @@ js::set('confirmDelete', $lang->user->confirmDelete);
     <?php common::printLink('user', 'create', "dept={$deptID}", "<i class='icon icon-plus'></i> " . $lang->user->create, '', "class='btn btn-primary'");?>
   </div>
 </div>
-<div id='mainContent' class='main-row'>
+<div id='mainContent' class='main-row fade'>
   <div class='side-col' id='sidebar'>
     <div class="sidebar-toggle"><i class="icon icon-angle-left"></i></div>
     <div class='cell'>
diff --git a/module/doc/view/objectlibs.html.php b/module/doc/view/objectlibs.html.php
index 9373c4c3b7..857f0d9769 100644
--- a/module/doc/view/objectlibs.html.php
+++ b/module/doc/view/objectlibs.html.php
@@ -11,7 +11,7 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<div class="main-row <?php if($this->from == 'doc') echo 'split-row';?>" id="mainRow">
+<div class="fade main-row <?php if($this->from == 'doc') echo 'split-row';?>" id="mainRow">
   <?php if($this->from == 'doc'):?>
   <?php include './side.html.php';?>
   <?php endif;?>
diff --git a/module/message/control.php b/module/message/control.php
index 3660201f7b..83b4826312 100644
--- a/module/message/control.php
+++ b/module/message/control.php
@@ -98,7 +98,7 @@ class message extends control
 <div class='alert alert-info with-icon alert-dismissable' style='width:380px; position:fixed; bottom:25px; right:15px; z-index: 9999;'>
    <i class='icon icon-envelope-alt'>  </i>
    <div class='content'>{$messages}</div>
-   <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
+   <button type="button" class="close" data-dismiss="alert">×</button>
  </div>
 EOT;
         }
diff --git a/module/product/view/all.html.php b/module/product/view/all.html.php
index 6b83404217..df401acff7 100644
--- a/module/product/view/all.html.php
+++ b/module/product/view/all.html.php
@@ -43,7 +43,7 @@
     <?php echo html::a($this->createLink('product', 'create'), "<i class='icon-plus'></i> " . $lang->product->create,'', "class='btn btn-primary'") ?>
   </div>
 </div>
-<div id="mainContent" class="main-row">
+<div id="mainContent" class="main-row fade">
   <div class="side-col" id="sidebar">
     <div class="sidebar-toggle"><i class="icon icon-angle-left"></i></div>
     <div class="cell">
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index 8b66235820..641d8ac238 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -110,7 +110,7 @@
     ?>
   </div>
 </div>
-<div id="mainContent" class="main-row">
+<div id="mainContent" class="main-row fade">
   <div class="side-col" id="sidebar">
     <div class="sidebar-toggle"><i class="icon icon-angle-left"></i></div>
     <div class="cell">
diff --git a/module/project/view/story.html.php b/module/project/view/story.html.php
index c91acaffc7..745626cef9 100644
--- a/module/project/view/story.html.php
+++ b/module/project/view/story.html.php
@@ -69,7 +69,7 @@
   </div>
 </div>
 
-<div id="mainContent" class="main-row">
+<div id="mainContent" class="main-row fade">
   <div class='side-col' id='sidebar'>
     <div class="sidebar-toggle"><i class="icon icon-angle-left"></i></div>
     <div class="cell">
diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php
index fc0757687c..e9601a4234 100644
--- a/module/project/view/task.html.php
+++ b/module/project/view/task.html.php
@@ -152,7 +152,7 @@ js::set('browseType', $browseType);
     ?>
   </div>
 </div>
-<div id="mainContent" class="main-row">
+<div id="mainContent" class="main-row fade">
   <div class="side-col" id="sidebar">
     <div class="sidebar-toggle"><i class="icon icon-angle-left"></i></div>
     <div class="cell">
diff --git a/module/score/model.php b/module/score/model.php
index 48cf42a51d..f2484ca794 100644
--- a/module/score/model.php
+++ b/module/score/model.php
@@ -298,7 +298,7 @@ class scoreModel extends model
 <div id='noticeAttend' class='alert alert-success with-icon alert-dismissable' style='width:280px; position:fixed; bottom:25px; right:15px; z-index: 9999;' id='planInfo'>
    <i class='icon icon-diamond'>  </i>
    <div class='content'>{$notice}</div>
-   <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
+   <button type="button" class="close" data-dismiss="alert">×</button>
  </div>
 EOT;
         return $fullNotice;
diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php
index ee84e00152..e8b1ed0360 100644
--- a/module/task/view/create.html.php
+++ b/module/task/view/create.html.php
@@ -175,7 +175,7 @@
         <div class='modal-dialog'>
           <div class='modal-header'>
             <button type='button' class='close' data-dismiss='modal'>
-              <span aria-hidden='true'>×</span><span class='sr-only'><?php echo $lang->task->close;?></span>
+              <i class="icon icon-close"></i>
             </button>
             <h4 class='modal-title'><?php echo $lang->task->team;?></h4>
           </div>
diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php
index 81907b1a2d..056a9a71e1 100644
--- a/module/task/view/edit.html.php
+++ b/module/task/view/edit.html.php
@@ -213,7 +213,7 @@
       <div class="modal-dialog">
         <div class="modal-header">
           <button type="button" class="close" data-dismiss="modal">
-            <span aria-hidden="true">×</span><span class="sr-only"><?php echo $lang->task->close;?></span>
+            <i class="icon icon-close"></i>
           </button>
           <h4 class="modal-title"><?php echo $lang->task->team?></h4>
         </div>
diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php
index 42512f95b5..3c78de79d4 100644
--- a/module/testcase/view/browse.html.php
+++ b/module/testcase/view/browse.html.php
@@ -23,7 +23,7 @@ js::set('batchDelete',    $lang->testcase->confirmBatchDelete);
 js::set('productID',      $productID);
 js::set('branch',         $branch);
 ?>
-<div id="mainContent" class="main-row">
+<div id="mainContent" class="main-row fade">
   <div class='side-col' id='sidebar'>
     <div class="sidebar-toggle"><i class="icon icon-angle-left"></i></div>
     <div class='cell'>
diff --git a/module/testsuite/view/library.html.php b/module/testsuite/view/library.html.php
index a45adcc429..63c9208f67 100644
--- a/module/testsuite/view/library.html.php
+++ b/module/testsuite/view/library.html.php
@@ -104,7 +104,7 @@ js::set('flow',   $this->config->global->flow);
   </div>
 </div>
 <?php endif;?>
-<div id="mainContent" class="main-row">
+<div id="mainContent" class="main-row fade">
   <div class="side-col" id="sidebar">
     <div class="sidebar-toggle"><i class="icon icon-angle-left"></i></div>
     <div class="cell">
diff --git a/module/testtask/view/cases.html.php b/module/testtask/view/cases.html.php
index 23de2f9bcf..a7b42fff83 100644
--- a/module/testtask/view/cases.html.php
+++ b/module/testtask/view/cases.html.php
@@ -17,7 +17,7 @@
 <?php js::set('taskCaseBrowseType', ($browseType == 'bymodule' and $this->session->taskCaseBrowseType == 'bysearch') ? 'all' : $this->session->taskCaseBrowseType);?>
 <?php js::set('browseType', $browseType);?>
 <?php js::set('moduleID', $moduleID);?>
-<div id='mainContent' class='main-row'>
+<div id='mainContent' class='main-row fade'>
   <div class='side-col' id='sidebar'>
     <div class="sidebar-toggle"><i class="icon icon-angle-left"></i></div>
     <div class='cell'><?php echo $moduleTree;?></div>
diff --git a/module/testtask/view/results.html.php b/module/testtask/view/results.html.php
index 10ed1d5e47..a8b2386b5b 100644
--- a/module/testtask/view/results.html.php
+++ b/module/testtask/view/results.html.php
@@ -128,7 +128,7 @@
         <div class="modal-dialog">
           <div class="modal-content">
             <div class="modal-header">
-              <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+              <button type="button" class="close" data-dismiss="modal"><i class="icon icon-close"></i></button>
               <h4 class="modal-title"><?php echo $lang->files;?></h4>
             </div>
             <div class="modal-body"><?php echo $this->fetch('file', 'printFiles', array('files' => $result->files, 'fieldset' => 'false'));?></div>
@@ -140,7 +140,7 @@
         <div class="modal-dialog">
           <div class="modal-content">
             <div class="modal-header">
-              <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+              <button type="button" class="close" data-dismiss="modal"><i class="icon icon-close"></i></button>
               <h4 class="modal-title"><?php echo $lang->files;?></h4>
             </div>
             <div class="modal-body"><?php echo $this->fetch('file', 'printFiles', array('files' => $stepResult['files'], 'fieldset' => 'false'));?></div>
diff --git a/module/testtask/view/runcase.html.php b/module/testtask/view/runcase.html.php
index 9121cebc28..2c81593ccf 100644
--- a/module/testtask/view/runcase.html.php
+++ b/module/testtask/view/runcase.html.php
@@ -98,7 +98,7 @@
       <div class="modal-dialog">
         <div class="modal-content">
           <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+            <button type="button" class="close" data-dismiss="modal"><i class="icon icon-close"></i></button>
             <h4 class="modal-title"><?php echo $lang->testtask->files;?></h4>
           </div>
           <div class="modal-body">
@@ -107,7 +107,7 @@
                 <td><?php echo $this->fetch('file', 'buildform', array('fileCount' => 1, 'percent' => 0.9, 'filesName' => "files{$step->id}", 'labelsName' => "labels{$step->id}"));?></td>
               </tr>
               <tr>
-                <td class='text-center'><button type="button" class="btn" onclick='loadFilesName()' data-dismiss="modal" aria-hidden="true"><?php echo $lang->save;?></button></td>
+                <td class='text-center'><button type="button" class="btn" onclick='loadFilesName()' data-dismiss="modal"><?php echo $lang->save;?></button></td>
               <tr>
             </table>
           </div>
diff --git a/module/tutorial/view/index.html.php b/module/tutorial/view/index.html.php
index 59ceb7b5c2..830c297a76 100644
--- a/module/tutorial/view/index.html.php
+++ b/module/tutorial/view/index.html.php
@@ -18,7 +18,7 @@
     <iframe id='iframePage' name='iframePage' src='<?php echo $referer ?>' frameborder='no' allowtransparency='true' scrolling='auto' hidefocus='' style='width: 100%; height: 100%; left: 0; top: 0'></iframe>
     <div id='taskModalBack'></div>
     <div id='taskModal'>
-      <button class='close'>×</button>
+      <button class='close'><i class="icon icon-close"></i></button>
       <div class='finish-all'>
         <div class='start-icon'><i class='icon icon-certificate icon-spin icon-back'></i><i class='icon icon-check icon-front'></i></div>
         <h3><?php echo $lang->tutorial->congratulation ?></h3>