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

* finish task #4791.

Browse Source
This commit is contained in:
Catouse
2018-09-21 16:39:10 +08:00
parent dacefbf844
commit e45a1e4d34
19 changed files with 33 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/view/view.html.php
+1 -1
View File
@@ -319,7 +319,7 @@ $params = "bugID=$bug->id";
$copyParams = "productID=$productID&branch=$bug->branch&extras=bugID=$bug->id";
$convertParams = "productID=$productID&branch=$bug->branch&moduleID=0&from=bug&bugID=$bug->id";
?>
<div id="mainActions">
<div id="mainActions" class='main-actions'>
<?php common::printPreAndNext($preAndNext);?>
<div class="btn-toolbar">
<?php common::printBack($browseLink);?>
module/build/view/view.html.php
+1 -1
View File
@@ -58,7 +58,7 @@ tbody tr td:first-child input{display:none;}
</div>
<?php echo $this->fetch('file', 'printFiles', array('files' => $build->files, 'fieldset' => 'true'));?>
<?php include '../../common/view/action.html.php';?>
<div id="mainActions">
<div id="mainActions" class='main-actions'>
<nav class="container"></nav>
<div class="btn-toolbar">
<?php
module/common/model.php
+2 -2
View File
@@ -989,7 +989,7 @@ EOD;
$title = isset($preAndNext->pre->title) ? $preAndNext->pre->title : $preAndNext->pre->name;
$title = '#' . $preAndNext->pre->$id . ' ' . $title . ' ' . $lang->preShortcutKey;
$link = $linkTemplate ? sprintf($linkTemplate, $preAndNext->pre->$id) : inLink('view', "ID={$preAndNext->pre->$id}");
echo html::a($link, '<i class="icon-pre icon-chevron-left"></i>', '', "id='prevPage' class='btn btn-info' title='{$title}'");
echo html::a($link, '<i class="icon-pre icon-chevron-left"></i>', '', "id='prevPage' class='btn' title='{$title}'");
}
if(isset($preAndNext->next) and $preAndNext->next)
{
@@ -997,7 +997,7 @@ EOD;
$title = isset($preAndNext->next->title) ? $preAndNext->next->title : $preAndNext->next->name;
$title = '#' . $preAndNext->next->$id . ' ' . $title . ' ' . $lang->nextShortcutKey;
$link = $linkTemplate ? sprintf($linkTemplate, $preAndNext->next->$id) : inLink('view', "ID={$preAndNext->next->$id}");
echo html::a($link, '<i class="icon-pre icon-chevron-right"></i>', '', "id='nextPage' class='btn btn-info' title='$title'");
echo html::a($link, '<i class="icon-pre icon-chevron-right"></i>', '', "id='nextPage' class='btn' title='$title'");
}
echo '</nav>';
}
module/company/view/dynamic.html.php
+2 -2
View File
@@ -33,7 +33,7 @@
<a class="btn btn-link querybox-toggle" id="bysearchTab"><i class="icon icon-search muted"></i> <?php echo $lang->action->dynamic->search;?></a>
</div>
</div>
<div id='queryBox' class='cell <?php if($browseType =='bysearch') echo 'show';?>'></div>
<div id='mainContent' class='main-content'>
<div id='dynamics'>
@@ -81,7 +81,7 @@ $preLink = $hasPre ? inlink('dynamic', "browseType=$browseType&param=$param&re
$nextLink = $hasNext ? inlink('dynamic', "browseType=$browseType&param=$param&recTotal={$pager->recTotal}&date=" . strtotime($lastDate) . '&direction=next') : 'javascript:;';
?>
<?php if($hasPre or $hasNext):?>
<div id="mainActions">
<div id="mainActions" class='main-actions'>
<nav class="container">
<a id="prevPage" class="btn btn-info<?php if(!$hasNext) echo ' disabled';?>" href="<?php echo $nextLink;?>"><i class="icon icon-chevron-left"></i></a>
<a id="nextPage" class="btn btn-info<?php if(!$hasPre) echo ' disabled';?>" href="<?php echo $preLink;?>"><i class="icon icon-chevron-right"></i></a>
module/doc/view/view.html.php
+1 -1
View File
@@ -164,7 +164,7 @@
</div>
</div>
<div id="mainActions">
<div id="mainActions" class='main-actions'>
<?php common::printPreAndNext($preAndNext);?>
<div class="btn-toolbar">
<?php common::printBack($browseLink);?>
module/my/view/dynamic.html.php
+1 -1
View File
@@ -79,7 +79,7 @@ $preLink = $hasPre ? inlink('dynamic', "type=$type&recTotal={$pager->recTotal}
$nextLink = $hasNext ? inlink('dynamic', "type=$type&recTotal={$pager->recTotal}&date=" . strtotime($lastDate) . '&direction=next') : 'javascript:;';
?>
<?php if($hasPre or $hasNext):?>
<div id="mainActions">
<div id="mainActions" class='main-actions'>
<nav class="container">
<a id="prevPage" class="btn btn-info<?php if(!$hasNext) echo ' disabled';?>" href="<?php echo $nextLink;?>"><i class="icon icon-chevron-left"></i></a>
<a id="nextPage" class="btn btn-info<?php if(!$hasPre) echo ' disabled';?>" href="<?php echo $preLink;?>"><i class="icon icon-chevron-right"></i></a>
module/product/view/dynamic.html.php
+1 -1
View File
@@ -80,7 +80,7 @@ $preLink = $hasPre ? inlink('dynamic', "productID=$productID&type=$type&param=
$nextLink = $hasNext ? inlink('dynamic', "productID=$productID&type=$type&param=$param&recTotal={$pager->recTotal}&date=" . strtotime($lastDate) . '&direction=next') : 'javascript:;';
?>
<?php if($hasPre or $hasNext):?>
<div id="mainActions">
<div id="mainActions" class='main-actions'>
<nav class="container">
<a id="prevPage" class="btn btn-info<?php if(!$hasNext) echo ' disabled';?>" href="<?php echo $nextLink;?>"><i class="icon icon-chevron-left"></i></a>
<a id="nextPage" class="btn btn-info<?php if(!$hasPre) echo ' disabled';?>" href="<?php echo $preLink;?>"><i class="icon icon-chevron-right"></i></a>
module/product/view/view.html.php
+2 -2
View File
@@ -145,7 +145,7 @@
<tr>
<th><?php echo $lang->product->acl;?></th>
<td><em><?php echo $lang->product->aclList[$product->acl];?></em></td>
</tr>
</tr>
<?php if($product->acl == 'custom'):?>
<tr>
<th><?php echo $lang->product->whitelist;?></th>
@@ -211,7 +211,7 @@
</div>
</div>
<div id="mainActions">
<div id="mainActions" class='main-actions'>
<nav class="container"></nav>
<div class="btn-toolbar">
<?php
module/project/view/dynamic.html.php
+1 -1
View File
@@ -81,7 +81,7 @@ $preLink = $hasPre ? inlink('dynamic', "projectID=$projectID&type=$type&param=
$nextLink = $hasNext ? inlink('dynamic', "projectID=$projectID&type=$type&param=$param&recTotal={$pager->recTotal}&date=" . strtotime($lastDate) . '&direction=next') : 'javascript:;';
?>
<?php if($hasPre or $hasNext):?>
<div id="mainActions">
<div id="mainActions" class='main-actions'>
<nav class="container">
<a id="prevPage" class="btn btn-info<?php if(!$hasNext) echo ' disabled';?>" href="<?php echo $nextLink;?>"><i class="icon icon-chevron-left"></i></a>
<a id="nextPage" class="btn btn-info<?php if(!$hasPre) echo ' disabled';?>" href="<?php echo $preLink;?>"><i class="icon icon-chevron-right"></i></a>
module/project/view/view.html.php
+1 -1
View File
@@ -275,7 +275,7 @@
</div>
</div>
<div id="mainActions">
<div id="mainActions" class='main-actions'>
<nav class="container"></nav>
<div class="btn-toolbar">
<?php
module/story/view/view.html.php
+1 -1
View File
@@ -327,7 +327,7 @@
</div>
</div>
<div id="mainActions">
<div id="mainActions" class='main-actions'>
<?php common::printPreAndNext($preAndNext);?>
<div class="btn-toolbar">
<?php common::printBack($browseLink);?>
module/task/view/view.html.php
+1 -1
View File
@@ -335,7 +335,7 @@
</div>
</div>
<div id="mainActions">
<div id="mainActions" class='main-actions'>
<?php common::printPreAndNext($preAndNext);?>
<div class="btn-toolbar">
<?php common::printBack($browseLink);?>
module/testcase/view/view.html.php
+1 -1
View File
@@ -279,7 +279,7 @@
</div>
</div>
</div>
<div id="mainActions">
<div id="mainActions" class='main-actions'>
<?php common::printPreAndNext($preAndNext);?>
<div class="btn-toolbar">
<?php common::printBack($browseLink);?>
module/testsuite/view/libview.html.php
+1 -1
View File
@@ -34,7 +34,7 @@
<?php include '../../common/view/action.html.php';?>
</div>
</div>
<div id="mainActions">
<div id="mainActions" class='main-actions'>
<nav class="container"></nav>
<div class="btn-toolbar">
<?php
module/todo/view/view.html.php
+1 -1
View File
@@ -119,7 +119,7 @@
</div>
</div>
</div>
<div id="mainActions">
<div id="mainActions" class='main-actions'>
<div class="container"></div>
<div class="btn-toolbar">
<?php
module/user/view/dynamic.html.php
+1 -1
View File
@@ -79,7 +79,7 @@ $preLink = $hasPre ? inlink('dynamic', "type=$type&account=$account&recTotal={
$nextLink = $hasNext ? inlink('dynamic', "type=$type&account=$account&recTotal={$pager->recTotal}&date=" . strtotime($lastDate) . '&direction=next') : 'javascript:;';
?>
<?php if($hasPre or $hasNext):?>
<div id="mainActions">
<div id="mainActions" class='main-actions'>
<nav class="container">
<a id="prevPage" class="btn btn-info<?php if(!$hasNext) echo ' disabled';?>" href="<?php echo $nextLink;?>"><i class="icon icon-chevron-left"></i></a>
<a id="nextPage" class="btn btn-info<?php if(!$hasPre) echo ' disabled';?>" href="<?php echo $preLink;?>"><i class="icon icon-chevron-right"></i></a>
www/js/zui/min.js
+13 -13
View File
File diff suppressed because one or more lines are too long
www/theme/default/style.css
-2
View File
@@ -13,5 +13,3 @@
.hide-sidebar #sidebar .cell{display:none;}
/* 调整每个创建页面的宽度*/
.main-content{padding:30px;}
/* 详情页上一页下一页的样式*/
#nextPage, #prevPage{background-color:#909090;color:#fff}
www/theme/zui/css/min.css
+1 -1
View File
File diff suppressed because one or more lines are too long