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

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

Browse Source
This commit is contained in:
Yagami
2018-09-18 11:05:17 +08:00
parent 406c4dfc7e 75fcdf94ae
commit cd4083a7d1
6 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/custom/control.php
+4
View File
@@ -334,6 +334,10 @@ class custom extends control
if(is_array($fields)) $fields = join(',', $fields);
$this->loadModel('setting')->setItem("$account.$module.$section.$key", $fields);
}
else
{
$this->loadModel('setting')->deleteItems("owner=$account&module=$module&section=$section&key=$key");
}
die(js::reload('parent'));
}
module/search/view/buildform.html.php
+1 -1
View File
@@ -21,7 +21,7 @@ $formId = 'searchForm-' . uniqid('');
#selectPeriod > .dropdown-header {background: #f1f1f1; display: block; text-align: center; padding: 4px 0; line-height: 20px; margin: 5px 10px; font-size: 14px; border-radius: 2px; color: #333; font-size: 12px}
#groupAndOr {display: inline-block;}
#<?php echo $formId;?> > table {margin: 0 auto;}
#<?php echo $formId;?> > table > tbody > tr > td {padding: 10px 15px; color: #838A9D;}
#<?php echo $formId;?> > table > tbody > tr > td {padding: 10px 15px;}
#<?php echo $formId;?> .form-actions {padding-bottom: 20px; padding-top: 0;}
#<?php echo $formId;?> .chosen-container[id^="field"] .chosen-drop {min-width: 140px;}
#<?php echo $formId;?> [id^="valueBox"] .chosen-container .chosen-single {min-width: 100px;}
module/testtask/view/linkcase.html.php
+1 -1
View File
@@ -63,7 +63,7 @@
echo "</ul></div>";
?>
<?php common::printLink('testtask', 'linkCase', "taskID=$taskID&type=bybug", "<span class='text'>" . $lang->testtask->linkByBug . '</span>', '', "class='btn btn-link {$bugActive}'");?>
<?php echo "<a class='btn btn-link querybox-toggle' id='bysearchTab'><i class='icon icon-search muted'></i>{$lang->testcase->bySearch}</a>";?>
<?php if($type == 'all') echo "<a class='btn btn-link querybox-toggle' id='bysearchTab'><i class='icon icon-search muted'></i>{$lang->testcase->bySearch}</a>";?>
</div>
</div>
<div class="cell show" id="queryBox"></div>
module/user/view/batchcreate.html.php
+1 -1
View File
@@ -93,7 +93,7 @@
<?php endfor;?>
<tr>
<th colspan='2'><?php echo $lang->user->verifyPassword?></th>
<td colspan='<?php echo count($visibleFields) + 3?>'>
<td colspan='3'>
<div class="required required-wrapper"></div>
<input type='password' style="display:none"> <!-- for disable autocomplete all browser -->
<?php echo html::password('verifyPassword', '', "class='form-control disabled-ie-placeholder' autocomplete='off' placeholder='{$lang->user->placeholder->verify}'");?>
module/user/view/batchedit.html.php
+1 -1
View File
@@ -84,7 +84,7 @@
<?php endforeach;?>
<tr>
<th colspan='2'><?php echo $lang->user->verifyPassword?></th>
<td colspan='<?php echo count($visibleFields) + 1?>'>
<td colspan='2'>
<div class="required required-wrapper"></div>
<input type='text' style="display:none"> <!-- for disable autocomplete all browser -->
<input type='password' style="display:none"> <!-- for disable autocomplete all browser -->
www/theme/default/style.css
+4
View File
@@ -18,3 +18,7 @@
.article-content{margin-left: 0px;}
.body-modal .main-header>h2{font-weight:bold;}
.timeline > li .timeline-text{white-space: nowrap !important;}
.table .tablesorter-header-inner{color:#000}
/* Finish task #4751. */
.hide-sidebar #sidebar .cell{display:none;}