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

Merge branch 'cyy_repo' into 'zenops_44'

Browse Source 
* Optimize page style.

See merge request easycorp/zentaopms!5162
This commit is contained in:
李玉春
2022-08-29 00:29:52 +00:00
parent f69e5c0ce0 41599f0975
commit bc233a7b8f
10 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/repo/css/ajaxgeteditorcontent.css
+1
View File
@@ -15,3 +15,4 @@
#relationTabs > .tabs-navbar > .nav-tabs {position: absolute; display: flex;}
#related .content, #related .btn {background-color: #F4F5F7; border: none;}
#related .nav-tabs > li.active > a:before {background: none; height: 0;}
#related .table-empty-tip {padding: 35px 10px;}
module/repo/css/ajaxgetrelationinfo.css
+1 -1
View File
@@ -1,7 +1,7 @@
body {background-color: #fff; padding-bottom: 20px;}
.linkContent .panel {margin-bottom: 0; padding-bottom: 10px; border: none;}
.left-content {border-right: 1px solid #EDEEF2; padding-top: 15px;}
.text {width: 80%; white-space: normal; word-wrap: break-word; word-break: break-all; font-weight: normal; padding-left: 10px;}
.text {width: 85%; white-space: normal; word-wrap: break-word; word-break: break-all; font-weight: normal; padding-left: 10px;}
.cell {min-height: 300px;}
.menu-title {width: 100%;}
.detail-content {margin-top: 0;}
module/repo/css/monaco.css
+1
View File
@@ -1,3 +1,4 @@
.m-repo-monaco {overflow: hidden;}
.repoCode .nav > li > a {padding: 8px 10px;}
.repoCode .nav-tabs > li > a > span {margin-right: 5px;}
module/repo/lang/de.php
+1
View File
@@ -27,6 +27,7 @@ $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->notRelated = 'There is currently no related ZenTao object';
$lang->repo->browseAction = 'Browse Repo';
$lang->repo->createAction = 'Create Repo';
module/repo/lang/en.php
+1
View File
@@ -27,6 +27,7 @@ $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->notRelated = 'There is currently no related ZenTao object';
$lang->repo->browseAction = 'Browse Repo';
$lang->repo->createAction = 'Create Repo';
module/repo/lang/fr.php
+1
View File
@@ -27,6 +27,7 @@ $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->notRelated = 'There is currently no related ZenTao object';
$lang->repo->browseAction = 'Browse Repo';
$lang->repo->createAction = 'Créer Ref';
module/repo/lang/vi.php
+1
View File
@@ -27,6 +27,7 @@ $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->notRelated = 'There is currently no related ZenTao object';
$lang->repo->browseAction = 'Browse Repo';
$lang->repo->createAction = 'Create Repo';
module/repo/lang/zh-cn.php
+1
View File
@@ -27,6 +27,7 @@ $lang->repo->tag = '标签';
$lang->repo->addWebHook = '添加Webhook';
$lang->repo->apiGetRepoByUrl = '接口：通过URL获取代码库';
$lang->repo->blamTmpl = '%time 由%name提交%version %comment';
$lang->repo->notRelated = '暂时没有关联禅道对象';
$lang->repo->browseAction = '浏览代码库';
$lang->repo->createAction = '创建代码库';
module/repo/view/ajaxgeteditorcontent.html.php
+6
View File
@@ -55,6 +55,9 @@ $canUnlinkObject = common::hasPriv('repo', 'unlinkObject');
</div>
</div>
</div>
<div class="table-empty-tip">
<p><?php echo $lang->repo->notRelated;?></p>
</div>
</div>
</div>
<?php include '../../common/view/footer.lite.html.php';?>
@@ -72,6 +75,7 @@ $('#codeContainer').css('height', $.cookie('codeContainerHeight'));
*/
function getRelation(commit)
{
$('.table-empty-tip').show();
$('#codeContainer').css('height', codeHeight / 5 * 3);
var relatedHeight = codeHeight / 5 * 2 - $('#log').height() - 10;
$('#related').css('height', relatedHeight);
@@ -105,6 +109,8 @@ function getRelation(commit)
{
$('#relationTabs').tabs({tabs: tabs});
}
$('.table-empty-tip').hide();
}
arrowTabs('relationTabs', 1);
module/repo/view/ajaxgetrelationinfo.html.php
+3 -11
View File
@@ -13,8 +13,8 @@ include '../../common/view/header.lite.html.php';
?>
<div class="main-col linkContent main">
<div class="content pane">
<div class="fade main-row split-row in">
<div class="side-col left-content">
<div class="fade main-row split-row in col-md-12">
<div class="left-content col-md-8">
<table class="menu-title">
<?php if($objectType == 'story'):?>
<tr><th class='text-right'><?php echo $lang->release->storyTitle;?>: </th><td class="text"><?php echo $object->title; ?></td></tr>
@@ -31,7 +31,7 @@ include '../../common/view/header.lite.html.php';
<?php endif;?>
</table>
</div>
<div class="main-col right-content">
<div class="main-col right-content col-md-4">
<?php include '../../common/view/action.html.php';?>
</div>
</div>
@@ -43,13 +43,5 @@ $(function()
{
$('a').attr('href', 'javascript:;').removeClass('iframe').css('color', '#3c4353');
$('blockquote a').empty();
if($('.linkContent .content').width() != 0) $.cookie('eidtorLinkedContentWidth', $('.linkContent .content').width());
$('.right-content').css('width', $.cookie('eidtorLinkedContentWidth') / 5 * 2);
});
if(window.onblur)
{
$('.right-content').css('width', $.cookie('eidtorLinkedContentWidth') / 5 * 2);
}
</script>