diff --git a/module/ops/css/common.ui.css b/module/ops/css/common.ui.css index 4ebcc2ea58..e613b6ad7c 100644 --- a/module/ops/css/common.ui.css +++ b/module/ops/css/common.ui.css @@ -4,4 +4,5 @@ .ops-header .form-label {font-weight: 700!important;} .osOpsList>a {display: block; padding: 2px 10px 2px 5px; overflow: hidden; line-height: 20px; text-overflow: unset; white-space: nowrap; border-radius: 4px; color: #313c52; margin-top: 5px;} .osOpsList>a.active {color: #2e7fff; background-color: #e6f0ff;} -.osOpsList>a.active:hover, .osOpsList>a:hover {color: #fff; background-color: #2e7fff;} \ No newline at end of file +.osOpsList>a.active:hover, .osOpsList>a:hover {color: #fff; background-color: #2e7fff;} +.ops-ml-0 {margin-left: 0!important;} \ No newline at end of file diff --git a/module/ops/ui/setting.html.php b/module/ops/ui/setting.html.php index bcffb2a26d..0a24eb03de 100644 --- a/module/ops/ui/setting.html.php +++ b/module/ops/ui/setting.html.php @@ -78,11 +78,13 @@ $formRows[] = formRow ) ); -$actions = array('submit'); +$hasSideBar = !empty($lang->{$module}->osNameList) && array_key_exists($field, $lang->{$module}->osNameList); +$actions = array('submit'); if(common::hasPriv('custom', 'restore')) $actions[] = array('class' => 'ajax-submit', 'text' => $lang->custom->restore, 'data-confirm' => $lang->custom->confirmRestore, 'url' => $this->createLink('custom', 'restore', "module=$module&field=$fieldList")); formPanel ( setID('opsForm'), + $hasSideBar ? setClass('ops-ml-0') : null, set::title($lang->$module->common . ' > ' . $lang->$module->$field), set::actions($actions), formRow @@ -102,7 +104,7 @@ formPanel $formRows, ); -if(!empty($lang->{$module}->osNameList) && array_key_exists($field, $lang->{$module}->osNameList)) +if($hasSideBar) { $osListWg = array(); foreach($lang->{$module}->osNameList as $key => $value) diff --git a/module/repo/css/browse.ui.css b/module/repo/css/browse.ui.css index d0ad356ecd..725c2dd3e5 100644 --- a/module/repo/css/browse.ui.css +++ b/module/repo/css/browse.ui.css @@ -3,4 +3,5 @@ .repo-comment{width: 100%; display: block; word-break: keep-all; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;} .dtable-cell-html{width: 100%;} .container .sidebar{width: 550px;} -#actionBar .dropdown-menu {margin-top: 10px; padding: 10px;} \ No newline at end of file +#actionBar .dropdown-menu {margin-top: 10px; padding: 10px;} +#actionBar>.dropdown {position: absolute!important;} \ No newline at end of file diff --git a/module/repo/js/browse.ui.js b/module/repo/js/browse.ui.js index 97d6333a95..91918685d7 100644 --- a/module/repo/js/browse.ui.js +++ b/module/repo/js/browse.ui.js @@ -214,11 +214,11 @@ $('.copy-btn').on('click', function() copyText[0].selectionStart = copyText[0].selectionEnd; copyText[0].blur(); - $(this).tooltip('show'); + $(that).tooltip('show'); var that = this; setTimeout(function() { - $(that).tooltip('hide') + $(that).tooltip('hide'); }, 2000) }) @@ -231,4 +231,17 @@ $('.copy-btn').on('click', function() // delete window.checkedChange; // delete window.renderCommentCell; // delete window.renderCell; -// } \ No newline at end of file +// } + +window.afterPageUpdate = function() +{ + setTimeout(function() + { + $('.copy-btn').tooltip({ + trigger: 'click', + placement: 'bottom', + title: copied, + tipClass: 'success', + }); + }, 200); +}; diff --git a/module/repo/js/diff.ui.js b/module/repo/js/diff.ui.js index 0e7a07e885..a13983632a 100644 --- a/module/repo/js/diff.ui.js +++ b/module/repo/js/diff.ui.js @@ -16,7 +16,6 @@ $('#monacoTabs').on('click', '.monaco-close', function() if(isActive) tabsEle.children().last().find('a').trigger('click'); }); - window.afterPageUpdate = function() { setTimeout(function() diff --git a/module/repo/ui/browse.html.php b/module/repo/ui/browse.html.php index 09d0e193da..7bf6e3b5e3 100644 --- a/module/repo/ui/browse.html.php +++ b/module/repo/ui/browse.html.php @@ -12,6 +12,8 @@ declare(strict_types=1); namespace zin; +jsVar('copied', $lang->repo->copied); + dropmenu(set::module('repo'), set::tab('repo')); /* Prepare repo select data. */