Merge branch 'V20211115' into fix-683

options/locale/locale_en-US.ini

@@ -755,6 +755,7 @@ unit_disabled = The site administrator has disabled this repository section.
 language_other = Other
 datasets = Datasets
 datasets.desc = Enable Dataset
+cloudbrain_helper=Use GPU/NPU resources to open notebooks, model training tasks, etc.
 
 debug=Debug
 stop=Stop

options/locale/locale_zh-CN.ini

@@ -757,6 +757,7 @@ unit_disabled=站点管理员已禁用此项目单元。
 language_other=其它
 datasets=数据集
 datasets.desc=数据集功能
+cloudbrain_helper=使用GPU/NPU资源，开启Notebook、模型训练任务等
 
 debug=调试
 stop=停止

routers/repo/view.go

@@ -243,6 +243,11 @@ func renderDirectory(ctx *context.Context, treeLink string) {
 		ctx.Data["ReadmeInList"] = true
 		ctx.Data["ReadmeExist"] = true
 		ctx.Data["FileIsSymlink"] = readmeFile.isSymlink
+		ctx.Data["ReadmeName"] = readmeFile.name
+
+		if ctx.Repo.CanEnableEditor() {
+			ctx.Data["CanEditFile"] = true
+		}
 
 		dataRc, err := readmeFile.blob.DataAsync()
 		if err != nil {

routers/routes/routes.go

@@ -615,6 +615,11 @@ func RegisterRoutes(m *macaron.Macaron) {
 	//reqRepoBlockChainWriter := context.RequireRepoWriter(models.UnitTypeBlockChain)
 
 	// ***** START: Organization *****
+	m.Group("/org", func() {
+		m.Group("/:org", func() {
+			m.Get("/members", org.Members)
+		}, context.OrgAssignment())
+	})
 	m.Group("/org", func() {
 		m.Group("", func() {
 			m.Get("/create", org.Create)
@@ -625,7 +630,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 			m.Get("/dashboard", user.Dashboard)
 			m.Get("/^:type(issues|pulls)$", user.Issues)
 			m.Get("/milestones", reqMilestonesDashboardPageEnabled, user.Milestones)
-			m.Get("/members", org.Members)
+			//m.Get("/members", org.Members)
 			m.Post("/members/action/:action", org.MembersAction)
 
 			m.Get("/teams", org.Teams)

templates/org/home.tmpl

@@ -38,11 +38,12 @@
 					<div class="ui sixteen wide mobile six wide tablet five wide computer column">
 						<h4 class="ui top attached header">
 							<strong>{{.i18n.Tr "org.people"}}</strong>
-							{{if .IsOrganizationMember}}
-								<div class="ui right">
-									<a class="text grey" href="{{.OrgLink}}/members">{{.Org.NumMembers}} {{svg "octicon-chevron-right" 16}}</a>
-								</div>
-							{{end}}
+							<div class="ui right">
+								<a class="text grey" href="{{.OrgLink}}/members">{{.Org.NumMembers}} {{svg "octicon-chevron-right" 16}}</a>
+							</div>
+							<!-- {{if .IsOrganizationMember}} -->
+								
+							<!-- {{end}} -->
 						</h4>
 						<div class="ui attached segment members">
 							{{$isMember := .IsOrganizationMember}}

templates/org/navber.tmpl

@@ -3,10 +3,10 @@
 		<a class="{{if $.PageIsOrgHome}}active{{end}} item" href="{{.HomeLink}}">
 			{{svg "octicon-home" 16}}&nbsp;{{$.i18n.Tr "org.home"}}
 		</a>
+		<a class="{{if $.PageIsOrgMembers}}active{{end}} item" href="{{$.OrgLink}}/members">
+			{{svg "octicon-organization" 16}}&nbsp;{{$.i18n.Tr "org.people"}}
+		</a>
 		{{if or ($.IsOrganizationMember) ($.IsOrganizationOwner)}}
-			<a class="{{if $.PageIsOrgMembers}}active{{end}} item" href="{{$.OrgLink}}/members">
-				{{svg "octicon-organization" 16}}&nbsp;{{$.i18n.Tr "org.people"}}
-			</a>
 			<a class="{{if $.PageIsOrgTeams}}active{{end}} item" href="{{$.OrgLink}}/teams">
 				{{svg "octicon-jersey" 16}}&nbsp;{{$.i18n.Tr "org.teams"}}
 			</a>
@@ -23,10 +23,10 @@
 				{{svg "octicon-home" 16}}&nbsp;{{$.i18n.Tr "org.home"}}
 			</a>
 			{{end}}
+			<a class="{{if $.PageIsOrgMembers}}active{{end}} item" href="{{$.OrgLink}}/members">
+				{{svg "octicon-organization" 16}}&nbsp;{{$.i18n.Tr "org.people"}}
+			</a>
 			{{if or ($.IsOrganizationMember) ($.IsOrganizationOwner)}}
-				<a class="{{if $.PageIsOrgMembers}}active{{end}} item" href="{{$.OrgLink}}/members">
-					{{svg "octicon-organization" 16}}&nbsp;{{$.i18n.Tr "org.people"}}
-				</a>
 				<a class="{{if $.PageIsOrgTeams}}active{{end}} item" href="{{$.OrgLink}}/teams">
 					{{svg "octicon-jersey" 16}}&nbsp;{{$.i18n.Tr "org.teams"}}
 				</a>

templates/repo/activity.tmpl

@@ -2,8 +2,18 @@
 <div class="repository commits">
 	{{template "repo/header" .}}
 	<div class="ui container">
-		<h2 class="ui header">{{.DateFrom}} - {{.DateUntil}}
-			<div class="ui right">
+		<div class="ui three column stackable grid" style="align-items: center;">
+			<div class="column">
+				<div class="ui breadcrumb">
+					<a class="section" href="{{.RepoLink}}{{if (ne .BranchName .Repository.DefaultBranch)}}/src/{{.BranchNameSubURL | EscapePound}}{{end}}">{{.i18n.Tr "repo.code"}}</a>
+					<div class="divider"> / </div>
+					<div class="active section" href="{{.RepoLink}}/activity">{{.i18n.Tr "repo.activity"}}</div>
+				</div>
+			</div>
+			<div class="column center aligned" style="font-weight: 800;">
+				{{.DateFrom}} - {{.DateUntil}}
+			</div>
+			<div class="column right aligned">
 				<!-- Period -->
 				<div class="ui floating dropdown jump filter">
 					<div class="ui basic compact button">
@@ -23,7 +33,7 @@
 					</div>
 				</div>
 			</div>
-		</h2>
+		</div>
 		<div class="ui divider"></div>
 
 		{{if (or (.Permission.CanRead $.UnitTypeIssues) (.Permission.CanRead $.UnitTypePullRequests))}}

templates/repo/header.tmpl

@@ -92,16 +92,27 @@
 		{{if not .Repository.IsBeingCreated}}
 			<div class="ui tabular stackable menu navbar">
 				{{if .Permission.CanRead $.UnitTypeCode}}
-					<a class="{{if .PageIsViewCode}}active{{end}} item" href="{{.RepoLink}}{{if (ne .BranchName .Repository.DefaultBranch)}}/src/{{.BranchNameSubURL | EscapePound}}{{end}}">
-						{{svg "octicon-code" 16}} {{.i18n.Tr "repo.code"}}
+				<div class="dropdown-menu">
+					<a class="{{if or .PageIsViewCode .PageIsReleaseList .PageIsWiki .PageIsActivity}}active{{end}} item" href="{{.RepoLink}}{{if (ne .BranchName .Repository.DefaultBranch)}}/src/{{.BranchNameSubURL | EscapePound}}{{end}}">
+							<span>{{svg "octicon-code" 16}} {{.i18n.Tr "repo.code"}} <i class="dropdown icon"></i></span>
 					</a>
-				{{end}}
+					<div class="dropdown-content">
+						<a style="border: none;" class="{{if .PageIsReleaseList}}active{{end}} item" href="{{.RepoLink}}/releases">
+							{{svg "octicon-tag" 16}} {{.i18n.Tr "repo.releases"}} <span class="ui {{if not .NumReleases}}gray{{else}}blue{{end}} small label">{{.NumReleases}}</span>
+						</a>
+						<a style="border: none;" class="{{if .PageIsWiki}}active{{end}} item" href="{{.RepoLink}}/wiki" {{if (.Permission.CanRead $.UnitTypeExternalWiki)}} target="_blank" rel="noopener noreferrer" {{end}}>
+							{{svg "octicon-book" 16}} {{.i18n.Tr "repo.wiki"}}
+						</a>
+						<a style="border: none;" class="{{if .PageIsActivity}}active{{end}} item" href="{{.RepoLink}}/activity">
+								{{svg "octicon-pulse" 16}} {{.i18n.Tr "repo.activity"}}
+						</a>
 
-				{{if .Permission.CanRead $.UnitTypeDatasets}}
-				<a class="{{if .PageIsDataset}}active{{end}} item" href="{{.RepoLink}}/datasets?type=0">
-					{{svg "octicon-inbox" 16}} {{.i18n.Tr "datasets"}}
-				</a>
+					</div>
+				</div>
+					
 				{{end}}
+				
+
 
 				{{if .Permission.CanRead $.UnitTypeIssues}}
 					<a class="{{if .PageIsIssueList}}active{{end}} item" href="{{.RepoLink}}/issues">
@@ -109,11 +120,11 @@
 					</a>
 				{{end}}
 
-				{{if .Permission.CanRead $.UnitTypeExternalTracker}}
+				<!-- {{if .Permission.CanRead $.UnitTypeExternalTracker}}
 					<a class="{{if .PageIsIssueList}}active{{end}} item" href="{{.RepoExternalIssuesLink}}" target="_blank" rel="noopener noreferrer">
 						{{svg "octicon-link-external" 16}} {{.i18n.Tr "repo.issues"}} </span>
 					</a>
-				{{end}}
+				{{end}} -->
 
 				{{if and .Repository.CanEnablePulls (.Permission.CanRead $.UnitTypePullRequests)}}
 					<a class="{{if .PageIsPullList}}active{{end}} item" href="{{.RepoLink}}/pulls">
@@ -121,35 +132,22 @@
 					</a>
 				{{end}}
 
-				{{if and (.Permission.CanRead $.UnitTypeReleases) (not .IsEmptyRepo) }}
-				<a class="{{if .PageIsReleaseList}}active{{end}} item" href="{{.RepoLink}}/releases">
-					{{svg "octicon-tag" 16}} {{.i18n.Tr "repo.releases"}} <span class="ui {{if not .NumReleases}}gray{{else}}blue{{end}} small label">{{.NumReleases}}</span>
+				{{if .Permission.CanRead $.UnitTypeDatasets}}
+				<a class="{{if .PageIsDataset}}active{{end}} item" href="{{.RepoLink}}/datasets?type=0">
+					{{svg "octicon-inbox" 16}} {{.i18n.Tr "datasets"}}
 				</a>
 				{{end}}
-
-				{{if or (.Permission.CanRead $.UnitTypeWiki) (.Permission.CanRead $.UnitTypeExternalWiki)}}
-					<a class="{{if .PageIsWiki}}active{{end}} item" href="{{.RepoLink}}/wiki" {{if (.Permission.CanRead $.UnitTypeExternalWiki)}} target="_blank" rel="noopener noreferrer" {{end}}>
-						{{svg "octicon-book" 16}} {{.i18n.Tr "repo.wiki"}}
-					</a>
-				{{end}}
-
-				{{if and (.Permission.CanReadAny $.UnitTypePullRequests $.UnitTypeIssues $.UnitTypeReleases) (not .IsEmptyRepo)}}
-					<a class="{{if .PageIsActivity}}active{{end}} item" href="{{.RepoLink}}/activity">
-						{{svg "octicon-pulse" 16}} {{.i18n.Tr "repo.activity"}}
-					</a>
-				{{end}}
-
 				{{if .Permission.CanRead $.UnitTypeCloudBrain}}
 				<a class="{{if .PageIsCloudBrain}}active{{end}} item" href="{{.RepoLink}}/cloudbrain">
-					{{svg "octicon-server" 16}} {{.i18n.Tr "repo.cloudbrain"}}
+					<span>{{svg "octicon-server" 16}} {{.i18n.Tr "repo.cloudbrain"}}<i class="question circle icon link cloudbrain-question" data-content={{.i18n.Tr "repo.cloudbrain_helper"}} data-position="top center" data-variation="mini"></i></span>
 				</a>
 				{{end}}
-                {{if .IsSigned}}
+                <!-- {{if .IsSigned}}
 				<a class="{{if .PageIsBlockChain}}active{{end}} item " href="{{.RepoLink}}/blockchain">
 					{{svg "octicon-law" 16}}
 					{{.i18n.Tr "repo.balance"}}
 				</a>
-				{{end}}
+				{{end}} -->
 
 				{{template "custom/extra_tabs" .}}
 
@@ -243,4 +241,9 @@
 			window.location.href = repolink + "/datasets?type=" + checked_radio
 		})
 	})
+	$('.question.circle.icon').hover(function(){
+		$(this).popup('show')
+		$('.ui.popup.mini.top.center').css({"border-color":'rgba(50, 145, 248, 100)',"color":"rgba(3, 102, 214, 100)","border-radius":"5px"})
+	});
+	
 </script>

templates/repo/release/list.tmpl

@@ -4,7 +4,11 @@
 	<div class="ui container">
 		{{template "base/alert" .}}
 		<h2 class="ui header">
-			{{.i18n.Tr "repo.release.releases"}}
+			<div class="ui breadcrumb">
+				<a class="section" href="{{.RepoLink}}{{if (ne .BranchName .Repository.DefaultBranch)}}/src/{{.BranchNameSubURL | EscapePound}}{{end}}">{{.i18n.Tr "repo.code"}}</a>
+				<div class="divider"> / </div>
+				<div class="active section" href="{{.RepoLink}}/releases">{{.i18n.Tr "repo.releases"}}</div>
+			</div>
 			{{if .CanCreateRelease}}
 				<div class="ui right">
 					<a class="ui small green button" href="{{$.RepoLink}}/releases/new">

templates/repo/view_file.tmpl

@@ -34,6 +34,21 @@
 				</div>
 			{{end}}
 		</div>
+
+		{{if .ReadmeInList}}
+		<div class="file-header-right">
+			<div class="ui right file-actions">
+				{{if .Repository.CanEnableEditor}}
+					{{if .CanEditFile}}
+						<a href="{{.RepoLink}}/_edit/{{EscapePound .BranchName}}/{{EscapePound .ReadmeName}}"><span class="btn-octicon poping up"  data-content="{{.EditFileTooltip}}" data-position="bottom center" data-variation="tiny inverted">{{svg "octicon-pencil" 16}}</span></a>
+					{{else}}
+						<span class="btn-octicon poping up disabled" data-content="{{.EditFileTooltip}}" data-position="bottom center" data-variation="tiny inverted">{{svg "octicon-pencil" 16}}</span>
+					{{end}}
+				{{end}}
+			</div>
+		</div>
+		{{end}}
+		
 		{{if not .ReadmeInList}}
 		<div class="file-header-right">
 			<div class="ui right file-actions">

templates/repo/wiki/start.tmpl

@@ -2,6 +2,13 @@
 <div class="repository wiki start">
 	{{template "repo/header" .}}
 	<div class="ui container">
+		<h2 class="ui header">
+			<div class="ui breadcrumb">
+				<a class="section" href="{{.RepoLink}}{{if (ne .BranchName .Repository.DefaultBranch)}}/src/{{.BranchNameSubURL | EscapePound}}{{end}}">{{.i18n.Tr "repo.code"}}</a>
+				<div class="divider"> / </div>
+				<div class="active section" href="{{.RepoLink}}/wiki">{{.i18n.Tr "repo.wiki"}}</div>
+			</div>
+		</h2>
 		<div class="ui center segment">
 			{{svg "octicon-book" 32}}
 			<h2>{{.i18n.Tr "repo.wiki.welcome"}}</h2>

templates/repo/wiki/view.tmpl

@@ -3,6 +3,14 @@
 	{{template "repo/header" .}}
 	{{ $title := .title}}
 	<div class="ui container">
+		<h2 class="ui header">
+			<div class="ui breadcrumb">
+				<a class="section" href="{{.RepoLink}}{{if (ne .BranchName .Repository.DefaultBranch)}}/src/{{.BranchNameSubURL | EscapePound}}{{end}}">{{.i18n.Tr "repo.code"}}</a>
+				<div class="divider"> / </div>
+				<div class="active section" href="{{.RepoLink}}/wiki">{{.i18n.Tr "repo.wiki"}}</div>
+			</div>
+		</h2>
+		<div class="ui divider"></div>
 		<div class="ui stackable grid">
 			<div class="ui ten wide column">
 				<div class="choose page">
@@ -28,7 +36,7 @@
 					</div>
 				</div>
 			</div>
-			<div class="ui six wide column">
+			<div class="ui six wide column right aligned">
 				<div class="ui action small input" id="clone-panel">
 					{{if not $.DisableHTTP}}
 						<button class="ui basic clone button" id="repo-clone-https" data-link="{{.WikiCloneLink.HTTPS}}">

web_src/js/components/EditAboutInfo.vue

@@ -1,9 +1,9 @@
 <template>
   <div>
-      <h4 id="about-desc" class="ui header">简介
-        <!-- <a class="edit-icon" href="javascript:void(0)" @click="editClick">
-        <i class="gray edit outline icon"></i>
-        </a> -->
+      <h4 id="about-desc" class="ui header desc-home">简介
+        <a class="edit-icon" href="javascript:void(0)" @click="editClick">
+        <i class="gray edit outline icon" style="margin-right: 0;"></i>
+        </a>
     </h4>
     <edit-dialog-cmpt 
 		:vmContext="vmContext" 
@@ -11,8 +11,8 @@
 		v-model="editDataDialog"
 		:deleteCallback="editDataFunc"
 		:deleteLoading ="editDataListLoading"
-        deleteParam = "ruleForm"
-        @input="initForm"
+    deleteParam = "ruleForm"
+    @input="initForm"
 		>
 			<div slot="title">
 				
@@ -20,7 +20,7 @@
 			<div slot="content">
 				<el-form label-position="top" :model="info" :rules="rule" ref="ruleForm">
 					<el-form-item label="简介" prop="desc">
-						<el-input v-model="info.desc" type="textarea" :autosize="{minRows:2,maxRows:6}"></el-input>
+						<el-input v-model="info.desc" type="textarea" placeholder="请输入内容" :autosize="{minRows:4,maxRows:6}" maxlength="255" show-word-limit></el-input>
 					</el-form-item>
 					<el-form-item label="主页" prop="index_web" >
 						<el-input v-model="info.index_web" placeholder="主页(eg: https://git.openi.org.cn)"></el-input>
@@ -70,7 +70,7 @@ export default {
       this.info.desc = el;
     },
     getWeb() {
-      const el = $('a.link').text();
+      const el = $('a.link.edit-link').text();
       this.info.index_web = el;
     },
     getRepoName() {
@@ -79,7 +79,6 @@ export default {
     },
     initForm(diaolog) {
       if (diaolog === false) {
-        console.log("--watch----------")
         this.getRepoName();
         this.getDesc();
         this.getWeb();
@@ -133,12 +132,11 @@ export default {
 
 <style scoped>
 .edit-icon{
-    float: right;
-    font-size: 16px;
-    display: block;
-    top: -2px;
     color: #8c92a4;
-    background-color: transparent;
-    }
+}
+.desc-home{
+  display: flex;
+  justify-content: space-between;
+}
 
 </style>

web_src/js/components/basic/editDialog.vue

@@ -14,8 +14,8 @@
             <slot name="content"></slot>
         
         <div slot="footer" class="dialog-footer">
-            <el-button @click="deleteDialog = false">{{"取消"}}</el-button>
-            <el-button type="primary" @click="deleteCallback.call(vmContext,deleteParam)">{{"确定"}}</el-button>
+            <el-button size="small" @click="deleteDialog = false">{{"取消"}}</el-button>
+            <el-button size="small" style="background-color: #21ba45;color: #fff;" @click="deleteCallback.call(vmContext,deleteParam)">{{"确定"}}</el-button>
         </div>
     </el-dialog>
 </template>
@@ -80,26 +80,31 @@ export default {
 .message-box__content .message-box-title{font-size:16px;padding:2px 0;color:#333;}
 .message-box__content .message-box-p{font-size:16px;padding:20px 0;color:#333;}
 .message-box__content .message-box-info{color:#999;padding:2px 0;}
-.dialog-footer,.el-message-box__btns{text-align:center;}
 
 
+/deep/ .el-dialog__body{
+  padding: 1rem;
+}
 /deep/ .el-dialog__header {
-    background: #0067b3;
-    padding: 12px 30px;
-    line-height: 25px;}
+    background: #f0f0f0;
+    padding: 1rem;
+}
 /deep/ .el-dialog__title {
     font-family: PingFangSC-Regular;
-    font-size: 18px;
-    color: #fff;
+    font-size: 1.28571429rem;
+    color: rgba(0,0,0,.87);
     font-weight: 200;
     line-height: 25px;
     height: 25px;
 }
 /deep/ .el-dialog__footer {
     background: #eff3f9;
-    padding: 20px 30px;
+    padding: 1rem;
 }
 /deep/ .el-dialog{
-    width: 40%;
+    width: 30%;
+}
+/deep/ .el-form-item__label{
+    padding: 0;
 }
 </style>

web_src/less/openi.less

@@ -244,3 +244,34 @@ footer .column{margin-bottom:0!important; padding-bottom:0!important;}
     width: 100%;
 }
 
+.dropdown-menu {
+	position: relative;
+	display: inline-block;
+	margin-top: 4px;
+}
+.dropdown-menu:hover .dropdown-content {
+display: block;
+}
+.dropdown-content{
+	display: none;
+	position: absolute;
+	background-color: #ffffff;
+	min-width: 180px;
+	z-index: 999;
+	border: 1px solid transparent; 
+	border-color: #d4d4d5;
+	border-top: none;
+
+}
+.dropdown-content a {
+	color: black;
+	padding: 12px 16px;
+	text-decoration: none;
+	display: block;
+}
+.dropdown-content a:hover {background-color: #f1f1f1}
+.cloudbrain-question{
+	margin-left: 4px !important;
+	color: #3291F8;
+	
+}