Browse Source

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

tags/v1.22.1.3
chenyifan01 3 years ago
parent
commit
3df43fd4e3
3 changed files with 11 additions and 17 deletions
  1. +2
    -11
      templates/repo/home.tmpl
  2. +6
    -6
      templates/repo/settings/options.tmpl
  3. +3
    -0
      web_src/js/components/EditAboutInfo.vue

+ 2
- 11
templates/repo/home.tmpl View File

@@ -256,11 +256,8 @@
</div>
<div class="ui six wide tablet four wide computer column">
<div id="repo-desc">
<h4 id="about-desc" class="ui header">简介
<!-- <a class="edit-icon" href="javascript:void(0)">
<i class="gray edit outline icon"></i>
</a> -->
</h4>
<h4 id="about-desc" class="ui header">简介</h4>
<input type="hidden" id="edit-alias" value="{{.Repository.Alias}}">
<p>
{{if .Repository.DescriptionHTML}}
<span class="description" style="word-break:break-all">{{.Repository.DescriptionHTML}}</span>
@@ -286,14 +283,8 @@
<i class="grey bookmark icon"></i>

<div id="repo-topics1" style="flex: 1;">
<!-- {{if not .Topics}}
<span class="no-description text-italic">{{.i18n.Tr "repo.no_desc"}}</span>
{{end}} -->
{{range .Topics}}

<a class="ui repo-topic small label topic" href="{{AppSubUrl}}/explore/repos?q={{.Name}}&topic=">{{.Name}}</a>


{{end}}
</div>
<div>


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

@@ -509,7 +509,7 @@
<div class="field">
<label>
{{.i18n.Tr "repo.settings.transfer_form_title"}}
<span class="text red">{{.Repository.Name}}</span>
<span class="text red">{{.Repository.Alias}}</span>
</label>
</div>
<div class="required field">
@@ -541,7 +541,7 @@
<div class="field">
<label>
{{.i18n.Tr "repo.settings.transfer_form_title"}}
<span class="text red">{{.Repository.Name}}</span>
<span class="text red">{{.Repository.Alias}}</span>
</label>
</div>
<div class="required field">
@@ -568,7 +568,7 @@
<div class="content">
<div class="ui warning message text left">
{{.i18n.Tr "repo.settings.delete_notices_1" | Safe}}<br>
{{.i18n.Tr "repo.settings.delete_notices_2" .Repository.FullName | Safe}}
{{.i18n.Tr "repo.settings.delete_notices_2" .Repository.Alias | Safe}}
{{if .Repository.NumForks}}<br>
{{.i18n.Tr "repo.settings.delete_notices_fork_1"}}
{{end}}
@@ -579,7 +579,7 @@
<div class="field">
<label>
{{.i18n.Tr "repo.settings.transfer_form_title"}}
<span class="text red">{{.Repository.Name}}</span>
<span class="text red">{{.Repository.Alias}}</span>
</label>
</div>
<div class="required field">
@@ -603,7 +603,7 @@
<div class="content">
<div class="ui warning message text left">
{{.i18n.Tr "repo.settings.delete_notices_1" | Safe}}<br>
{{.i18n.Tr "repo.settings.wiki_delete_notices_1" .Repository.Name | Safe}}
{{.i18n.Tr "repo.settings.wiki_delete_notices_1" .Repository.Alias | Safe}}
</div>
<form class="ui form" action="{{.Link}}" method="post">
{{.CsrfTokenHtml}}
@@ -611,7 +611,7 @@
<div class="field">
<label>
{{.i18n.Tr "repo.settings.transfer_form_title"}}
<span class="text red">{{.Repository.Name}}</span>
<span class="text red">{{.Repository.Alias}}</span>
</label>
</div>
<div class="required field">


+ 3
- 0
web_src/js/components/EditAboutInfo.vue View File

@@ -52,6 +52,7 @@ export default {
desc: '',
index_web: '',
repo_name_name: '',
alias:''
},
// rule1:[{min:3,max:5,message:'1',trigger:"blur"}],
rule: {
@@ -76,6 +77,7 @@ export default {
getRepoName() {
const el = this.url.split('/')[2];
this.info.repo_name = el;
this.info.alias = $('input#edit-alias').val()
},
initForm(diaolog) {
if (diaolog === false) {
@@ -95,6 +97,7 @@ export default {
data: this.qs.stringify({
_csrf: csrf,
action: 'update',
alias:this.info.alias,
repo_name: this.info.repo_name,
description: this.info.desc,
website: this.info.index_web


Loading…
Cancel
Save