bug->batchCreate;?>
diff --git a/module/bug/view/batchedit.html.php b/module/bug/view/batchedit.html.php
index 09fabdc5fa..f9d8694b12 100644
--- a/module/bug/view/batchedit.html.php
+++ b/module/bug/view/batchedit.html.php
@@ -13,7 +13,7 @@
lang->bug->dittoNotice);?>
-
+
bug->common . $lang->colon . $lang->bug->batchEdit;?>
@@ -62,7 +62,7 @@
'>bug->browser;?>
'>bug->keywords;?>
'>bug->resolvedByAB;?>
- '>bug->resolutionAB;?>
+ '>bug->resolutionAB;?>
@@ -125,11 +125,11 @@
>keywords, 'class=form-control');?>
' style='overflow:visible'>resolvedBy, "class='form-control chosen'");?>
>
-
+
- resolution, "class=form-control onchange=setDuplicate(this.value,$bugID)");?>
+ resolution, "class='form-control' onchange=setDuplicate(this.value,$bugID)");?>
' resolution != 'duplicate') echo "style='display:none'";?>>
- bug->duplicateBug}'");?>
+ bug->duplicateBug}'");?>
diff --git a/module/doc/css/common.css b/module/doc/css/common.css
index ee5597b55e..aa1559f911 100644
--- a/module/doc/css/common.css
+++ b/module/doc/css/common.css
@@ -13,7 +13,8 @@
.row-spliting .col-spliter:before,
.row-spliting .col-spliter:after {opacity: 1;}
-@media (max-width: 720px) {
+@media (max-width: 720px)
+{
.split-row > .side-col,
.split-row > .main-col {width: 100%!important;}
}
@@ -28,19 +29,27 @@
.table-files .c-actions .btn > .icon.text-yellow,
.table-files tr:hover .c-actions .btn > .icon {opacity: 1;}
-#main {opacity: 0; transition: opacity .4s;}
-#main.in {opacity: 1;}
-
.files-grid .col {width: 167px; text-align: center; padding: 0; margin-bottom: 10px;}
-.files-grid .actions {position: absolute; bottom: -30px; left: 0; right: 0; background: #E9F2FB; z-index: 10; opacity: 0; transition: opacity .2s; padding-bottom: 8px;}
+.files-grid .actions {position: absolute; bottom: -38px; left: 0; right: 0; background: #E9F2FB; z-index: 10; opacity: 0; transition: opacity .2s; padding-bottom: 8px; border-radius: 0 0 3px 3px; padding-top: 8px;}
.files-grid .col:hover .actions {opacity: 1;}
-.files-grid .file {padding: 10px; cursor: pointer; display: block; border-radius: 2px;}
+.files-grid .file {padding: 10px; cursor: pointer; display: block; border-radius: 2px; transition: background-color .2s; border-radius: 3px 3px 0 0}
.files-grid .col:hover .file {background-color: #E9F2FB;}
-.files-grid .file-icon {font-size: 54px; width: 64px; height: 64px; display: block; margin: 0 auto 8px; line-height: 64px;}
+.files-grid .file-icon {font-size: 54px; width: 64px; height: 64px; display: block; margin: 0 auto 8px; line-height: 64px; color: #8E939A}
.files-grid .file-name,
-.files-grid .file-info {text-overflow: ellipsis; white-space: nowrap; overflow: hidden;}
+.files-grid .file-info {text-overflow: ellipsis; white-space: nowrap; overflow: hidden; line-height: 20px;}
.files-grid .file-info {font-size: 12px; margin-top: 3px;}
.files-grid .icon-folder {background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48c3ZnIHdpZHRoPSI1MnB4IiBoZWlnaHQ9IjQ2cHgiIHZpZXdCb3g9IjAgMCA1MiA0NiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIj4gICAgICAgIDx0aXRsZT5pY29uLWJpZy1mb2xkZXJpY29uLWJpZy1mb2xkZXI8L3RpdGxlPiAgICA8ZGVzYz5DcmVhdGVkIHdpdGggU2tldGNoLjwvZGVzYz4gICAgPGRlZnM+PC9kZWZzPiAgICA8ZyBpZD0iUGFnZS0xIiBzdHJva2U9Im5vbmUiIHN0cm9rZS13aWR0aD0iMSIgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIj4gICAgICAgIDxnIGlkPSJ3ZWItbWF4IiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgtMTA5NS4wMDAwMDAsIC02OTUuMDAwMDAwKSI+ICAgICAgICAgICAgPGcgaWQ9Ijgt5paH5qGjIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgxMDkwLjAwMDAwMCwgNTgzLjAwMDAwMCkiPiAgICAgICAgICAgICAgICA8ZyBpZD0iaWNvbi1iaWctZm9sZGVyIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSg1LjAwMDAwMCwgMTEyLjAwMDAwMCkiPiAgICAgICAgICAgICAgICAgICAgPHBhdGggZD0iTTIxLjA0NTY4OTEsNC4yNzAyMzU0MiBDMjEuOTYxODA1OSw1LjEwNzIwMzY1IDIzLjAyMjcwMDQsNS41NTc5NjY1OSAyNC4zNjg4OTQ0LDUuNTI1MDEyMTggTDI2LjE2MDIzOCw1LjUyNTAxMjE4IEwzMC44MTIxMDExLDUuNTI1MDEyMTggQzI5LjYwMDkxMDksNS41MjUwMTIxOCAyOC40Mzg1MTg2LDUuMDM1NzUxMTMgMjcuNTc3MDQ3LDQuMTg1ODk1OTMgTDI0LjY3ODE1NjYsMS4zMjY0MDI3MSBDMjMuODE2NTgwOCwwLjQ3NjU0NzUxMSAyMi42NTQyOTI3LDAgMjEuNDQzMTAyNSwwIEwxNS4xMTQ5MDQ2LDAgTDE1LDAgQzE2LjIyNjg2NzksMC4wMzk0MzcwODA1IDE3LjMwMjA1NTcsMC41NTY4NjUwODcgMTguMTYzNTI3MywxLjQwNjYxNjIyIEwyMS4wNDU2ODkxLDQuMjcwMjM1NDIgWiIgaWQ9IlNoYXBlLUNvcHktNyIgZmlsbD0iI0ZGQzg1QSI+PC9wYXRoPiAgICAgICAgICAgICAgICAgICAgPHBhdGggZD0iTTQ5LjMxMDMyMDMsNS41MjAwMjkxOCBMMzguNTUxNzAzMSw1LjUyMDAyOTE4IEwzNi44MDY4NTk0LDUuNTIwMDI5MTggTDMyLjI3NTc1LDUuNTIwMDI5MTggTDMwLjUzMDkwNjMsNS41MjAwMjkxOCBMMjYsNS41MjAwMjkxOCBMMjQuMjU1MTU2Miw1LjUyMDAyOTE4IEMyMy4wNzU0MDYzLDUuNTIwMDI5MTggMjEuOTQzMTg3NSw1LjA0MjgxMzM1IDIxLjEwNDA3ODEsNC4xOTE3NjYzIEwxOC4yODA0Mzc1LDEuMzI4MjYyODggQzE3LjQ0MTIyNjYsMC40NzcyMTU4MjkgMTYuMzA5MTA5NCwwIDE1LjEyOTM1OTQsMCBMOC45NjU1MzEyNSwwIEwyLjY4OTY3OTY5LDAgQzEuMjA0MjI2NTYsNy40MDUxNTkyM2UtMTYgMCwxLjIzNTcxNjk5IDAsMi43NjAwMTQ1OSBMMCw4LjI4MDA0Mzc3IEwwLDkuMjAwMDgzMzcgTDAsNDMuMjM5OTg1NCBDMCw0NC43NjQyODMgMS4yMDQyMjY1Niw0NiAyLjY4OTY3OTY5LDQ2IEw0OS4zMTAzMjAzLDQ2IEM1MC43OTU3NzM0LDQ2IDUyLDQ0Ljc2NDI4MyA1Miw0My4yMzk5ODU0IEw1Miw4LjI4MDA0Mzc3IEM1Miw2Ljc1NTY0MTk1IDUwLjc5NTc3MzQsNS41MjAwMjkxOCA0OS4zMTAzMjAzLDUuNTIwMDI5MTggTDQ5LjMxMDMyMDMsNS41MjAwMjkxOCBaIiBpZD0iU2hhcGUtQ29weS04IiBmaWxsPSIjRkZFMDY2Ij48L3BhdGg+ICAgICAgICAgICAgICAgIDwvZz4gICAgICAgICAgICA8L2c+ICAgICAgICA8L2c+ICAgIDwvZz48L3N2Zz4=) no-repeat center;}
+.files-grid .icon-folder:before {display: none;}
+.files-grid .img-holder {height: 64px; line-height: 64px; margin: 0 auto 8px; width: 100%; background-size: contain; background-repeat: no-repeat; background-position: center;}
+.files-grid .img-holder > img {max-height: 64px; opacity: 0; width: 100%;}
.panel{padding-bottom: 40px;}
.panel .table-footer{position: absolute; bottom: 0; width: 100%;}
+
+@keyframes flash-icon
+{
+ 0% {color: #666;}
+ 100% {color: #fff;}
+}
+
+.main-col > .panel > .panel-body {padding-top: 20px;}
diff --git a/module/doc/css/showfiles.css b/module/doc/css/showfiles.css
index 8e014222f6..e69de29bb2 100644
--- a/module/doc/css/showfiles.css
+++ b/module/doc/css/showfiles.css
@@ -1,6 +0,0 @@
-@keyframes flash-icon
-{
- 0% {color: #666;}
- 100% {color: #fff;}
-}
-.lib-file > .file > a > .file-path{width: 64px; height: 64px; line-height: 64px; margin: 0 auto 10px;}
diff --git a/module/doc/js/common.js b/module/doc/js/common.js
index 6955cd7154..86ff939890 100644
--- a/module/doc/js/common.js
+++ b/module/doc/js/common.js
@@ -168,5 +168,12 @@ $(document).ready(function()
$('.split-row').splitRow();
});
- $('#main').addClass('in');
+ var $pageSetting = $('#pageSetting');
+ if($pageSetting.length)
+ {
+ $pageSetting.on('click', '.close-dropdown', function()
+ {
+ $pageSetting.parent().removeClass('open');
+ }).on('click', function(e){e.stopPropagation()});
+ }
});
diff --git a/module/doc/view/browse.html.php b/module/doc/view/browse.html.php
index bfc8d08e0f..ff91d263d1 100644
--- a/module/doc/view/browse.html.php
+++ b/module/doc/view/browse.html.php
@@ -19,7 +19,7 @@ var browseType = '';
from != 'doc') js::set('type', 'doc');?>
-
+
from == 'doc'):?>
@@ -40,8 +40,8 @@ var browseType = '';
@@ -53,7 +53,7 @@ var browseType = '';
-
+
doc->title;?>
doc->size;?>
doc->addedBy;?>
@@ -89,7 +89,7 @@ var browseType = '';
addedBy);?>
addedDate, 'm-d h:i');?>
editedDate, 'm-d h:i');?>
-
+
id&objectType=doc", "", 'hiddenwin', "title='{$collectTitle}' class='btn btn-link'")?>
id", "", '', "title='{$lang->edit}' class='btn btn-link'")?>
id", "", 'hiddenwin', "title='{$lang->delete}' class='btn btn-link'")?>
diff --git a/module/doc/view/browsebygrid.html.php b/module/doc/view/browsebygrid.html.php
index ad81b6bbd9..f4591878e5 100644
--- a/module/doc/view/browsebygrid.html.php
+++ b/module/doc/view/browsebygrid.html.php
@@ -4,8 +4,8 @@
diff --git a/module/doc/view/index.html.php b/module/doc/view/index.html.php
index b5bef4de04..4b17f8a539 100644
--- a/module/doc/view/index.html.php
+++ b/module/doc/view/index.html.php
@@ -11,7 +11,7 @@
*/
?>
-
+
diff --git a/module/doc/view/objectlibs.html.php b/module/doc/view/objectlibs.html.php
index ca9465809a..9373c4c3b7 100644
--- a/module/doc/view/objectlibs.html.php
+++ b/module/doc/view/objectlibs.html.php
@@ -39,7 +39,7 @@
- save);?>
+ save);?>
cancel, '', "btn close-dropdown");?>
diff --git a/module/doc/view/showfiles.html.php b/module/doc/view/showfiles.html.php
index 9c4cd0c85b..6d9e88b893 100644
--- a/module/doc/view/showfiles.html.php
+++ b/module/doc/view/showfiles.html.php
@@ -11,7 +11,7 @@
*/
?>
-
+
from == 'doc'):?>
@@ -41,8 +41,8 @@
- " , '', "title={$lang->doc->browseTypeList['list']} class='btn btn-icon text-primary'");?>
- ", '', "title={$lang->doc->browseTypeList['grid']} class='btn btn-icon'");?>
+ " , '', "title={$lang->doc->browseTypeList['list']} class='btn btn-icon" . ($viewType == 'list' ? ' text-primary' : '') . "'");?>
+ ", '', "title={$lang->doc->browseTypeList['grid']} class='btn btn-icon" . ($viewType != 'list' ? ' text-primary' : '') . "'");?>
@@ -51,7 +51,7 @@
-
+
doc->id;?>
doc->fileTitle;?>
doc->filePath;?>
@@ -66,16 +66,16 @@
pathname)) continue;?>
- id);?>
-
+ id);?>
+
objectID");?>'>title . ' [' . strtoupper($file->objectType) . ' #' . $file->objectID . ']';?>
pathname;?>
- extension;?>
+ extension;?>
size / 1024 , 1) . 'K';?>
- addedBy) ? zget($users, $file->addedBy) : '';?>
- addedDate) ? substr($file->addedDate, 0, 10) : '';?>
-
+ addedBy) ? zget($users, $file->addedBy) : '';?>
+ addedDate) ? substr($file->addedDate, 0, 10) : '';?>
+
id", $lang->doc->download, "data-toggle='modal'", '', true, false, $file);
common::printLink('file', 'delete', "fileID=$file->id", $lang->delete, 'hiddenwin', '', true, false, $file);
@@ -112,7 +112,7 @@
$downloadLink = $this->createLink('file', 'download', "fileID=$file->id&mouse=left");
if(in_array($file->extension, $config->file->imageExtensions))
{
- echo "
";
+ echo "
";
}
else
{
diff --git a/module/file/view/download.html.php b/module/file/view/download.html.php
index 5605469343..1c12829711 100644
--- a/module/file/view/download.html.php
+++ b/module/file/view/download.html.php
@@ -1,50 +1,55 @@
id);?>
-
-
- file->preview;?>
-
- file->charset, $charset, "onchange='setCharset(this.value)' class='form-control'");?>
-
-
-
- createLink('file', 'read', "fileID=$file->id"));?>
-
-
- realPath);
- if($charset != $config->charset)
- {
- $fileContent = helper::convertEncoding($fileContent, $charset . "//IGNORE", $config->charset);
- }
- else
- {
- if(extension_loaded('mbstring'))
+
+
+
+
+ file->preview;?>
+
+ file->charset, $charset, "onchange='setCharset(this.value)' class='form-control'");?>
+
+
+
+ createLink('file', 'read', "fileID=$file->id"));?>
+
+
+ realPath);
+ if($charset != $config->charset)
{
- $encoding = mb_detect_encoding($fileContent, array('ASCII', 'UTF-8', 'GB2312', 'GBK', 'BIG5'));
- if($encoding != 'UTF-8') $fileContent = helper::convertEncoding($fileContent, $encoding, $config->charset);
+ $fileContent = helper::convertEncoding($fileContent, $charset . "//IGNORE", $config->charset);
}
else
{
- $encoding = 'UTF-8';
- if($config->default->lang == 'zh-cn') $encoding = 'GBK';
- if($config->default->lang == 'zh-tw') $encoding = 'BIG5';
- $fileContent = helper::convertEncoding($fileContent, $encoding, $config->charset);
+ if(extension_loaded('mbstring'))
+ {
+ $encoding = mb_detect_encoding($fileContent, array('ASCII', 'UTF-8', 'GB2312', 'GBK', 'BIG5'));
+ if($encoding != 'UTF-8') $fileContent = helper::convertEncoding($fileContent, $encoding, $config->charset);
+ }
+ else
+ {
+ $encoding = 'UTF-8';
+ if($config->default->lang == 'zh-cn') $encoding = 'GBK';
+ if($config->default->lang == 'zh-tw') $encoding = 'BIG5';
+ $fileContent = helper::convertEncoding($fileContent, $encoding, $config->charset);
+ }
}
- }
- echo "" . htmlspecialchars($fileContent) . "
";
- ?>
+ echo "" . htmlspecialchars($fileContent) . "
";
+ ?>
+
+
+
-
-
+
-
-
- file->inputFileName;?>
+
+
+
+
+ file->inputFileName;?>
+
+
+
-
-
-
+
diff --git a/module/file/view/printfiles.html.php b/module/file/view/printfiles.html.php
index 3deb0a74b6..4772d78b2c 100644
--- a/module/file/view/printfiles.html.php
+++ b/module/file/view/printfiles.html.php
@@ -8,14 +8,10 @@ $sessionString .= session_name() . '=' . session_id();
file->common;?>
-
+
-
-
- testcase->exportTemplet;?>
+
+
+
+
+ testcase->exportTemplet;?>
+
+
+
-
-
+
diff --git a/module/testsuite/view/import.html.php b/module/testsuite/view/import.html.php
index 775c6f7f16..33c4f7b2c7 100644
--- a/module/testsuite/view/import.html.php
+++ b/module/testsuite/view/import.html.php
@@ -1,22 +1,26 @@
-
-
- testcase->importFile;?>
+
+
+
+
+ testcase->importFile;?>
+
+
+
-
-
+
diff --git a/module/testsuite/view/library.html.php b/module/testsuite/view/library.html.php
index 41ed4ae313..0e84878818 100644
--- a/module/testsuite/view/library.html.php
+++ b/module/testsuite/view/library.html.php
@@ -69,7 +69,7 @@ js::set('flow', $this->config->global->flow);
- " . $lang->testsuite->view, '', "class='btn'");?>
+ " . $lang->testsuite->view, '', "class='btn'");?>
@@ -150,7 +150,7 @@ js::set('flow', $this->config->global->flow);
typeAB);?>
openedByAB);?>
statusAB);?>
- actions;?>
+ actions;?>
diff --git a/module/testtask/view/browse.html.php b/module/testtask/view/browse.html.php
index 68440c60c9..6c41591696 100644
--- a/module/testtask/view/browse.html.php
+++ b/module/testtask/view/browse.html.php
@@ -38,7 +38,7 @@ $status = $this->session->testTaskVersionStatus;
{$lang->testtask->blocked}", '', "id='blockedTab' class='btn btn-link'");?>
{$lang->testtask->done}", '', "id='doneTab' class='btn btn-link'");?>
recPerPage}&pageID=1"?>
-
+
testtask->beginAndEnd;?>
testtask->to;?>
@@ -102,7 +102,7 @@ $status = $this->session->testTaskVersionStatus;
}
common::printIcon('testtask', 'cases', "taskID=$task->id", $task, 'list', 'sitemap');
- common::printIcon('testtask', 'view', "taskID=$task->id", '', 'list', 'file','','iframe',true, 'data-width=800px');
+ common::printIcon('testtask', 'view', "taskID=$task->id", '', 'list', 'list-alt','','iframe',true, 'data-width=800px');
common::printIcon('testtask', 'linkCase', "taskID=$task->id", $task, 'list', 'link');
common::printIcon('testreport', 'browse', "objectID=$task->product&objectType=product&extra=$task->id", $task, 'list','flag');
common::printIcon('testtask', 'edit', "taskID=$task->id", $task, 'list','','','',true);
diff --git a/module/testtask/view/create.html.php b/module/testtask/view/create.html.php
index d6f95a0ce3..75c3aa9d0f 100644
--- a/module/testtask/view/create.html.php
+++ b/module/testtask/view/create.html.php
@@ -87,7 +87,7 @@
-
+
diff --git a/www/js/zui/min.js b/www/js/zui/min.js
index 883176e625..e957ccfa34 100644
--- a/www/js/zui/min.js
+++ b/www/js/zui/min.js
@@ -1,5 +1,5 @@
/*!
- * ZUI: Zentao template - v1.8.1 - 2018-05-23
+ * ZUI: Zentao template - v1.8.1 - 2018-05-24
* http://zui.sexy
* GitHub: https://github.com/easysoft/zui.git
* Copyright (c) 2018 cnezsoft.com; Licensed MIT
@@ -75,4 +75,4 @@ if(!t.fn.droppable)return void console.error("Sortable requires droppable.js");v
* Binny V A, http://www.openjs.com/scripts/events/keyboard_shortcuts/
*/
function(t){function e(e){if("string"==typeof e.data){var i=e.handler,n=e.data.toLowerCase().split(" ");e.handler=function(e){if(this===e.target||!/textarea|select/i.test(e.target.nodeName)&&"text"!==e.target.type){var s="keypress"!==e.type&&t.hotkeys.specialKeys[e.which],o=String.fromCharCode(e.which).toLowerCase(),a="",r={};e.altKey&&"alt"!==s&&(a+="alt+"),e.ctrlKey&&"ctrl"!==s&&(a+="ctrl+"),e.metaKey&&!e.ctrlKey&&"meta"!==s&&(a+="meta+"),e.shiftKey&&"shift"!==s&&(a+="shift+"),s?r[a+s]=!0:(r[a+o]=!0,r[a+t.hotkeys.shiftNums[o]]=!0,"shift+"===a&&(r[t.hotkeys.shiftNums[o]]=!0));for(var l=0,h=n.length;l","/":"?","\\":"|"}},t.each(["keydown","keyup","keypress"],function(){t.event.special[this]={add:e}})}(jQuery),function(t){"use strict";function e(e,i){if(e===!1)return e;if(!e)return i;e===!0?e={add:!0,"delete":!0,edit:!0,sort:!0}:"string"==typeof e&&(e=e.split(","));var n;return t.isArray(e)&&(n={},t.each(e,function(e,i){t.isPlainObject(i)?n[i.action]=i:n[i]=!0}),e=n),t.isPlainObject(e)&&(n={},t.each(e,function(e,i){i?n[e]=t.extend({type:e},a[e],t.isPlainObject(i)?i:null):n[e]=!1}),e=n),i?t.extend(!0,{},i,e):e}function i(e,i,n){return i=i||e.type,t(n||e.template).addClass("tree-action").attr(t.extend({"data-type":i,title:e.title||""},e.attr)).data("action",e)}var n="zui.tree",s=0,o=function(e,i){this.name=n,this.$=t(e),this.getOptions(i),this._init()},a={sort:{template:''},add:{template:''},edit:{template:''},"delete":{template:''}};o.DEFAULTS={animate:null,initialState:"normal",toggleTemplate:''},o.prototype.add=function(e,i,n,s,o){var a,r=t(e),l=this.options;if(r.is("li")?(a=r.children("ul"),a.length||(a=t("
"),r.append(a),this._initList(a,r))):a=r,a){var h=this;t.isArray(i)||(i=[i]),t.each(i,function(e,i){var n=t("").data(i).appendTo(a);void 0!==i.id&&n.attr("data-id",i.id);var s=l.itemWrapper?t(l.itemWrapper===!0?'':l.itemWrapper).appendTo(n):n;if(i.html)s.html(i.html);else if(t.isFunction(h.options.itemCreator)){var o=h.options.itemCreator(n,i);o!==!0&&o!==!1&&s.html(o)}else i.url?s.append(t("",{href:i.url}).text(i.title||i.name)):s.append(t("").text(i.title||i.name));h._initItem(n,i.idx||e,a,i),i.children&&i.children.length&&h.add(n,i.children)}),this._initList(a),n&&!a.hasClass("tree")&&h.expand(a.parent("li"),s,o)}},o.prototype.reload=function(e){var i=this;e&&(i.$.empty(),i.add(i.$,e)),i.isPreserve&&i.store.time&&i.$.find("li:not(.tree-action-item)").each(function(){var e=t(this);i[i.store[e.data("id")]?"expand":"collapse"](e,!0,!0)})},o.prototype._initList=function(n,s,o,a){var r=this;n.hasClass("tree")?(o=0,s=null):(s=(s||n.closest("li")).addClass("has-list"),s.find(".list-toggle").length||s.prepend(this.options.toggleTemplate),o=o||s.data("idx"));var l=n.attr("data-idx",o||0).children("li:not(.tree-action-item)").each(function(e){r._initItem(t(this),e+1,n)});1!==l.length||l.find("ul").length||l.addClass("tree-single-item"),a=a||(s?s.data():null);var h=e(a?a.actions:null,this.actions);if(h){if(h.add&&h.add.templateInList!==!1){var c=n.children("li.tree-action-item");c.length?c.detach().appendTo(n):t('').append(i(h.add,"add",h.add.templateInList)).appendTo(n)}h.sort&&n.sortable(t.extend({dragCssClass:"tree-drag-holder",trigger:".sort-handler",selector:"li:not(.tree-action-item)",finish:function(t){r.callEvent("action",{action:h.sort,$list:n,target:t.target,item:a})}},h.sort.options,t.isPlainObject(this.options.sortable)?this.options.sortable:null))}s&&(s.hasClass("open")||a&&a.open)&&s.addClass("open in")},o.prototype._initItem=function(n,s,o,a){if(void 0===s){var r=n.prev("li");s=r.length?r.data("idx")+1:1}if(o=o||n.closest("ul"),n.attr("data-idx",s).removeClass("tree-single-item"),!n.data("id")){var l=s;o.hasClass("tree")||(l=o.parent("li").data("id")+"-"+l),n.attr("data-id",l)}a=a||n.data();var h=e(a.actions,this.actions);if(h){var c=n.find(".tree-actions");c.length||(c=t('').appendTo(this.options.itemWrapper?n.find(".tree-item-wrapper"):n),t.each(h,function(t,e){e&&c.append(i(e,t))}))}var d=n.children("ul");d.length&&this._initList(d,n,s,a)},o.prototype._init=function(){var i=this.options,o=this;this.actions=e(i.actions),this.$.addClass("tree"),i.animate&&this.$.addClass("tree-animate"),this._initList(this.$);var a=i.initialState,r=t.zui&&t.zui.store&&t.zui.store.enable;r&&(this.selector=n+"::"+(i.name||"")+"#"+(this.$.attr("id")||s++),this.store=t.zui.store[i.name?"get":"pageGet"](this.selector,{})),"preserve"===a&&(r?this.isPreserve=!0:this.options.initialState=a="normal"),this.reload(i.data),r&&(this.isPreserve=!0),"expand"===a?this.expand():"collapse"===a&&this.collapse(),this.$.on("click",'.list-toggle,a[href="#"],.tree-toggle',function(e){var i=t(this),n=i.parent("li");o.callEvent("hit",{target:n,item:n.data()}),o.toggle(n),i.is("a")&&e.preventDefault()}).on("click",".tree-action",function(){var e=t(this),i=e.data();if(i.action&&(i=i.action),"sort"!==i.type){var n=e.closest("li:not(.tree-action-item)");o.callEvent("action",{action:i,target:this,$item:n,item:n.data()})}})},o.prototype.preserve=function(e,i,n){if(this.isPreserve)if(e)i=i||e.data("id"),n=void 0===n&&e.hasClass("open"),n?this.store[i]=n:delete this.store[i],this.store.time=(new Date).getTime(),t.zui.store[this.options.name?"set":"pageSet"](this.selector,this.store);else{var s=this;this.store={},this.$.find("li").each(function(){s.preserve(t(this))})}},o.prototype.expand=function(t,e,i){t?(t.addClass("open"),!e&&this.options.animate?setTimeout(function(){t.addClass("in")},10):t.addClass("in")):t=this.$.find("li.has-list").addClass("open in"),i||this.preserve(t),this.callEvent("expand",t,this)},o.prototype.show=function(e,i,n){var s=this;e.each(function(){var e=t(this);if(s.expand(e,i,n),e)for(var o=e.parent("ul");o&&o.length&&!o.hasClass("tree");){var a=o.parent("li");a.length?(s.expand(a,i,n),o=a.parent("ul")):o=!1}})},o.prototype.collapse=function(t,e,i){t?!e&&this.options.animate?(t.removeClass("in"),setTimeout(function(){t.removeClass("open")},300)):t.removeClass("open in"):t=this.$.find("li.has-list").removeClass("open in"),i||this.preserve(t),this.callEvent("collapse",t,this)},o.prototype.toggle=function(t){var e=t&&t.hasClass("open")||t===!1||void 0===t&&this.$.find("li.has-list.open").length;this[e?"collapse":"expand"](t)},o.prototype.getOptions=function(e){this.options=t.extend({},o.DEFAULTS,this.$.data(),e),null===this.options.animate&&this.$.hasClass("tree-animate")&&(this.options.animate=!0)},o.prototype.toData=function(e,i){t.isFunction(e)&&(i=e,e=null),e=e||this.$;var n=this;return e.children("li:not(.tree-action-item)").map(function(){var e=t(this),s=e.data();delete s["zui.droppable"];var o=e.children("ul");return o.length&&(s.children=n.toData(o)),t.isFunction(i)?i(s,e):s}).get()},o.prototype.callEvent=function(e,i){var n;return t.isFunction(this.options[e])&&(n=this.options[e](i,this)),this.$.trigger(t.Event(e+"."+this.name,i)),n},t.fn.tree=function(e,i){return this.each(function(){var s=t(this),a=s.data(n),r="object"==typeof e&&e;a||s.data(n,a=new o(this,r)),"string"==typeof e&&a[e](i)})},t.fn.tree.Constructor=o,t(function(){t('[data-ride="tree"]').tree()})}(jQuery),function(t){"use strict";var e="zui.colorPicker",i='
',n={zh_cn:{errorTip:"不是有效的颜色值"},zh_tw:{errorTip:"不是有效的顏色值"},en:{errorTip:"Not a valid color value"}},s=function(i,n){this.name=e,this.$=t(i),this.getOptions(n),this.init()};s.DEFAULTS={colors:["#00BCD4","#388E3C","#3280fc","#3F51B5","#9C27B0","#795548","#F57C00","#F44336","#E91E63"],pullMenuRight:!0,wrapper:"btn-wrapper",tileSize:30,lineCount:5,optional:!0,tooltip:"top",icon:"caret-down",updateBtn:"auto"},s.prototype.init=function(){var e=this,n=e.options,s=e.$,o=s.parent(),a=!1;o.hasClass("colorpicker")?e.$picker=o:(e.$picker=t(n.template||i),a=!0),e.$picker.addClass(n.wrapper).find(".cp-title").toggle(void 0!==n.title).text(n.title),e.$menu=e.$picker.find(".dropdown-menu").toggleClass("pull-right",n.pullMenuRight),e.$btn=e.$picker.find(".btn.dropdown-toggle"),e.$btn.find(".ic").addClass("icon-"+n.icon),n.btnTip&&e.$picker.attr("data-toggle","tooltip").tooltip({title:n.btnTip,placement:n.tooltip,container:"body"}),s.attr("data-provide",null),a&&s.after(e.$picker),e.colors={},t.each(n.colors,function(i,n){if(t.zui.Color.isColor(n)){var s=new t.zui.Color(n);e.colors[s.toCssStr()]=s}}),e.updateColors(),e.$picker.on("click",".cp-tile",function(){e.setValue(t(this).data("color"))});var r=function(){var i=s.val(),o=t.zui.Color.isColor(i);s.parent().toggleClass("has-error",!(o||n.optional&&""===i)),o?e.setValue(i,!0):n.optional&&""===i?s.tooltip("hide"):s.is(":focus")||s.tooltip("show",n.errorTip)};s.is("input:not([type=hidden])")?(n.tooltip&&s.attr("data-toggle","tooltip").tooltip({trigger:"manual",placement:n.tooltip,tipClass:"tooltip-danger",container:"body"}),s.on("keyup paste input change",r)):s.appendTo(e.$picker),r()},s.prototype.addColor=function(e){e instanceof t.zui.Color||(e=new t.zui.Color(e));var i=e.toCssStr(),n=this.options;this.colors[i]||(this.colors[i]=e);var s=t('',{titile:e}).data("color",e).css({color:e.contrast().toCssStr(),background:i,"border-color":e.luma()>.43?"#ccc":"transparent"}).attr("data-color",i);this.$menu.append(t("").css({width:n.tileSize,height:n.tileSize}).append(s)),n.optional&&this.$menu.find(".cp-tile.empty").parent().detach().appendTo(this.$menu)},s.prototype.updateColors=function(e){var i=(this.$picker,this.$menu.children("li:not(.heading)").remove()),n=this.options,e=e||this.colors,s=this,o=0;if(t.each(e,function(t,e){s.addColor(e),o++}),n.optional){var a=t(' ').css({width:n.tileSize,height:n.tileSize});this.$menu.append(a),o++}i.css("width",Math.min(o,n.lineCount)*n.tileSize+6)},s.prototype.setValue=function(e,i){var n=this,s=n.options,o=n.$btn;n.$menu.find(".cp-tile.active").removeClass("active");var a="",r=s.updateBtn;if("auto"===r){var l=o.find(".color-bar");r=!l.length||function(t){l.css("background",t||"")}}if(e){var h=new t.zui.Color(e);a=h.toCssStr().toLowerCase(),r&&(t.isFunction(r)?r(a,o,n):o.css({background:a,color:h.contrast().toCssStr(),borderColor:h.luma()>.43?"#ccc":a})),n.colors[a]||n.addColor(h),i||n.$.val().toLowerCase()===a||n.$.val(a).trigger("change"),n.$menu.find('.cp-tile[data-color="'+a+'"]').addClass("active"),n.$.tooltip("hide"),n.$.trigger("colorchange",h)}else r&&(t.isFunction(r)?r(null,o,n):o.attr("style",null)),i||""===n.$.val()||n.$.val(a).trigger("change"),s.optional&&n.$.tooltip("hide"),n.$menu.find(".cp-tile.empty").addClass("active"),n.$.trigger("colorchange",null);s.updateBorder&&t(s.updateBorder).css("border-color",a),s.updateBackground&&t(s.updateBackground).css("background-color",a),s.updateColor&&t(s.updateColor).css("color",a),s.updateText&&t(s.updateText).text(a)},s.prototype.getOptions=function(e){var i=t.extend({},s.DEFAULTS,this.$.data(),e);"string"==typeof i.colors&&(i.colors=i.colors.split(","));var o=(i.lang||t.zui.clientLang()).toLowerCase();i.errorTip||(i.errorTip=n[o].errorTip),t.fn.tooltip||(i.btnTip=!1),this.options=i},t.fn.colorPicker=function(i){return this.each(function(){var n=t(this),o=n.data(e),a="object"==typeof i&&i;o||n.data(e,o=new s(this,a)),"string"==typeof i&&o[i]()})},t.fn.colorPicker.Constructor=s,t(function(){t('[data-provide="colorpicker"]').colorPicker()})}(jQuery),function(t,e){function i(t){return t===e&&(t=n+=1),s[t%s.length]}var n=0,s=["#00a9fc","#ff5d5d","#fdc137","#00da88","#7ec5ff","#8666b8","#bd7b46","#ff9100","#ff3d00","#f57f17","#00e5ff","#00b0ff","#2979ff","#3d5afe","#651fff","#d500f9","#f50057","#ff1744"];jQuery.fn.tableChart=function(){t(this).each(function(){var e=t(this),n=e.data(),s=n.chart||"pie",o=t(n.target);if(o.length){var a=null;if("pie"===s){n=t.extend({scaleShowLabels:!0,scaleLabel:"<%=label%>: <%=value%>"},n);var r=[],l=e.find("tbody > tr").each(function(e){var n=t(this),s=i();n.attr("data-id",e).find(".chart-color-dot").css("background",s),r.push({label:n.find(".chart-label").text(),value:parseInt(n.find(".chart-value").text()),color:s,id:e})});r.length>1?n.scaleLabelPlacement="outside":1===r.length&&(n.scaleLabelPlacement="inside",r.push({label:"",value:r[0].value/2e3,color:"#fff",showLabel:!1})),a=o.pieChart(r,n),o.on("mousemove",function(t){var e=a.getSegmentsAtEvent(t);l.removeClass("active"),e.length&&l.filter('[data-id="'+e[0].id+'"]').addClass("active")})}else if("bar"===s){var h=i(),c=[],d={label:e.find("thead .chart-label").text(),color:h,data:[]},l=e.find("tbody > tr").each(function(e){var i=t(this);c.push(i.find(".chart-label").text()),d.data.push(parseInt(i.find(".chart-value").text())),i.find(".chart-color-dot").css("background",h)}),r={labels:c,datasets:[d]};c.length&&(n.barValueSpacing=5),a=o.barChart(r,n)}else if("line"===s){var h=i(),c=[],d={label:e.find("thead .chart-label").text(),color:h,data:[]},l=e.find("tbody > tr").each(function(e){var i=t(this);c.push(i.find(".chart-label").text()),d.data.push(parseInt(i.find(".chart-value").text())),i.find(".chart-color-dot").css("background",h)}),r={labels:c,datasets:[d]};c.length&&(n.barValueSpacing=5),a=o.lineChart(r,n)}null!==a&&e.data("zui.chart",a)}})};var o=function(i,n){var s=t(i),o=s.is("canvas")?s:s.find("canvas"),a=t.extend({value:0,color:"#006af1",backColor:"#E9F2FB",doughnut:!0,doughnutSize:85,width:20,height:20,showTip:!1,name:"",tipTemplate:"<%=value%>%",animation:"auto",realValue:parseFloat(s.find(".progress-value").text())},n,s.data()),r=o.length;r||(o=t("
bug->common . $lang->colon . $lang->bug->batchEdit;?>
@@ -62,7 +62,7 @@
'>bug->browser;?>
'>bug->keywords;?>
'>bug->resolvedByAB;?>
- '>bug->resolutionAB;?>
+ '>bug->resolutionAB;?>
@@ -125,11 +125,11 @@
>keywords, 'class=form-control');?>
' style='overflow:visible'>resolvedBy, "class='form-control chosen'");?>
>
-
+
diff --git a/module/doc/css/common.css b/module/doc/css/common.css
index ee5597b55e..aa1559f911 100644
--- a/module/doc/css/common.css
+++ b/module/doc/css/common.css
@@ -13,7 +13,8 @@
.row-spliting .col-spliter:before,
.row-spliting .col-spliter:after {opacity: 1;}
-@media (max-width: 720px) {
+@media (max-width: 720px)
+{
.split-row > .side-col,
.split-row > .main-col {width: 100%!important;}
}
@@ -28,19 +29,27 @@
.table-files .c-actions .btn > .icon.text-yellow,
.table-files tr:hover .c-actions .btn > .icon {opacity: 1;}
-#main {opacity: 0; transition: opacity .4s;}
-#main.in {opacity: 1;}
-
.files-grid .col {width: 167px; text-align: center; padding: 0; margin-bottom: 10px;}
-.files-grid .actions {position: absolute; bottom: -30px; left: 0; right: 0; background: #E9F2FB; z-index: 10; opacity: 0; transition: opacity .2s; padding-bottom: 8px;}
+.files-grid .actions {position: absolute; bottom: -38px; left: 0; right: 0; background: #E9F2FB; z-index: 10; opacity: 0; transition: opacity .2s; padding-bottom: 8px; border-radius: 0 0 3px 3px; padding-top: 8px;}
.files-grid .col:hover .actions {opacity: 1;}
-.files-grid .file {padding: 10px; cursor: pointer; display: block; border-radius: 2px;}
+.files-grid .file {padding: 10px; cursor: pointer; display: block; border-radius: 2px; transition: background-color .2s; border-radius: 3px 3px 0 0}
.files-grid .col:hover .file {background-color: #E9F2FB;}
-.files-grid .file-icon {font-size: 54px; width: 64px; height: 64px; display: block; margin: 0 auto 8px; line-height: 64px;}
+.files-grid .file-icon {font-size: 54px; width: 64px; height: 64px; display: block; margin: 0 auto 8px; line-height: 64px; color: #8E939A}
.files-grid .file-name,
-.files-grid .file-info {text-overflow: ellipsis; white-space: nowrap; overflow: hidden;}
+.files-grid .file-info {text-overflow: ellipsis; white-space: nowrap; overflow: hidden; line-height: 20px;}
.files-grid .file-info {font-size: 12px; margin-top: 3px;}
.files-grid .icon-folder {background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48c3ZnIHdpZHRoPSI1MnB4IiBoZWlnaHQ9IjQ2cHgiIHZpZXdCb3g9IjAgMCA1MiA0NiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIj4gICAgICAgIDx0aXRsZT5pY29uLWJpZy1mb2xkZXJpY29uLWJpZy1mb2xkZXI8L3RpdGxlPiAgICA8ZGVzYz5DcmVhdGVkIHdpdGggU2tldGNoLjwvZGVzYz4gICAgPGRlZnM+PC9kZWZzPiAgICA8ZyBpZD0iUGFnZS0xIiBzdHJva2U9Im5vbmUiIHN0cm9rZS13aWR0aD0iMSIgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIj4gICAgICAgIDxnIGlkPSJ3ZWItbWF4IiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgtMTA5NS4wMDAwMDAsIC02OTUuMDAwMDAwKSI+ICAgICAgICAgICAgPGcgaWQ9Ijgt5paH5qGjIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgxMDkwLjAwMDAwMCwgNTgzLjAwMDAwMCkiPiAgICAgICAgICAgICAgICA8ZyBpZD0iaWNvbi1iaWctZm9sZGVyIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSg1LjAwMDAwMCwgMTEyLjAwMDAwMCkiPiAgICAgICAgICAgICAgICAgICAgPHBhdGggZD0iTTIxLjA0NTY4OTEsNC4yNzAyMzU0MiBDMjEuOTYxODA1OSw1LjEwNzIwMzY1IDIzLjAyMjcwMDQsNS41NTc5NjY1OSAyNC4zNjg4OTQ0LDUuNTI1MDEyMTggTDI2LjE2MDIzOCw1LjUyNTAxMjE4IEwzMC44MTIxMDExLDUuNTI1MDEyMTggQzI5LjYwMDkxMDksNS41MjUwMTIxOCAyOC40Mzg1MTg2LDUuMDM1NzUxMTMgMjcuNTc3MDQ3LDQuMTg1ODk1OTMgTDI0LjY3ODE1NjYsMS4zMjY0MDI3MSBDMjMuODE2NTgwOCwwLjQ3NjU0NzUxMSAyMi42NTQyOTI3LDAgMjEuNDQzMTAyNSwwIEwxNS4xMTQ5MDQ2LDAgTDE1LDAgQzE2LjIyNjg2NzksMC4wMzk0MzcwODA1IDE3LjMwMjA1NTcsMC41NTY4NjUwODcgMTguMTYzNTI3MywxLjQwNjYxNjIyIEwyMS4wNDU2ODkxLDQuMjcwMjM1NDIgWiIgaWQ9IlNoYXBlLUNvcHktNyIgZmlsbD0iI0ZGQzg1QSI+PC9wYXRoPiAgICAgICAgICAgICAgICAgICAgPHBhdGggZD0iTTQ5LjMxMDMyMDMsNS41MjAwMjkxOCBMMzguNTUxNzAzMSw1LjUyMDAyOTE4IEwzNi44MDY4NTk0LDUuNTIwMDI5MTggTDMyLjI3NTc1LDUuNTIwMDI5MTggTDMwLjUzMDkwNjMsNS41MjAwMjkxOCBMMjYsNS41MjAwMjkxOCBMMjQuMjU1MTU2Miw1LjUyMDAyOTE4IEMyMy4wNzU0MDYzLDUuNTIwMDI5MTggMjEuOTQzMTg3NSw1LjA0MjgxMzM1IDIxLjEwNDA3ODEsNC4xOTE3NjYzIEwxOC4yODA0Mzc1LDEuMzI4MjYyODggQzE3LjQ0MTIyNjYsMC40NzcyMTU4MjkgMTYuMzA5MTA5NCwwIDE1LjEyOTM1OTQsMCBMOC45NjU1MzEyNSwwIEwyLjY4OTY3OTY5LDAgQzEuMjA0MjI2NTYsNy40MDUxNTkyM2UtMTYgMCwxLjIzNTcxNjk5IDAsMi43NjAwMTQ1OSBMMCw4LjI4MDA0Mzc3IEwwLDkuMjAwMDgzMzcgTDAsNDMuMjM5OTg1NCBDMCw0NC43NjQyODMgMS4yMDQyMjY1Niw0NiAyLjY4OTY3OTY5LDQ2IEw0OS4zMTAzMjAzLDQ2IEM1MC43OTU3NzM0LDQ2IDUyLDQ0Ljc2NDI4MyA1Miw0My4yMzk5ODU0IEw1Miw4LjI4MDA0Mzc3IEM1Miw2Ljc1NTY0MTk1IDUwLjc5NTc3MzQsNS41MjAwMjkxOCA0OS4zMTAzMjAzLDUuNTIwMDI5MTggTDQ5LjMxMDMyMDMsNS41MjAwMjkxOCBaIiBpZD0iU2hhcGUtQ29weS04IiBmaWxsPSIjRkZFMDY2Ij48L3BhdGg+ICAgICAgICAgICAgICAgIDwvZz4gICAgICAgICAgICA8L2c+ICAgICAgICA8L2c+ICAgIDwvZz48L3N2Zz4=) no-repeat center;}
+.files-grid .icon-folder:before {display: none;}
+.files-grid .img-holder {height: 64px; line-height: 64px; margin: 0 auto 8px; width: 100%; background-size: contain; background-repeat: no-repeat; background-position: center;}
+.files-grid .img-holder > img {max-height: 64px; opacity: 0; width: 100%;}
.panel{padding-bottom: 40px;}
.panel .table-footer{position: absolute; bottom: 0; width: 100%;}
+
+@keyframes flash-icon
+{
+ 0% {color: #666;}
+ 100% {color: #fff;}
+}
+
+.main-col > .panel > .panel-body {padding-top: 20px;}
diff --git a/module/doc/css/showfiles.css b/module/doc/css/showfiles.css
index 8e014222f6..e69de29bb2 100644
--- a/module/doc/css/showfiles.css
+++ b/module/doc/css/showfiles.css
@@ -1,6 +0,0 @@
-@keyframes flash-icon
-{
- 0% {color: #666;}
- 100% {color: #fff;}
-}
-.lib-file > .file > a > .file-path{width: 64px; height: 64px; line-height: 64px; margin: 0 auto 10px;}
diff --git a/module/doc/js/common.js b/module/doc/js/common.js
index 6955cd7154..86ff939890 100644
--- a/module/doc/js/common.js
+++ b/module/doc/js/common.js
@@ -168,5 +168,12 @@ $(document).ready(function()
$('.split-row').splitRow();
});
- $('#main').addClass('in');
+ var $pageSetting = $('#pageSetting');
+ if($pageSetting.length)
+ {
+ $pageSetting.on('click', '.close-dropdown', function()
+ {
+ $pageSetting.parent().removeClass('open');
+ }).on('click', function(e){e.stopPropagation()});
+ }
});
diff --git a/module/doc/view/browse.html.php b/module/doc/view/browse.html.php
index bfc8d08e0f..ff91d263d1 100644
--- a/module/doc/view/browse.html.php
+++ b/module/doc/view/browse.html.php
@@ -19,7 +19,7 @@ var browseType = '';
from != 'doc') js::set('type', 'doc');?>
-
-
| resolution, "class=form-control onchange=setDuplicate(this.value,$bugID)");?> | +resolution, "class='form-control' onchange=setDuplicate(this.value,$bugID)");?> | ' resolution != 'duplicate') echo "style='display:none'";?>> - bug->duplicateBug}'");?> + bug->duplicateBug}'");?> |
+
@@ -53,7 +53,7 @@ var browseType = '';
from == 'doc'):?>
@@ -40,8 +40,8 @@ var browseType = '';
| doc->title;?> | doc->size;?> | doc->addedBy;?> | @@ -89,7 +89,7 @@ var browseType = '';addedBy);?> | addedDate, 'm-d h:i');?> | editedDate, 'm-d h:i');?> | -+ |
id&objectType=doc", "", 'hiddenwin', "title='{$collectTitle}' class='btn btn-link'")?>
id", "", '', "title='{$lang->edit}' class='btn btn-link'")?>
id", "", 'hiddenwin', "title='{$lang->delete}' class='btn btn-link'")?>
diff --git a/module/doc/view/browsebygrid.html.php b/module/doc/view/browsebygrid.html.php
index ad81b6bbd9..f4591878e5 100644
--- a/module/doc/view/browsebygrid.html.php
+++ b/module/doc/view/browsebygrid.html.php
@@ -4,8 +4,8 @@
+
diff --git a/module/doc/view/objectlibs.html.php b/module/doc/view/objectlibs.html.php
index ca9465809a..9373c4c3b7 100644
--- a/module/doc/view/objectlibs.html.php
+++ b/module/doc/view/objectlibs.html.php
@@ -39,7 +39,7 @@
- save);?>
+ save);?>
cancel, '', "btn close-dropdown");?>
diff --git a/module/doc/view/showfiles.html.php b/module/doc/view/showfiles.html.php
index 9c4cd0c85b..6d9e88b893 100644
--- a/module/doc/view/showfiles.html.php
+++ b/module/doc/view/showfiles.html.php
@@ -11,7 +11,7 @@
*/
?>
-
+
@@ -51,7 +51,7 @@
from == 'doc'):?>
@@ -41,8 +41,8 @@
- " , '', "title={$lang->doc->browseTypeList['list']} class='btn btn-icon text-primary'");?>
- ", '', "title={$lang->doc->browseTypeList['grid']} class='btn btn-icon'");?>
+ " , '', "title={$lang->doc->browseTypeList['list']} class='btn btn-icon" . ($viewType == 'list' ? ' text-primary' : '') . "'");?>
+ ", '', "title={$lang->doc->browseTypeList['grid']} class='btn btn-icon" . ($viewType != 'list' ? ' text-primary' : '') . "'");?>
| ||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|