diff --git a/module/common/lang/de.php b/module/common/lang/de.php index fe4821de77..0917974727 100644 --- a/module/common/lang/de.php +++ b/module/common/lang/de.php @@ -269,6 +269,7 @@ $lang->lang = 'Sprache'; /* Theme style. */ $lang->theme = 'Theme'; $lang->themes['default'] = 'ZenTao Blau (Standard)'; +$lang->themes['blue'] = 'Blau'; $lang->themes['green'] = 'Grün'; $lang->themes['red'] = 'Rot'; $lang->themes['purple'] = 'Lila'; diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 0cdb0ed0fb..773bb0ad30 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -288,6 +288,7 @@ $lang->lang = 'Language'; /* Theme style. */ $lang->theme = 'Theme'; $lang->themes['default'] = 'Default'; +$lang->themes['blue'] = 'Blue'; $lang->themes['green'] = 'Green'; $lang->themes['red'] = 'Red'; $lang->themes['purple'] = 'Purple'; diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php index 57b53d5090..4e4a4216c9 100644 --- a/module/common/lang/fr.php +++ b/module/common/lang/fr.php @@ -269,6 +269,7 @@ $lang->lang = 'Langue'; /* Theme style. */ $lang->theme = 'Theme'; $lang->themes['default'] = 'Default'; +$lang->themes['blue'] = 'Blue'; $lang->themes['green'] = 'Green'; $lang->themes['red'] = 'Red'; $lang->themes['purple'] = 'Purple'; diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php index 3b34806458..09450459d7 100644 --- a/module/common/lang/vi.php +++ b/module/common/lang/vi.php @@ -269,6 +269,7 @@ $lang->lang = 'Ngôn ngữ'; /* Theme style. */ $lang->theme = 'Theme'; $lang->themes['default'] = 'Mặc định'; +$lang->themes['blue'] = 'Blue'; $lang->themes['green'] = 'Green'; $lang->themes['red'] = 'Red'; $lang->themes['purple'] = 'Purple'; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index c79b211608..f920ba5657 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -288,6 +288,7 @@ $lang->lang = 'Language'; /* 风格列表。*/ $lang->theme = '主题'; $lang->themes['default'] = '禅道蓝(默认)'; +$lang->themes['blue'] = '青春蓝'; $lang->themes['green'] = '叶兰绿'; $lang->themes['red'] = '赤诚红'; $lang->themes['purple'] = '玉烟紫'; diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php index 23cf51e459..1a3102f39c 100644 --- a/module/common/lang/zh-tw.php +++ b/module/common/lang/zh-tw.php @@ -288,6 +288,7 @@ $lang->lang = 'Language'; /* 風格列表。*/ $lang->theme = '主題'; $lang->themes['default'] = '禪道藍(預設)'; +$lang->themes['blue'] = '青春藍'; $lang->themes['green'] = '葉蘭綠'; $lang->themes['red'] = '赤誠紅'; $lang->themes['purple'] = '玉煙紫'; diff --git a/module/doc/css/common.css b/module/doc/css/common.css index 710f7335fd..8742acf155 100644 --- a/module/doc/css/common.css +++ b/module/doc/css/common.css @@ -81,3 +81,9 @@ td.c-name a:visited {color: #082999;} #pageNav .dropdown-menu {max-height: 350px; overflow-y: auto;} #createDropdown ul.dropdown-menu {width: 100%;} +#project, #product, #custom, #book {min-height: 160px;} +#title .menu-title {font-size: 15px; font-weight: 600; position: relative; padding: 2px 0 2px 15px;list-style: none;} +#title .dropdown-menu-book {left: -67px; top: 38px;} +#title .dropdown-menu-doc {left: -80px; top: 38px;} +.menu-actions {position: absolute; top: 0; right: 0; padding: 7px 8px;} +.menu-actions i {font-size: 15px; color: #8c8c8c;} diff --git a/module/doc/css/objectlibs.css b/module/doc/css/objectlibs.css index 7b016bd863..7a30b24061 100644 --- a/module/doc/css/objectlibs.css +++ b/module/doc/css/objectlibs.css @@ -2,8 +2,8 @@ .addbtn {padding-top: 22px; height: 63px; border: 1px dashed #ddd; width: 60px;} .addbtn .icon-plus {font-size: 18px; display: block; opacity: 0.5; transition: opacity .2s; text-shadow: 1px 1px 3px rgba(0,0,0,.2);} .addbtn:hover .icon-plus {opacity: .9; animation: flash-icon 1s linear alternate infinite;} -#dropMenu {min-width: 250px; box-sizing: inhert;} -#dropMenu .table-col .list-group {padding-top: 10px;} +#subHeader #dropMenu {min-width: 250px; box-sizing: inhert;} +#subHeader #dropMenu .table-col .list-group {padding-top: 10px;} .main-col .block-files .panel-heading {padding-right: 20px;} .main-col .block-files .panel-heading .panel-title {height: 35px; line-height: 30px;} .side-col .action a {margin: 0 auto 3px; display: block; max-width: 200px;} @@ -15,17 +15,13 @@ .main-col .doc-title .version .dropdown-menu a:hover {color: #ffffff;} .main-col .doc-title .actions a {margin-right: 8px;} .main-col .doc-title .actions i {font-size: 15px; color: #8c8c8c;} +#mainContent .scrollbar-hover {max-height: 2000px; overflow: scroll;} #sidebar {width: 275px;} #sidebar>.cell {width: 100%;} #sidebar>.sidebar-toggle {left: 3px; right: auto;} -#project, #product, #custom, #book {min-height: 160px;} -#title .menu-title {font-size: 15px; font-weight: 600; position: relative; padding: 2px 0 2px 15px;list-style: none;} -#title .dropdown-menu-book {left: -67px; top: 38px;} -#title .dropdown-menu-doc {left: -80px; top: 38px;} .hide-sidebar #sidebar>.cell {left: -270px;} .hide-sidebar #sidebar>.sidebar-toggle>.icon:before {content: "\e314";} .detail.empty {line-height: 200px;} .main-col+.side-col {padding-left: 16px;} .main-col iframe {min-height: 380px;} -.menu-actions {position: absolute; top: 0; right: 0; padding: 7px 8px;} -.menu-actions i {font-size: 15px; color: #8c8c8c;} +.article-content .keywords {margin-bottom: 15px;} diff --git a/module/doc/js/objectlibs.js b/module/doc/js/objectlibs.js index 78ada9cc4c..9376901399 100644 --- a/module/doc/js/objectlibs.js +++ b/module/doc/js/objectlibs.js @@ -48,14 +48,22 @@ function fullScreen() var requestMethod = element.requestFullScreen || element.webkitRequestFullScreen || element.mozRequestFullScreen || element.msRequestFullScreen; if(requestMethod) { + $('#content').addClass('scrollbar-hover'); $('#content .actions').addClass('hidden'); requestMethod.call(element); $.cookie('isFullScreen', 1); } } +/** + * Exit full screen. + * + * @access public + * @return void + */ function exitFullScreen() { + $('#content').removeClass('scrollbar-hover'); $('#content .actions').removeClass('hidden'); $.cookie('isFullScreen', 0); } diff --git a/module/doc/view/content.html.php b/module/doc/view/content.html.php index 1809005894..ccf85db4f5 100644 --- a/module/doc/view/content.html.php +++ b/module/doc/view/content.html.php @@ -67,7 +67,7 @@ $sessionString .= session_name() . '=' . session_id();
keywords):?> -

+

keywords as $keywords):?> $keywords";?> diff --git a/module/execution/model.php b/module/execution/model.php index f58abd70bd..83ae49bc21 100644 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -929,11 +929,24 @@ class executionModel extends model { if($currentModule == 'execution' and in_array($currentMethod, array('index', 'all', 'batchedit', 'create'))) return; + $projectNameSpan = ''; + $projectNameTitle = ''; $currentExecutionName = $this->lang->execution->common; if($executionID) { $currentExecution = $this->getById($executionID); $currentExecutionName = $currentExecution->name; + + if($this->config->systemMode == 'new') + { + $project = $this->loadModel('project')->getByID($currentExecution->project); + + if($project) + { + $projectNameTitle = $project->name . '/'; + $projectNameSpan = "{$project->name}/"; + } + } } if($this->app->viewType == 'mhtml' and $executionID) @@ -944,7 +957,7 @@ class executionModel extends model } $dropMenuLink = helper::createLink('execution', 'ajaxGetDropMenu', "executionID=$executionID&module=$currentModule&method=$currentMethod&extra="); - $output = "