Browse Source

Merge branch 'V20220125' of git.openi.org.cn:OpenI/aiforge into benchmark

tags/v1.22.1.3
lewis 3 years ago
parent
commit
bbd2b13918
10 changed files with 119 additions and 14 deletions
  1. +3
    -1
      options/locale/locale_en-US.ini
  2. +1
    -0
      options/locale/locale_zh-CN.ini
  3. +1
    -1
      public/home/home.js
  4. +1
    -1
      templates/base/head_navbar.tmpl
  5. +2
    -2
      templates/base/head_navbar_fluid.tmpl
  6. +2
    -2
      templates/base/head_navbar_home.tmpl
  7. +2
    -2
      templates/base/head_navbar_pro.tmpl
  8. +2
    -2
      templates/home.tmpl
  9. +1
    -1
      templates/repo/header.tmpl
  10. +104
    -2
      web_src/less/openi.less

+ 3
- 1
options/locale/locale_en-US.ini View File

@@ -225,7 +225,7 @@ page_small_title=OpenI AI Development Cooperation Platform
page_description=The one-stop collaborative development environment for AI field provides AI development pipeline integrating code development, data management, model debugging, reasoning and evaluation page_description=The one-stop collaborative development environment for AI field provides AI development pipeline integrating code development, data management, model debugging, reasoning and evaluation
page_use=Use Now page_use=Use Now
page_only_dynamic=Only show the dynamics of open source projects page_only_dynamic=Only show the dynamics of open source projects
page_recommend_org=Recommended Organization
page_recommend_org=Recommended Organizations
page_recommend_org_desc=These excellent organizations are using the OpenI AI Collaboration Platform for collaborative development of projects. To show your organization here, page_recommend_org_desc=These excellent organizations are using the OpenI AI Collaboration Platform for collaborative development of projects. To show your organization here,
page_recommend_org_commit=Click here to submit. page_recommend_org_commit=Click here to submit.
page_recommend_org_more=More Organizations page_recommend_org_more=More Organizations
@@ -258,7 +258,9 @@ users = Users
organizations = Organizations organizations = Organizations
images = Cloudbrain Mirror images = Cloudbrain Mirror
search = Search search = Search
search_pro=Search projects
code = Code code = Code
data_analysis=Digital Bulletin Board (test)
repo_no_results = No matching repositories found. repo_no_results = No matching repositories found.
dataset_no_results = No matching datasets found. dataset_no_results = No matching datasets found.
user_no_results = No matching users found. user_no_results = No matching users found.


+ 1
- 0
options/locale/locale_zh-CN.ini View File

@@ -2715,6 +2715,7 @@ error.unit_not_allowed=您没有权限访问此项目单元
head.community=启智社区 head.community=启智社区
head.project=项目 head.project=项目
head.openi=启智项目 head.openi=启智项目
head.openi.repo = 启智项目
head.dataset=数据集 head.dataset=数据集
foot.council=理事会 foot.council=理事会
foot.technical_committee=技术委员会 foot.technical_committee=技术委员会


+ 1
- 1
public/home/home.js View File

