diff --git a/module/repo/css/ajaxgeteditorcontent.css b/module/repo/css/ajaxgeteditorcontent.css index 72496ef6b6..27fb50cdda 100644 --- a/module/repo/css/ajaxgeteditorcontent.css +++ b/module/repo/css/ajaxgeteditorcontent.css @@ -1,7 +1,8 @@ .m-repo-ajaxgeteditorcontent {overflow: hidden;} -#monacoEditor .tip {width: 15px; height: 15px; background: #D9D9D9; border-radius: 10px;} -#log {background: #fff; margin-top: 2px; color: #707070; display: none; padding: 5px;} +#monacoEditor .tip-circular {background: #2e7fff; border-radius: 10px; padding: 0px 7px;} +#log {margin-top: 2px; display: none; padding: 5px; justify-content: space-between;} #log .history {margin-left: 5px;} +#log .action-btn .btn {border: none; background: none;} #related {display: none; margin-top: 2px; background: #fff;} #relationTabs .nav > li > a {padding: 8px 10px; display: flex; white-space: pre;} diff --git a/module/repo/css/ajaxgetrelationinfo.css b/module/repo/css/ajaxgetrelationinfo.css index 8fc608383d..dc49e0c5c0 100644 --- a/module/repo/css/ajaxgetrelationinfo.css +++ b/module/repo/css/ajaxgetrelationinfo.css @@ -4,9 +4,10 @@ body {background-color: #fff; padding-bottom: 20px;} .left-content {padding-left: 0px;} .left-content tr {line-height: 30px;} .left-content th {padding-top: 4px;} -.right-content .detail-title {padding-bottom: 15px;} -.right-content {border-left: 1px solid #EDEEF2; padding-top: 15px;} -.text {width: 90%; white-space: normal; word-wrap: break-word; word-break: break-all; font-weight: normal; padding-left: 10px;} +.right-content {border-left: 1px solid #EDEEF2;} +.right-content .detail-content {margin-left: 15px;} +.text {width: 55%; white-space: normal; word-wrap: break-word; word-break: break-all; padding-left: 10px; vertical-align: top;} .cell {min-height: 300px;} .menu-title {width: 100%;} -.detail-content {margin-top: 0;} +.article-content {margin-top: 0;} +.spec-content {padding-right: 20px;} diff --git a/module/repo/css/common.css b/module/repo/css/common.css index 809ee039dd..417ef85a99 100644 --- a/module/repo/css/common.css +++ b/module/repo/css/common.css @@ -229,6 +229,12 @@ h3 {font-size: 16px;} #fileTree ul > li.has-list:first-child:before {top: -13px;} #fileTree ul > li.tree-single-item:before {height: 23px;} #fileTree ul > li.has-list:after {width: 14px;} +#filesTree .tree li.has-list.open:before {border: none;} +#fileTabs .nav-tabs > li.tab-nav-item > a {background: linear-gradient( 109deg, transparent 10%, #9b9494 10%) 0 0, linear-gradient(-109deg, transparent 10%, #9b9494 10%) 100% 0; background-size: 90% 100%; background-repeat: no-repeat;} +#fileTabs .nav-tabs > li.active > a {color: #2e7fff !important; background: linear-gradient( 109deg, transparent 10%, #ffffff 10%) 0 0, linear-gradient(-109deg, transparent 10%, #ffffff 10%) 100% 0; background-size: 90% 100%; background-repeat: no-repeat;} +#relationTabs .nav-tabs >li > a .tab-nav-close {display: none;} +#relationTabs .nav-tabs > li > a > i, #relationTabs .nav-tabs > li > a > span {background: #EDEEF2; font-weight: normal; padding: 1px 5px;} +#relationTabs .nav-tabs > li.active > a > i, #relationTabs .nav-tabs > li.active > a > span {background: #E6F0FF; color: #2e7fff;} #modules li {padding: 5px 0 0 15px;} .file-tree #modules .icon {color: #9EA3B0;} diff --git a/module/repo/lang/de.php b/module/repo/lang/de.php index 1d9eb8dc88..b809e91f2d 100644 --- a/module/repo/lang/de.php +++ b/module/repo/lang/de.php @@ -28,7 +28,7 @@ $lang->repo->branch = 'Branch'; $lang->repo->tag = 'Tag'; $lang->repo->addWebHook = 'Add Webhook'; $lang->repo->apiGetRepoByUrl = 'API: Get repo by URL'; -$lang->repo->blamTmpl = '%time %name commited %version %comment'; +$lang->repo->blameTmpl = 'Code for line %line, %name commited at %time, %version %comment'; $lang->repo->notRelated = 'There is currently no related ZenTao object'; $lang->repo->browseAction = 'Browse Repo'; @@ -50,6 +50,7 @@ $lang->repo->unlinkedTasks = 'Unlinked Tasks'; $lang->repo->submit = 'Submit'; $lang->repo->cancel = 'Cancel'; $lang->repo->addComment = 'Add Comment'; +$lang->repo->addIssue = 'Add Issue'; $lang->repo->copy = 'Click to copy'; $lang->repo->copied = 'Copy successful'; diff --git a/module/repo/lang/en.php b/module/repo/lang/en.php index 30bf38a225..b00644d155 100644 --- a/module/repo/lang/en.php +++ b/module/repo/lang/en.php @@ -28,7 +28,7 @@ $lang->repo->branch = 'Branch'; $lang->repo->tag = 'Tag'; $lang->repo->addWebHook = 'Add Webhook'; $lang->repo->apiGetRepoByUrl = 'API: Get repo by URL'; -$lang->repo->blamTmpl = '%time %name commited %version %comment'; +$lang->repo->blameTmpl = 'Code for line %line, %name commited at %time, %version %comment'; $lang->repo->notRelated = 'There is currently no related ZenTao object'; $lang->repo->browseAction = 'Browse Repo'; @@ -50,6 +50,7 @@ $lang->repo->unlinkedTasks = 'Unlinked Tasks'; $lang->repo->submit = 'Submit'; $lang->repo->cancel = 'Cancel'; $lang->repo->addComment = 'Add Comment'; +$lang->repo->addIssue = 'Add Issue'; $lang->repo->copy = 'Click to copy'; $lang->repo->copied = 'Copy successful'; diff --git a/module/repo/lang/fr.php b/module/repo/lang/fr.php index 3b53efb361..78874fd356 100644 --- a/module/repo/lang/fr.php +++ b/module/repo/lang/fr.php @@ -28,7 +28,7 @@ $lang->repo->branch = 'Branch'; $lang->repo->tag = 'Tag'; $lang->repo->addWebHook = 'Add Webhook'; $lang->repo->apiGetRepoByUrl = 'API: Get repo by URL'; -$lang->repo->blamTmpl = '%time %name commited %version %comment'; +$lang->repo->blameTmpl = 'Code for line %line, %name commited at %time, %version %comment'; $lang->repo->notRelated = 'There is currently no related ZenTao object'; $lang->repo->browseAction = 'Browse Repo'; @@ -50,6 +50,7 @@ $lang->repo->unlinkedTasks = 'Unlinked Tasks'; $lang->repo->submit = 'Soumettre'; $lang->repo->cancel = 'Annuler'; $lang->repo->addComment = 'Ajout Comment.'; +$lang->repo->addIssue = 'Add Issue'; $lang->repo->copy = 'Click to copy'; $lang->repo->copied = 'Copy successful'; diff --git a/module/repo/lang/zh-cn.php b/module/repo/lang/zh-cn.php index bfdcb81b61..168f09ccf8 100644 --- a/module/repo/lang/zh-cn.php +++ b/module/repo/lang/zh-cn.php @@ -28,7 +28,7 @@ $lang->repo->branch = '分支'; $lang->repo->tag = '标签'; $lang->repo->addWebHook = '添加Webhook'; $lang->repo->apiGetRepoByUrl = '接口：通过URL获取代码库'; -$lang->repo->blamTmpl = '%time 由 %name 提交 %version %comment'; +$lang->repo->blameTmpl = '第 %line 行代码相关信息， %name 于 %time 提交 %version %comment'; $lang->repo->notRelated = '暂时没有关联禅道对象'; $lang->repo->browseAction = '浏览代码库'; @@ -50,6 +50,7 @@ $lang->repo->unlinkedTasks = '未关联任务'; $lang->repo->submit = '提交'; $lang->repo->cancel = '取消'; $lang->repo->addComment = '添加评论'; +$lang->repo->addIssue = '提问题'; $lang->repo->copy = '点击复制'; $lang->repo->copied = '复制成功'; diff --git a/module/repo/view/ajaxgeteditorcontent.html.php b/module/repo/view/ajaxgeteditorcontent.html.php index 50808f3e0d..572e757e3a 100644 --- a/module/repo/view/ajaxgeteditorcontent.html.php +++ b/module/repo/view/ajaxgeteditorcontent.html.php @@ -19,7 +19,7 @@ js::set('jsRoot', $jsRoot); js::set('clientLang', $app->clientLang); js::set('fileExt', $this->config->repo->fileExt); js::set('file', $pathInfo); -js::set('blameTmpl', $lang->repo->blamTmpl); +js::set('blameTmpl', $lang->repo->blameTmpl); js::set('repoID', $repoID); js::set('showEditor', $showEditor); js::set('canLinkStory', $canLinkStory); @@ -44,28 +44,29 @@ js::import($jsRoot . 'monaco-editor/min/vs/loader.js');
-
+
+
+ +
+ +
    + ' . html::a('javascript:;', ' ' . $lang->repo->linkStory) . ''; + if($canLinkBug) echo '
  • ' . html::a('javascript:;', ' ' . $lang->repo->linkBug) . '
    • '; + if($canLinkTask) echo '
  • ' . html::a('javascript:;', ' ' . $lang->repo->linkTask) . '
    • '; + if($canUnlinkObject) echo ''; + ?> +
+
+ +