From cc4bad62f07f2371a0fc3953e44cbdd689c46ce2 Mon Sep 17 00:00:00 2001
From: Catouse <catouse@gmail.com>
Date: Mon, 28 Apr 2014 13:49:52 +0800
Subject: [PATCH]  * fixed onlybody option for some links.  * ajusted style of
 module 'testtask'.

---
 module/common/model.php                 |  4 ++--
 module/doc/view/create.html.php         |  6 +++---
 module/group/view/privbymodule.html.php |  2 +-
 module/my/view/profile.html.php         |  2 +-
 module/testtask/view/results.html.php   | 15 +++++++--------
 module/testtask/view/runcase.html.php   |  2 +-
 www/theme/default/style.css             |  1 -
 7 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/module/common/model.php b/module/common/model.php
index ef46555a93..a774e80d14 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -231,8 +231,8 @@ class commonModel extends model
 
             if(!$isGuest)
             {
-                echo '<li>' . html::a(helper::createLink('my', 'profile', 'onlybody=yes'), $lang->profile, '', "class='iframe' data-width='600'") . '</li>';
-                echo '<li>' . html::a(helper::createLink('my', 'changepassword', 'onlybody=yes'), $lang->changePassword, '', "class='iframe' data-width='500'") . '</li>';
+                echo '<li>' . html::a(helper::createLink('my', 'profile', '', '', true), $lang->profile, '', "class='iframe' data-width='600'") . '</li>';
+                echo '<li>' . html::a(helper::createLink('my', 'changepassword', '', '', true), $lang->changePassword, '', "class='iframe' data-width='500'") . '</li>';
                 echo "<li class='divider'></li>";
             }
             
diff --git a/module/doc/view/create.html.php b/module/doc/view/create.html.php
index cad4e1c923..1ad2d96ba0 100644
--- a/module/doc/view/create.html.php
+++ b/module/doc/view/create.html.php
@@ -13,7 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
 <?php js::set('holders ', $lang->doc->placeholder);?>
-<div class='container mw-900px'>
+<div class='container'>
   <div id='titlebar'>
     <div class='heading'>
       <span class='prefix'><?php echo html::icon($lang->icons['doc']);?></span>
@@ -30,11 +30,11 @@
       <?php elseif($libID == 'project'):?>
       <tr>
         <th class='w-80px'><?php echo $lang->doc->project;?></th>
-        <td><?php echo html::select('project', $projects, $projectID, "class='form-control' onchange=loadProducts(this.value);");?></td>
+        <td class='w-p25-f'><?php echo html::select('project', $projects, $projectID, "class='form-control' onchange=loadProducts(this.value);");?></td><td></td>
       </tr>  
       <tr>
         <th><?php echo $lang->doc->product;?></th>
-        <td><span id='productBox'><?php echo html::select('product', $products, '', "class='form-control'");?></span></td>
+        <td class='w-p25-f'><span id='productBox'><?php echo html::select('product', $products, '', "class='form-control'");?></span></td><td></td>
       </tr>  
       <?php endif;?>
       <tr>
diff --git a/module/group/view/privbymodule.html.php b/module/group/view/privbymodule.html.php
index fbf4cdb059..5f4bceb70d 100644
--- a/module/group/view/privbymodule.html.php
+++ b/module/group/view/privbymodule.html.php
@@ -14,8 +14,8 @@
   <div class='heading'>
     <span class='prefix'><i class='icon-lock'></i></span>
     <strong><small class='text-muted'><i class='icon-cog'></i></small> <?php echo $lang->group->managePriv ;?></strong>
+    <small class='text-muted'> <?php echo $lang->group->byModuleTips; ?></small>
   </div>
-  <div class='actions'><div class='text text-info'><i class='icon-info-sign'></i> <?php echo $lang->group->byModuleTips; ?></div>&nbsp;&nbsp;</div>
 </div>
 
 <form class='form-condensed pdb-20' method='post' target='hiddenwin'>