@@ -288,7 +288,7 @@ var repoAndOrgEN={
"1":"Repository", "1":"Repository",
"2":"Member ", "2":"Member ",
"3":"Team", "3":"Team",
"11":"Repositorys",
"11":"Repositories",
"22":"Members ", "22":"Members ",
"31":"Teams", "31":"Teams",
"4":" hour ago", "4":" hour ago",


+ 1
- 1
templates/base/head_navbar.tmpl View File

@@ -73,7 +73,7 @@
{{if .IsOperator}} {{if .IsOperator}}
<a class="item" href="{{AppSubUrl}}/explore/data_analysis">{{.i18n.Tr "explore.data_analysis"}}</a> <a class="item" href="{{AppSubUrl}}/explore/data_analysis">{{.i18n.Tr "explore.data_analysis"}}</a>
{{end}} {{end}}
<a class="item" href="{{AppSubUrl}}/OpenI">{{.i18n.Tr "custom.head.openi"}}</a>
<a class="item" href="{{AppSubUrl}}/OpenI">{{.i18n.Tr "custom.head.openi.repo"}}</a>
</div> </div>
</div> </div>
{{else if .IsLandingPageExplore}} {{else if .IsLandingPageExplore}}


+ 2
- 2
templates/base/head_navbar_fluid.tmpl View File

@@ -42,7 +42,7 @@
{{if .IsOperator}} {{if .IsOperator}}
<a class="item" href="{{AppSubUrl}}/explore/data_analysis">{{.i18n.Tr "explore.data_analysis"}}</a> <a class="item" href="{{AppSubUrl}}/explore/data_analysis">{{.i18n.Tr "explore.data_analysis"}}</a>
{{end}} {{end}}
<a class="item" href="{{AppSubUrl}}/OpenI">{{.i18n.Tr "custom.head.openi"}}</a>
<a class="item" href="{{AppSubUrl}}/OpenI">{{.i18n.Tr "custom.head.openi.repo"}}</a>
</div> </div>
</div> </div>
{{else if .IsLandingPageHome}} {{else if .IsLandingPageHome}}
@@ -71,7 +71,7 @@
{{if .IsOperator}} {{if .IsOperator}}
<a class="item" href="{{AppSubUrl}}/explore/data_analysis">{{.i18n.Tr "explore.data_analysis"}}</a> <a class="item" href="{{AppSubUrl}}/explore/data_analysis">{{.i18n.Tr "explore.data_analysis"}}</a>
{{end}} {{end}}
<a class="item" href="{{AppSubUrl}}/OpenI">{{.i18n.Tr "custom.head.openi"}}</a>
<a class="item" href="{{AppSubUrl}}/OpenI">{{.i18n.Tr "custom.head.openi.repo"}}</a>
</div> </div>
</div> </div>
{{else if .IsLandingPageExplore}} {{else if .IsLandingPageExplore}}


+ 2
- 2
templates/base/head_navbar_home.tmpl View File

@@ -34,7 +34,7 @@
{{if .IsOperator}} {{if .IsOperator}}
<a class="item" href="{{AppSubUrl}}/explore/data_analysis">{{.i18n.Tr "explore.data_analysis"}}</a> <a class="item" href="{{AppSubUrl}}/explore/data_analysis">{{.i18n.Tr "explore.data_analysis"}}</a>
{{end}} {{end}}
<a class="item" href="{{AppSubUrl}}/OpenI">{{.i18n.Tr "custom.head.openi"}}</a>
<a class="item" href="{{AppSubUrl}}/OpenI">{{.i18n.Tr "custom.head.openi.repo"}}</a>
</div> </div>
</div> </div>
{{else if .IsLandingPageHome}} {{else if .IsLandingPageHome}}
@@ -64,7 +64,7 @@
{{if .IsOperator}} {{if .IsOperator}}
<a class="item" href="{{AppSubUrl}}/explore/data_analysis">{{.i18n.Tr "explore.data_analysis"}}</a> <a class="item" href="{{AppSubUrl}}/explore/data_analysis">{{.i18n.Tr "explore.data_analysis"}}</a>
{{end}} {{end}}
<a class="item" href="{{AppSubUrl}}/OpenI">{{.i18n.Tr "custom.head.openi"}}</a>
<a class="item" href="{{AppSubUrl}}/OpenI">{{.i18n.Tr "custom.head.openi.repo"}}</a>
</div> </div>
</div> </div>
{{else if .IsLandingPageExplore}} {{else if .IsLandingPageExplore}}


+ 2
- 2
templates/base/head_navbar_pro.tmpl View File

@@ -44,7 +44,7 @@
{{if .IsOperator}} {{if .IsOperator}}
<a class="item" href="{{AppSubUrl}}/explore/data_analysis">{{.i18n.Tr "explore.data_analysis"}}</a> <a class="item" href="{{AppSubUrl}}/explore/data_analysis">{{.i18n.Tr "explore.data_analysis"}}</a>
{{end}} {{end}}
<a class="item" href="{{AppSubUrl}}/OpenI">{{.i18n.Tr "custom.head.openi"}}</a>
<a class="item" href="{{AppSubUrl}}/OpenI">{{.i18n.Tr "custom.head.openi.repo"}}</a>
</div> </div>
</div> </div>
{{else if .IsLandingPageHome}} {{else if .IsLandingPageHome}}
@@ -74,7 +74,7 @@
{{if .IsOperator}} {{if .IsOperator}}
<a class="item" href="{{AppSubUrl}}/explore/data_analysis">{{.i18n.Tr "explore.data_analysis"}}</a> <a class="item" href="{{AppSubUrl}}/explore/data_analysis">{{.i18n.Tr "explore.data_analysis"}}</a>
{{end}} {{end}}
<a class="item" href="{{AppSubUrl}}/OpenI">{{.i18n.Tr "custom.head.openi"}}</a>
<a class="item" href="{{AppSubUrl}}/OpenI">{{.i18n.Tr "custom.head.openi.repo"}}</a>
</div> </div>
</div> </div>
{{else if .IsLandingPageExplore}} {{else if .IsLandingPageExplore}}


+ 2
- 2
templates/home.tmpl View File

@@ -38,7 +38,7 @@
<div class="ui stackable grid"> <div class="ui stackable grid">
<div class="sixteen wide tablet four wide computer column homeorg-tit"> <div class="sixteen wide tablet four wide computer column homeorg-tit">
<h2>{{.page_recommend_org}}</h2> <h2>{{.page_recommend_org}}</h2>
<p><span class="ui text grey">{{.page_recommend_org_desc}}</span><a href="{{.RecommendURL}}">{{.page_recommend_org_commit}}</a></p>
<p><span class="ui text grey">{{.page_recommend_org_desc}}&nbsp;</span><a href="{{.RecommendURL}}">{{.page_recommend_org_commit}}</a></p>
<a href="{{AppSubUrl}}/explore/organizations" class="circular ui primary basic button">{{.page_recommend_org_more}} <i class="arrow circle right icon"></i></a> <a href="{{AppSubUrl}}/explore/organizations" class="circular ui primary basic button">{{.page_recommend_org_more}} <i class="arrow circle right icon"></i></a>
</div> </div>
<div class="sixteen wide tablet twelve wide computer column"> <div class="sixteen wide tablet twelve wide computer column">
@@ -57,7 +57,7 @@
<div class="leftline02-2"></div> <div class="leftline02-2"></div>
<div class="ui center homepro-tit am-mb-20"> <div class="ui center homepro-tit am-mb-20">
<h2>{{.page_recommend_repo}}</h2> <h2>{{.page_recommend_repo}}</h2>
<p><span class="ui text grey">{{.page_recommend_repo_desc}}</span><a href="{{.RecommendURL}}">{{.page_recommend_repo_commit}}</a>{{.page_recommend_repo_go}}&nbsp;<a href="{{AppSubUrl}}/explore/">{{.page_recommend_repo_more}}</a></p>
<p><span class="ui text grey">{{.page_recommend_repo_desc}}&nbsp;</span><a href="{{.RecommendURL}}">{{.page_recommend_repo_commit}}</a>{{.page_recommend_repo_go}}&nbsp;<a href="{{AppSubUrl}}/explore/">{{.page_recommend_repo_more}}</a></p>
</div> </div>


<div class="homepro-list"> <div class="homepro-list">


+ 1
- 1
templates/repo/header.tmpl View File

@@ -90,7 +90,7 @@
{{end}} {{end}}
<div class="ui tabs container"> <div class="ui tabs container">
{{if not .Repository.IsBeingCreated}} {{if not .Repository.IsBeingCreated}}
<div class="ui tabular stackable menu navbar">
<div class="ui tabular menu navbar">
{{if .Permission.CanRead $.UnitTypeCode}} {{if .Permission.CanRead $.UnitTypeCode}}
<div class="dropdown-menu"> <div class="dropdown-menu">
<a class="{{if or .PageIsViewCode .PageIsReleaseList .PageIsWiki .PageIsActivity .PageIsViewCode}}active{{end}} item hover_active" href="{{.RepoLink}}{{if (ne .BranchName .Repository.DefaultBranch)}}/src/{{.BranchNameSubURL | EscapePound}}{{end}}"> <a class="{{if or .PageIsViewCode .PageIsReleaseList .PageIsWiki .PageIsActivity .PageIsViewCode}}active{{end}} item hover_active" href="{{.RepoLink}}{{if (ne .BranchName .Repository.DefaultBranch)}}/src/{{.BranchNameSubURL | EscapePound}}{{end}}">


+ 104
- 2
web_src/less/openi.less View File

@@ -15,8 +15,8 @@ a {
} }
.following.bar #navbar .brand{ .following.bar #navbar .brand{
padding-left: 0; padding-left: 0;
padding-top: 0;
padding-bottom: 0;
padding-top: 0;
padding-bottom: 0;
} }
.following.bar .brand .ui.mini.image { .following.bar .brand .ui.mini.image {
width: auto; width: auto;
@@ -615,4 +615,106 @@ display: block;
} }
.a_margin{ .a_margin{
margin: 0px !important; margin: 0px !important;
}
@media only screen and (max-width: 767px) {
.following.bar #navbar .brand{
padding-top: 6px;
}
.secondary.menu + .ui.container{
margin-left:0 !important;
margin-right:0 !important;
}
.repo-title{
position: absolute;
top: 6px;
left: 50px;
right: 70px;
height: 40px;
line-height: 40px !important;
text-align: center;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
color: #FFF;
background-color: #363840;
padding-left: 20px;
}
.repo-title a{
color: #FFF !important;
}
.repo-title img + a{
display: none !important;
}
.repository .header-wrapper{
margin-bottom: 36px;
}
.header-wrapper .tabs.divider{
margin-top: 40px !important;
}
.repository .ui.tabs.container{
margin-top: -60px;
}
.repo-title .divider,
.repo-title svg,
.repo-title img,
.ui.tabular.menu .item svg,
.ui.tabular.menu .item i,
.ui.tabular.menu .item .label,
.ui.tabular.menu .dropdown-content,
.repository.file .repository-summary,
.repository-summary + .menu,
.desc-home .edit-icon,
#repo-files-table .message,
#repo-files-table .age,
#repo-files-table .ui.sha.label,
#repo-files-table .commit-button,
.members
{
display: none !important;
}
.header-wrapper{
display: flex;
flex-direction: column-reverse;
}
.ui.tabular.menu .item{
padding: .5em;
}
.ui.tabular.menu .active.item{
border: none;
background: none;
color: #000000;
border-bottom: 2px solid #000;
white-space: nowrap;
}
.repository .repo-header{
margin-bottom: -50px;
}
.repo-header .repo-buttons{
position: absolute;
right: 15px;
margin-bottom: -60px;
}
.repo-buttons .ui.labeled.button>.button{
box-shadow: none !important;
width: 16px;
overflow: hidden;
white-space: nowrap;
}
.repo-buttons .ui.labeled.button>.label{
border: none !important;
}
.repository.file.list #repo-files-table td.name{
max-width: 100%;
}
#repo-files-table tr{
padding-top: 0;
padding-bottom: 0;
}
.ui.attached:not(.message)+.ui.attached.segment:not(.top){
border: none;
}
.markdown:not(code).file-view{
padding: 2em 0!important;
}
} }

Loading…
Cancel
Save