Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* fixed onlybody option for some links.

Browse Source 
* ajusted style of module 'testtask'.
This commit is contained in:
Catouse
2014-04-28 13:49:52 +08:00
parent d7cce606ee
commit cc4bad62f0
7 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/model.php
+2 -2
View File
@@ -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>";
}
module/doc/view/create.html.php
+3 -3
View File
@@ -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>
module/group/view/privbymodule.html.php
+1 -1
View File
@@ -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'>
module/my/view/profile.html.php
+1 -1
View File
@@ -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'>
module/testtask/view/results.html.php
+7 -8
View File
@@ -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>
module/testtask/view/runcase.html.php
+1 -1
View File
@@ -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'>
www/theme/default/style.css
-1
View File
@@ -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;}