diff --git a/module/my/view/profile.html.php b/module/my/view/profile.html.php
index bb468baa8e..5dd946b5d5 100644
--- a/module/my/view/profile.html.php
+++ b/module/my/view/profile.html.php
@@ -15,7 +15,7 @@
   <div id='titlebar'>
     <div class='heading'><?php echo html::icon($lang->icons['user']);?> <?php echo $lang->my->profile;?></div>
     <div class='actions'>
-      <?php echo html::a($this->createLink('my', 'editprofile'), $lang->user->editProfile, '', "class='btn btn-primary'");?>
+      <?php echo html::a($this->createLink('my', 'editprofile', '', '', true), $lang->user->editProfile, '', "class='btn btn-primary'");?>
     </div>
   </div>
   <table class='table table-borderless table-data'>
diff --git a/module/testtask/view/results.html.php b/module/testtask/view/results.html.php
index c336e3e233..02fc50f474 100644
--- a/module/testtask/view/results.html.php
+++ b/module/testtask/view/results.html.php
@@ -26,16 +26,15 @@
       <?php echo $case->precondition;?>
     </fieldset>
     <?php foreach($results as $result):?>
-    <table class='table table-condensed table-hover table-striped table-borderless table-fixed'>
+    <table class='table table-condensed table-hover table-striped table-fixed'>
+      <caption class='text-left bd-0'>
+        <?php if(!isset($build)):?><div class='pull-right'><?php echo $lang->testtask->build . $lang->colon . $build;?></div>
+        <?php endif; ?>
+        RESULT#<?php echo $result->id . ' ' . $result->date . ' ' . $users[$result->lastRunner] . ' ' . $lang->testtask->runCase . ':'. " <span class='$result->caseResult'>" . $lang->testcase->resultList[$result->caseResult] . '</span>';?>
+      </caption>
       <thead>
         <tr>
-          <td colspan='5'>
-            <div class='text-left'>RESULT#<?php echo $result->id . ' ' . $result->date . ' ' . $users[$result->lastRunner] . ' ' . $lang->testtask->runCase . ':'. " <span class='$result->caseResult'>" . $lang->testcase->resultList[$result->caseResult] . '</span>';?></div>
-            <?php if(isset($build)):?><div class='text-right'><?php echo $lang->testtask->build . $lang->colon . $build;?></div><?php endif;?>
-          </td>
-        </tr>
-        <tr>
-          <th class='w-30px'><?php echo $lang->testcase->stepID;?></th>
+          <th class='w-40px'><?php echo $lang->testcase->stepID;?></th>
           <th class='w-p40'><?php echo $lang->testcase->stepDesc;?></th>
           <th class='w-p20'><?php echo $lang->testcase->stepExpect;?></th>
           <th><?php echo $lang->testcase->result;?></th>
diff --git a/module/testtask/view/runcase.html.php b/module/testtask/view/runcase.html.php
index 10e5b3fdf1..4bde4d43dc 100644
--- a/module/testtask/view/runcase.html.php
+++ b/module/testtask/view/runcase.html.php
@@ -15,7 +15,7 @@
   <div class='heading'>
     <span class='prefix'><?php echo html::icon($lang->icons['usecase']);?> <strong><?php echo $run->case->id;?></strong></span>
     <strong><?php echo $run->case->title;?></strong>
-    <small class='text-warning'> <?php echo $lang->testtask->runCase;?> <?php echo html::icon($lang->icons['run']);?></small>
+    <small class='text-muted'> <?php echo $lang->testtask->runCase;?> <?php echo html::icon($lang->icons['run']);?></small>
   </div>
 </div>
 <div class='main'>
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index eb58c54bd7..4dca9b49c1 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -535,7 +535,6 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;}
 .body-modal > form {padding-bottom: 15px;}
 .body-modal .outer > .container, .body-modal > .container{padding: 0; margin: 0; max-width: inherit !important; border: 0}
 .body-modal #titlebar .actions {right: 40px}
-.body-modal #header, .body-modal #footer {display: none}
 .body-modal .outer, .body-modal #wrap{padding: 0!important; margin: 0!important;}
 
 .modal-dialog.fullscreen {width: 100% !important; height: 100% !important; margin: 0; border: none !important;}