Merge remote-tracking branch 'giteaofficial/main'

* giteaofficial/main: Remove useless "Cancel" buttons (go-gitea#21872)
zjjhot · Dec 6, 2022 · 8b86552 · 8b86552
2 parents c2742e0 + 77f5035
commit 8b86552
Show file tree

Hide file tree

Showing 12 changed files with 0 additions and 12 deletions.
diff --git a/templates/org/create.tmpl b/templates/org/create.tmpl
@@ -48,7 +48,6 @@
 						<button class="ui green button">
 							{{.locale.Tr "org.create_org"}}
 						</button>
-						<a class="ui button" href="{{AppSubUrl}}/">{{.locale.Tr "cancel"}}</a>
 					</div>
 				</div>
 			</form>

diff --git a/templates/org/team/new.tmpl b/templates/org/team/new.tmpl
@@ -134,7 +134,6 @@
 						<div class="field">
 							{{if .PageIsOrgTeamsNew}}
 								<button class="ui green button">{{.locale.Tr "org.create_team"}}</button>
-								<a class="ui button" href="{{.OrgLink}}/teams">{{.locale.Tr "cancel"}}</a>
 							{{else}}
 								<button class="ui green button">{{.locale.Tr "org.teams.update_settings"}}</button>
 								{{if not (eq .Team.LowerName "owners")}}

diff --git a/templates/repo/migrate/codebase.tmpl b/templates/repo/migrate/codebase.tmpl
@@ -107,7 +107,6 @@
 						<button class="ui green button">
 							{{.locale.Tr "repo.migrate_repo"}}
 						</button>
-						<a class="ui button" href="{{AppSubUrl}}/">{{.locale.Tr "cancel"}}</a>
 					</div>
 				</div>
 			</form>

diff --git a/templates/repo/migrate/git.tmpl b/templates/repo/migrate/git.tmpl
@@ -81,7 +81,6 @@
 						<button class="ui green button">
 							{{.locale.Tr "repo.migrate_repo"}}
 						</button>
-						<a class="ui button" href="{{AppSubUrl}}/">{{.locale.Tr "cancel"}}</a>
 					</div>
 				</div>
 			</form>

diff --git a/templates/repo/migrate/gitbucket.tmpl b/templates/repo/migrate/gitbucket.tmpl
@@ -123,7 +123,6 @@
 						<button class="ui green button">
 							{{.locale.Tr "repo.migrate_repo"}}
 						</button>
-						<a class="ui button" href="{{AppSubUrl}}/">{{.locale.Tr "cancel"}}</a>
 					</div>
 				</div>
 			</form>

diff --git a/templates/repo/migrate/gitea.tmpl b/templates/repo/migrate/gitea.tmpl
@@ -119,7 +119,6 @@
 						<button class="ui green button">
 							{{.locale.Tr "repo.migrate_repo"}}
 						</button>
-						<a class="ui button" href="{{AppSubUrl}}/">{{.locale.Tr "cancel"}}</a>
 					</div>
 				</div>
 			</form>

diff --git a/templates/repo/migrate/github.tmpl b/templates/repo/migrate/github.tmpl
@@ -121,7 +121,6 @@
 						<button class="ui green button">
 							{{.locale.Tr "repo.migrate_repo"}}
 						</button>
-						<a class="ui button" href="{{AppSubUrl}}/">{{.locale.Tr "cancel"}}</a>
 					</div>
 				</div>
 			</form>

diff --git a/templates/repo/migrate/gitlab.tmpl b/templates/repo/migrate/gitlab.tmpl
@@ -118,7 +118,6 @@
 						<button class="ui green button">
 							{{.locale.Tr "repo.migrate_repo"}}
 						</button>
-						<a class="ui button" href="{{AppSubUrl}}/">{{.locale.Tr "cancel"}}</a>
 					</div>
 				</div>
 			</form>

diff --git a/templates/repo/migrate/gogs.tmpl b/templates/repo/migrate/gogs.tmpl
@@ -121,7 +121,6 @@
 						<button class="ui green button">
 							{{.locale.Tr "repo.migrate_repo"}}
 						</button>
-						<a class="ui button" href="{{AppSubUrl}}/">{{.locale.Tr "cancel"}}</a>
 					</div>
 				</div>
 			</form>

diff --git a/templates/repo/migrate/onedev.tmpl b/templates/repo/migrate/onedev.tmpl
@@ -107,7 +107,6 @@
 						<button class="ui green button">
 							{{.locale.Tr "repo.migrate_repo"}}
 						</button>
-						<a class="ui button" href="{{AppSubUrl}}/">{{.locale.Tr "cancel"}}</a>
 					</div>
 				</div>
 			</form>

diff --git a/templates/repo/pulls/fork.tmpl b/templates/repo/pulls/fork.tmpl
@@ -61,7 +61,6 @@
 						<button class="ui green button">
 							{{.locale.Tr "repo.fork_repo"}}
 						</button>
-						<a class="ui button" href="{{.ForkRepo.Link}}">{{.locale.Tr "cancel"}}</a>
 					</div>
 				</div>
 			</form>

diff --git a/templates/user/project.tmpl b/templates/user/project.tmpl
@@ -60,7 +60,6 @@
 						<button class="ui green button">
 							{{.locale.Tr "repo.projects.create"}}
 						</button>
-						<a class="ui button" href="{{AppSubUrl}}/">{{.locale.Tr "cancel"}}</a>
 					</div>
 				</div>
 			</form>