Merge remote-tracking branch 'origin/V20220110.patch' into V20220110.patch

options/locale/locale_en-US.ini

@@ -959,6 +959,9 @@ template.avatar = Avatar
 template.issue_labels = Issue Labels
 template.one_item = Must select at least one template item
 template.invalid = Must select a template repository
+template.repo_adress=Adress
+template.repo_path=path
+template.repo_name=Name
 
 archive.title = This repo is archived. You can view files and clone it, but cannot push or open issues/pull-requests.
 archive.issue.nocomment = This repo is archived. You cannot comment on issues.

options/locale/locale_zh-CN.ini

@@ -971,6 +971,9 @@ template.avatar=头像
 template.issue_labels=任务标签
 template.one_item=必须至少选择一个模板项
 template.invalid=必须选择一个模板项目
+template.repo_adress=项目地址
+template.repo_path=项目地址
+template.repo_name=项目名称
 
 archive.title=此项目已存档。您可以查看文件和克隆，但不能推送或创建任务/合并请求。
 archive.issue.nocomment=此项目已存档，您不能在此任务添加评论。

templates/repo/create.tmpl

@@ -154,4 +154,13 @@
 		</div>
 	</div>
 </div>
-{{template "base/footer" .}}
+<<<<<<< HEAD
+{{template "base/footer" .}}
+<script>
+console.log("---------asdasd")
+
+
+</script>
+=======
+{{template "base/footer" .}}
+>>>>>>> 8dd288ecb423553e68556e5e3af4f3bf8eacdfe8

templates/repo/settings/options.tmpl

@@ -67,6 +67,54 @@
 					<span></span>
 					
 				</div>
+
+				<div class="required field">
+					<label>{{.i18n.Tr "repo.template.repo_path"}}</label>
+					<div class="fields">
+						<div class="eight wide required field {{if .Err_Owner}}error{{end}}">
+							<!-- <label>{{.i18n.Tr "repo.owner"}}</label> -->
+							<div class="ui selection owner dropdown">
+								<input type="hidden" id="uid" name="uid" value="{{.ContextUser.ID}}" required>
+								<span class="text" title="{{.ContextUser.Name}}">
+									<img class="ui mini image" src="{{.ContextUser.RelAvatarLink}}">
+									{{.ContextUser.ShortName 20}}
+								</span>
+								<i class="dropdown icon"></i>
+								<div class="menu">
+									<div class="item" data-value="{{.SignedUser.ID}}" title="{{.SignedUser.Name}}">
+										<img class="ui mini image" src="{{.SignedUser.RelAvatarLink}}">
+										{{.SignedUser.ShortName 20}}
+									</div>
+									{{range .Orgs}}
+										<div class="item" data-value="{{.ID}}" title="{{.Name}}">
+											<img class="ui mini image" src="{{.RelAvatarLink}}">
+											{{.ShortName 20}}
+										</div>
+									{{end}}
+								</div>
+							</div>
+							<!-- <span class="help">{{.i18n.Tr "repo.repo_owner_helper"}}</span> -->
+						</div>
+						<!-- <div class="required field {{if .Err_RepoName}}error{{end}}">
+							<input  id="repo_name" name="repo_name" value="{{.repo_name}}" autofocus required>
+						</div> -->
+						<div class="ui interval" style="width: 0.6em;font-size: 2rem;line-height: 38px;text-align: center;">/</div>
+						<div class="eight wide required field {{if .Err_RepoName}}error{{end}}">
+							<!-- <label for="repo_name">{{.i18n.Tr "repo.repo_name"}}</label> -->
+							<input style="width: 100% !important;" id="repo_name" name="repo_name" value="{{.repo_name}}" autofocus required>
+							
+						</div>
+					</div>
+					
+				</div>
+
+				<div class="inline field" id="repoAdress" style="display: none;">
+					<label for="">{{.i18n.Tr "repo.template.repo_adress"}}:</label>
+					<span></span>
+					
+				</div>
+
+
 				<div class="inline field">
 					<label>{{.i18n.Tr "repo.repo_size"}}</label>
 					<span>{{SizeFmt .Repository.Size}}</span>

web_src/js/index.js

@@ -4216,4 +4216,4 @@ function initcreateRepo(){
   });
 }
 
-initcreateRepo()
+initcreateRepo()