Browse Source

Update Donate button to their own badge and Resolves #73

Yoginth 7 năm trước cách đây
mục cha
commit
531fb0ea16

+ 2 - 1
conf/locale/locale_en-GB.ini

@@ -495,7 +495,6 @@ branches = Branches
 tags = Tags
 issues = Issues
 pulls = Pull Requests
-donate = Donate
 labels = Labels
 milestones = Milestones
 commits = Commits
@@ -752,6 +751,8 @@ settings.update_protect_branch_success = Protect options for this branch has bee
 settings.hooks = Webhooks
 settings.githooks = Git Hooks
 settings.basic_settings = Basic Settings
+settings.donate_url = Donate URL
+settings.donate_badge = Donate Badge
 settings.mirror_settings = Mirror Settings
 settings.sync_mirror = Sync Now
 settings.mirror_sync_in_progress = Mirror syncing is in progress, please refresh page in about a minute.

+ 2 - 1
conf/locale/locale_en-US.ini

@@ -495,7 +495,6 @@ branches = Branches
 tags = Tags
 issues = Issues
 pulls = Pull Requests
-donate = Donate
 labels = Labels
 milestones = Milestones
 commits = Commits
@@ -752,6 +751,8 @@ settings.update_protect_branch_success = Protect options for this branch has bee
 settings.hooks = Webhooks
 settings.githooks = Git Hooks
 settings.basic_settings = Basic Settings
+settings.donate_url = Donate URL
+settings.donate_badge = Donate Badge
 settings.mirror_settings = Mirror Settings
 settings.sync_mirror = Sync Now
 settings.mirror_sync_in_progress = Mirror syncing is in progress, please refresh page in about a minute.

+ 7 - 4
models/repo.go

@@ -159,7 +159,8 @@ type Repository struct {
 	Name            string `xorm:"INDEX NOT NULL"`
 	Description     string `xorm:"VARCHAR(512)"`
 	Website         string
-	Donate          string
+	DonateURL       string
+	DonateBadge     string
 	DefaultBranch   string
 	Size            int64 `xorm:"NOT NULL DEFAULT 0"`
 	UseCustomAvatar bool
@@ -1414,10 +1415,12 @@ func updateRepository(e Engine, repo *Repository, visibilityChanged bool) (err e
 	if len(repo.Website) > 255 {
 		repo.Website = repo.Website[:255]
 	}
-	if len(repo.Donate) > 255 {
-		repo.Donate = repo.Donate[:255]
+	if len(repo.DonateURL) > 255 {
+		repo.DonateURL = repo.DonateURL[:255]
+	}
+	if len(repo.DonateBadge) > 255 {
+		repo.DonateBadge = repo.DonateBadge[:255]
 	}
-
 	if _, err = e.ID(repo.ID).AllCols().Update(repo); err != nil {
 		return fmt.Errorf("update: %v", err)
 	}

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 193 - 193
pkg/bindata/bindata.go


+ 2 - 1
pkg/form/repo.go

@@ -72,7 +72,8 @@ type RepoSetting struct {
 	RepoName      string `binding:"Required;AlphaDashDot;MaxSize(100)"`
 	Description   string `binding:"MaxSize(512)"`
 	Website       string `binding:"Url;MaxSize(100)"`
-	Donate        string `binding:"Url;MaxSize(100)"`
+	DonateURL     string `binding:"Url;MaxSize(100)"`
+	DonateBadge   string `binding:"Url;MaxSize(100)"`
 	Branch        string
 	Interval      int
 	MirrorAddress string

+ 2 - 1
routes/repo/setting.go

@@ -80,7 +80,8 @@ func SettingsPost(c *context.Context, f form.RepoSetting) {
 
 		repo.Description = f.Description
 		repo.Website = f.Website
-		repo.Donate = f.Donate
+		repo.DonateURL = f.DonateURL
+		repo.DonateBadge = f.DonateBadge
 
 		// Visibility of forked repository is forced sync with base repository.
 		if repo.IsFork {

+ 3 - 3
templates/repo/header.tmpl

@@ -84,9 +84,9 @@
 					<i class="menu-icon octicon">📜</i> {{.i18n.Tr "repo.wiki"}}
 				</a>
 			{{end}}
-			{{if .Repository.Donate}}
-				<a class="item" href="{{.Repository.Donate}}" target="_blank">
-					<i class="menu-icon octicon">💸</i> {{.i18n.Tr "repo.donate"}}
+			{{if and .Repository.DonateURL .Repository.DonateBadge}}
+				<a class="item" href="{{.Repository.DonateURL}}" target="_blank">
+					<img style="width:5rem" src="{{.Repository.DonateBadge}}">
 				</a>
 			{{end}}
 			{{if .IsRepositoryAdmin}}

+ 7 - 3
templates/repo/settings/options.tmpl

@@ -27,9 +27,13 @@
 							<label for="website">{{.i18n.Tr "repo.settings.site"}}</label>
 							<input id="website" name="website" type="url" value="{{.Repository.Website}}">
 						</div>
-						<div class="field {{if .Err_Donate}}error{{end}}">
-							<label for="donate">{{.i18n.Tr "repo.donate"}}</label>
-							<input id="donate" name="donate" type="url" value="{{.Repository.Donate}}">
+						<div class="field">
+							<label for="donate_url">{{.i18n.Tr "repo.settings.donate_url"}}</label>
+							<input id="donate_url" name="donate_url" type="url" value="{{.Repository.DonateURL}}">
+						</div>
+						<div class="field">
+							<label for="donate_badge">{{.i18n.Tr "repo.settings.donate_badge"}}</label>
+							<input id="donate_badge" name="donate_badge" type="url" value="{{.Repository.DonateBadge}}">
 						</div>
 
 						{{if not .Repository.IsFork}}