Browse Source

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

tags/v1.22.1.3
chenyifan01 4 years ago
parent
commit
76fca2b114
4 changed files with 20 additions and 6 deletions
  1. +3
    -3
      templates/repo/repo_name.tmpl
  2. +1
    -1
      templates/repo/settings/options.tmpl
  3. +4
    -1
      templates/user/dashboard/milestones.tmpl
  4. +12
    -1
      web_src/js/index.js

+ 3
- 3
templates/repo/repo_name.tmpl View File

@@ -1,6 +1,6 @@
<div class="inline required field {{if .Err_RepoName}}error{{end}}" >
<label for="Alias">{{.i18n.Tr "form.Alias"}}</label>
<input id="alias" name="alias" value="{{.alias}}" autofocus required>
<input id="alias" name="alias" value="{{.alias}}" autofocus required maxlength="100">
<span class="help">{{.i18n.Tr "form.reponame_dash_dot_error"}}</span>
</div>

@@ -36,7 +36,7 @@
<div class="ui interval" style="width: 0.6em;font-size: 2rem;line-height: 0px;text-align: center;">/</div>
<div class="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>
<input style="width: 100% !important;" id="repo_name" name="repo_name" value="{{.repo_name}}" maxlength="100" autofocus required>
</div>
@@ -46,7 +46,7 @@
<div class="inline field" id="repoAdress" style="display: none;word-break: break-all;">
<label for="">{{.i18n.Tr "form.RepoAdress"}}:</label>
<span></span>
<span style="flex: 1;"></span>


+ 1
- 1
templates/repo/settings/options.tmpl View File

@@ -35,7 +35,7 @@
</div>
</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}}">
<div class="eight wide required field {{if .Err_Alias}}error{{end}}">
<!-- <label for="repo_name">{{.i18n.Tr "repo.repo_name"}}</label> -->
<input style="width: 100% !important;" id="repo_name" name="repo_name" value="{{.Repository.Name}}" data-repo-name="{{.Repository.Name}}" autofocus required>
<span class="help">{{.i18n.Tr "form.repoadd_dash_dot_error"}}</span>


+ 4
- 1
templates/user/dashboard/milestones.tmpl View File

@@ -65,7 +65,7 @@
<div class="milestone list">
{{range .Milestones}}
<li class="item">
<div class="ui label">{{.Repo.FullName}}</div>
<div class="ui label">{{.Repo.OwnerName}}/{{.Repo.Alias}}</div>
{{svg "octicon-milestone" 16}} <a href="{{.Repo.Link }}/milestone/{{.ID}}">{{.Name}}</a>
<div class="ui right green progress" data-percent="{{.Completeness}}">
<div class="bar" {{if not .Completeness}}style="background-color: transparent"{{end}}>
@@ -117,3 +117,6 @@
</div>
</div>
{{template "base/footer" .}}
<script>
console.log({{.Milestones}})
</script>

+ 12
- 1
web_src/js/index.js View File

@@ -2966,10 +2966,21 @@ $(document).ready(async () => {

const $cloneAddr = $('#clone_addr');
$cloneAddr.on('change', () => {
const $repoName = $('#repo_name');
const $repoName = $('#alias');
const $owner = $('#ownerDropdown div.text').attr("title")
const $urlAdd = location.href.split('/')[0] + '//' + location.href.split('/')[2]
if ($cloneAddr.val().length > 0 && $repoName.val().length === 0) {
// Only modify if repo_name input is blank
const repoValue = $cloneAddr.val().match(/^(.*\/)?((.+?)(\.git)?)$/)[3]
$repoName.val($cloneAddr.val().match(/^(.*\/)?((.+?)(\.git)?)$/)[3]);
$.get(`${window.config.AppSubUrl}/repo/check_name?q=${repoValue}&owner=${$owner}`,(data)=>{
const repo_name = data.name
$('#repo_name').val(repo_name)
repo_name && $('#repo_name').parent().removeClass('error')
$('#repoAdress').css("display","flex")
$('#repoAdress span').text($urlAdd+'/'+$owner+'/'+$('#repo_name').val()+'.git')
$('#repo_name').attr("placeholder","")
})
}
});



Loading…
Cancel
Save