pkg/setting: rename {AppUrl, AppSubUrl} -> {AppURL, AppSubURL}

14 files changed, 38 insertions, 38 deletions

diff --git a/templates/user/auth/activate.tmpl b/templates/user/auth/activate.tmpl
index 22635653..35fdc1ba 100644
--- a/templates/user/auth/activate.tmpl
+++ b/templates/user/auth/activate.tmpl
@@ -2,7 +2,7 @@
 <div class="user activate">
 	<div class="ui middle very relaxed page grid">
 		<div class="column">
-			<form class="ui form" action="{{AppSubUrl}}/user/activate" method="post">
+			<form class="ui form" action="{{AppSubURL}}/user/activate" method="post">
 				{{.CSRFTokenHTML}}
 				<h2 class="ui top attached header">
 					{{.i18n.Tr "auth.active_your_account"}}
diff --git a/templates/user/auth/login.tmpl b/templates/user/auth/login.tmpl
index d345bbbe..a84b7130 100644
--- a/templates/user/auth/login.tmpl
+++ b/templates/user/auth/login.tmpl
@@ -28,12 +28,12 @@
 					<div class="inline field">
 						<label></label>
 						<button class="ui green button">{{.i18n.Tr "sign_in"}}</button>
-						<a href="{{AppSubUrl}}/user/forget_password">{{.i18n.Tr "auth.forget_password"}}</a>
+						<a href="{{AppSubURL}}/user/forget_password">{{.i18n.Tr "auth.forget_password"}}</a>
 					</div>
 					{{if .ShowRegistrationButton}}
 						<div class="inline field">
 							<label></label>
-							<a href="{{AppSubUrl}}/user/sign_up">{{.i18n.Tr "auth.sign_up_now" | Str2html}}</a>
+							<a href="{{AppSubURL}}/user/sign_up">{{.i18n.Tr "auth.sign_up_now" | Str2html}}</a>
 						</div>
 					{{end}}
 				</div>
diff --git a/templates/user/auth/signup.tmpl b/templates/user/auth/signup.tmpl
index 8fc039ef..6022047f 100644
--- a/templates/user/auth/signup.tmpl
+++ b/templates/user/auth/signup.tmpl
@@ -45,7 +45,7 @@
 						</div>
 						<div class="inline field">
 							<label></label>
-							<a href="{{AppSubUrl}}/user/login">{{.i18n.Tr "auth.register_hepler_msg"}}</a>
+							<a href="{{AppSubURL}}/user/login">{{.i18n.Tr "auth.register_hepler_msg"}}</a>
 						</div>
 					{{end}}
 				</div>
diff --git a/templates/user/auth/two_factor.tmpl b/templates/user/auth/two_factor.tmpl
index b445c778..fc47d8f3 100644
--- a/templates/user/auth/two_factor.tmpl
+++ b/templates/user/auth/two_factor.tmpl
@@ -19,7 +19,7 @@
 					<button class="ui fluid green button">{{.i18n.Tr "settings.two_factor_verify"}}</button>
 				</div>
 				<p>
-					<a href="{{AppSubUrl}}/user/login/two_factor_recovery_code">{{.i18n.Tr "auth.login_two_factor_enter_recovery_code"}}</a>
+					<a href="{{AppSubURL}}/user/login/two_factor_recovery_code">{{.i18n.Tr "auth.login_two_factor_enter_recovery_code"}}</a>
 				</p>
 			</form>
 		</div>
diff --git a/templates/user/auth/two_factor_recovery_code.tmpl b/templates/user/auth/two_factor_recovery_code.tmpl
index dfe926a9..92980629 100644
--- a/templates/user/auth/two_factor_recovery_code.tmpl
+++ b/templates/user/auth/two_factor_recovery_code.tmpl
@@ -19,7 +19,7 @@
 					<button class="ui fluid green button">{{.i18n.Tr "settings.two_factor_verify"}}</button>
 				</div>
 				<p>
-					<a href="{{AppSubUrl}}/user/login/two_factor">{{.i18n.Tr "auth.login_two_factor_enter_passcode"}}</a>
+					<a href="{{AppSubURL}}/user/login/two_factor">{{.i18n.Tr "auth.login_two_factor_enter_passcode"}}</a>
 				</p>
 			</form>
 		</div>
diff --git a/templates/user/dashboard/dashboard.tmpl b/templates/user/dashboard/dashboard.tmpl
index 74af8801..4a0c90a2 100644
--- a/templates/user/dashboard/dashboard.tmpl
+++ b/templates/user/dashboard/dashboard.tmpl
@@ -21,7 +21,7 @@
 					<div class="ui top attached header">
 						{{.i18n.Tr "home.my_repos"}} <span class="ui grey label">{{.RepoCount}}</span>
 						<div class="ui right">
-							<a class="poping up" href="{{AppSubUrl}}/repo/create{{if .ContextUser.IsOrganization}}?org={{.ContextUser.ID}}{{end}}" data-content="{{.i18n.Tr "new_repo"}}" data-variation="tiny inverted" data-position="left center">
+							<a class="poping up" href="{{AppSubURL}}/repo/create{{if .ContextUser.IsOrganization}}?org={{.ContextUser.ID}}{{end}}" data-content="{{.i18n.Tr "new_repo"}}" data-variation="tiny inverted" data-position="left center">
 								<i class="plus icon"></i>
 								<span class="sr-only">{{.i18n.Tr "new_repo"}}</span>
 							</a>
@@ -31,7 +31,7 @@
 						<ul class="repo-owner-name-list">
 							{{range .Repos}}
 								<li {{if .IsPrivate}}class="private"{{end}}>
-									<a href="{{AppSubUrl}}/{{$.ContextUser.Name}}/{{.Name}}">
+									<a href="{{AppSubURL}}/{{$.ContextUser.Name}}/{{.Name}}">
 										<i class="octicon octicon-{{if .IsFork}}repo-forked{{else if .IsPrivate}}lock{{else if .IsMirror}}repo-clone{{else}}repo{{end}}"></i>
 										<strong class="text truncate item-name">{{.Name}}</strong>
 										<span class="ui right text light grey">
@@ -56,7 +56,7 @@
 							<ul id="collaborative-repo-list">
 								{{range .CollaborativeRepos}}
 									<li {{if .IsPrivate}}class="private"{{end}}>
-										<a href="{{AppSubUrl}}/{{.Owner.Name}}/{{.Name}}">
+										<a href="{{AppSubURL}}/{{.Owner.Name}}/{{.Name}}">
 											<i class="octicon octicon-{{if .IsPrivate}}lock{{else if .IsFork}}repo-forked{{else if .IsMirror}}repo-clone{{else}}repo{{end}}"></i>
 											<span class="text truncate owner-and-repo">
 												<span class="text truncate owner-name">{{.Owner.Name}}</span> / <strong>{{.Name}}</strong>
@@ -77,7 +77,7 @@
 						<div class="ui top attached header">
 							{{.i18n.Tr "home.my_orgs"}} <span class="ui grey label">{{.ContextUser.GetOrganizationCount}}</span>
 							<div class="ui right">
-								<a class="poping up" href="{{AppSubUrl}}/org/create" data-content="{{.i18n.Tr "new_org"}}" data-variation="tiny inverted" data-position="left center">
+								<a class="poping up" href="{{AppSubURL}}/org/create" data-content="{{.i18n.Tr "new_org"}}" data-variation="tiny inverted" data-position="left center">
 									<i class="plus icon"></i>
 									<span class="sr-only">{{.i18n.Tr "new_org"}}</span>
 								</a>
@@ -87,7 +87,7 @@
 							<ul class="repo-owner-name-list">
 								{{range .ContextUser.Orgs}}
 									<li>
-										<a href="{{AppSubUrl}}/{{.Name}}">
+										<a href="{{AppSubURL}}/{{.Name}}">
 											<i class="octicon octicon-organization"></i>
 											<strong class="text truncate item-name">{{.Name}}</strong>
 											<span class="ui right text light grey">
@@ -105,7 +105,7 @@
 					<div class="ui top attached header">
 						{{.i18n.Tr "home.my_mirrors"}} <span class="ui grey label">{{.MirrorCount}}</span>
 						<div class="ui right">
-							<a class="poping up" href="{{AppSubUrl}}/repo/migrate?mirror=1" data-content="{{.i18n.Tr "new_mirror"}}" data-variation="tiny inverted" data-position="left center">
+							<a class="poping up" href="{{AppSubURL}}/repo/migrate?mirror=1" data-content="{{.i18n.Tr "new_mirror"}}" data-variation="tiny inverted" data-position="left center">
 								<i class="plus icon"></i>
 								<span class="sr-only">{{.i18n.Tr "new_mirror"}}</span>
 							</a>
@@ -115,7 +115,7 @@
 						<ul class="repo-owner-name-list">
 							{{range .Mirrors}}
 								<li {{if .IsPrivate}}class="private"{{end}}>
-									<a href="{{AppSubUrl}}/{{$.ContextUser.Name}}/{{.Name}}">
+									<a href="{{AppSubURL}}/{{$.ContextUser.Name}}/{{.Name}}">
 										<i class="octicon octicon-repo-clone"></i>
 										<strong class="text truncate item-name">{{.Name}}</strong>
 										<span class="ui right text light grey">
diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl
index 17f3d6c0..3706434d 100644
--- a/templates/user/dashboard/feeds.tmpl
+++ b/templates/user/dashboard/feeds.tmpl
@@ -7,7 +7,7 @@
 			<div class="ui fifteen wide column">
 				<div class="{{if eq .GetOpType 5}}push news{{end}}">
 					<p>
-						<a href="{{AppSubUrl}}/{{.GetActUserName}}">{{.ShortActUserName}}</a>
+						<a href="{{AppSubURL}}/{{.GetActUserName}}">{{.ShortActUserName}}</a>
 						<!-- Reference types to models/action.go -->
 						{{if eq .GetOpType 1}} 
 							{{$.i18n.Tr "action.create_repo" .GetRepoLink .ShortRepoPath | Str2html}}
@@ -65,7 +65,7 @@
 										<li><img class="img-8" src="{{$push.AvatarLink .AuthorEmail}}"> <a class="commit-id" href="{{$repoLink}}/commit/{{.Sha1}}">{{ShortSHA1 .Sha1}}</a> <span class="text truncate light grey has-emoji">{{.Message}}</span></li>
 									{{end}}
 								{{end}}
-								{{if and (gt $push.Len 1) $push.CompareURL}}<li><a href="{{AppSubUrl}}/{{$push.CompareURL}}">{{$.i18n.Tr "action.compare_commits" $push.Len}} »</a></li>{{end}}
+								{{if and (gt $push.Len 1) $push.CompareURL}}<li><a href="{{AppSubURL}}/{{$push.CompareURL}}">{{$.i18n.Tr "action.compare_commits" $push.Len}} »</a></li>{{end}}
 							</ul>
 						</div>
 					{{else if eq .GetOpType 6}}
diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl
index c2ebd0a0..720f3fc7 100644
--- a/templates/user/dashboard/issues.tmpl
+++ b/templates/user/dashboard/issues.tmpl
@@ -68,7 +68,7 @@
 						{{ $timeStr:= TimeSince .Created $.Lang }}
 						<li class="item">
 							<div class="ui label">{{if not $.RepoID}}{{.Repo.FullName}}{{end}}#{{.Index}}</div>
-							<a class="title has-emoji" href="{{AppSubUrl}}/{{.Repo.Owner.Name}}/{{.Repo.Name}}/issues/{{.Index}}">{{.Title}}</a>
+							<a class="title has-emoji" href="{{AppSubURL}}/{{.Repo.Owner.Name}}/{{.Repo.Name}}/issues/{{.Index}}">{{.Title}}</a>
 
 							{{if .NumComments}}
 								<span class="comment ui right"><i class="octicon octicon-comment"></i> {{.NumComments}}</span>
diff --git a/templates/user/dashboard/navbar.tmpl b/templates/user/dashboard/navbar.tmpl
index 02f21048..d2600168 100644
--- a/templates/user/dashboard/navbar.tmpl
+++ b/templates/user/dashboard/navbar.tmpl
@@ -10,18 +10,18 @@
 				{{.i18n.Tr "home.switch_dashboard_context"}}
 			</div>
 			<div class="items">
-				<a class="{{if eq .ContextUser.ID .SignedUser.ID}}active selected{{end}} item" href="{{AppSubUrl}}/{{if .PageIsIssues}}issues{{else if .PageIsPulls}}pulls{{end}}">
+				<a class="{{if eq .ContextUser.ID .SignedUser.ID}}active selected{{end}} item" href="{{AppSubURL}}/{{if .PageIsIssues}}issues{{else if .PageIsPulls}}pulls{{end}}">
 					<img class="ui avatar image" src="{{.SignedUser.RelAvatarLink}}">
 					{{.SignedUser.Name}}
 				</a>
 				{{range .Orgs}}
-					<a class="{{if eq $.ContextUser.ID .ID}}active selected{{end}} item" href="{{AppSubUrl}}/org/{{.Name}}/{{if $.PageIsIssues}}issues{{else if $.PageIsPulls}}pulls{{else}}dashboard{{end}}">
+					<a class="{{if eq $.ContextUser.ID .ID}}active selected{{end}} item" href="{{AppSubURL}}/org/{{.Name}}/{{if $.PageIsIssues}}issues{{else if $.PageIsPulls}}pulls{{else}}dashboard{{end}}">
 						<img class="ui avatar image" src="{{.RelAvatarLink}}">
 						{{.ShortName 20}}
 					</a>
 				{{end}}
 			</div>
-			<a class="item" href="{{AppSubUrl}}/org/create">
+			<a class="item" href="{{AppSubURL}}/org/create">
 				<i class="octicon octicon-plus"></i>&nbsp;&nbsp;&nbsp;{{.i18n.Tr "new_org"}}
 			</a>
 		</div>
@@ -30,13 +30,13 @@
 	{{if .ContextUser.IsOrganization}}
 		<div class="ui right">
 			<div class="ui secondary head menu">
-				<a class="{{if .PageIsNews}}active{{end}} item" href="{{AppSubUrl}}/org/{{.ContextUser.Name}}/dashboard">
+				<a class="{{if .PageIsNews}}active{{end}} item" href="{{AppSubURL}}/org/{{.ContextUser.Name}}/dashboard">
 					<i class="octicon octicon-rss"></i>&nbsp;{{.i18n.Tr "activities"}}
 				</a>
-				<a class="{{if .PageIsIssues}}active{{end}} item" href="{{AppSubUrl}}/org/{{.ContextUser.Name}}/issues">
+				<a class="{{if .PageIsIssues}}active{{end}} item" href="{{AppSubURL}}/org/{{.ContextUser.Name}}/issues">
 					<i class="octicon octicon-issue-opened"></i>&nbsp;{{.i18n.Tr "issues"}}
 				</a>
-				<a class="{{if .PageIsPulls}}active{{end}} item" href="{{AppSubUrl}}/org/{{.ContextUser.Name}}/pulls">
+				<a class="{{if .PageIsPulls}}active{{end}} item" href="{{AppSubURL}}/org/{{.ContextUser.Name}}/pulls">
 					<i class="octicon octicon-git-pull-request"></i>&nbsp;{{.i18n.Tr "pull_requests"}}
 				</a>
 				<div class="right menu">
diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl
index 6bdf04db..4dced1d4 100644
--- a/templates/user/profile.tmpl
+++ b/templates/user/profile.tmpl
@@ -5,7 +5,7 @@
 			<div class="ui five wide column">
 				<div class="ui card">
 					{{if eq .SignedUserName .Owner.Name}}
-						<a class="image poping up" href="{{AppSubUrl}}/user/settings/avatar" id="profile-avatar" data-content="{{.i18n.Tr "user.change_avatar"}}" data-variation="inverted tiny" data-position="bottom center">
+						<a class="image poping up" href="{{AppSubURL}}/user/settings/avatar" id="profile-avatar" data-content="{{.i18n.Tr "user.change_avatar"}}" data-variation="inverted tiny" data-position="bottom center">
 							<img src="{{.Owner.RelAvatarLink}}?s=290" title="{{.Owner.Name}}"/>
 						</a>
 					{{else}}
diff --git a/templates/user/settings/navbar.tmpl b/templates/user/settings/navbar.tmpl
index 3092bedc..ec1205c2 100644
--- a/templates/user/settings/navbar.tmpl
+++ b/templates/user/settings/navbar.tmpl
@@ -1,34 +1,34 @@
 <div class="four wide column">
 	<div class="ui vertical menu">
 		<div class="header item">{{.i18n.Tr "settings"}}</div>
-		<a class="{{if .PageIsSettingsProfile}}active{{end}} item" href="{{AppSubUrl}}/user/settings">
+		<a class="{{if .PageIsSettingsProfile}}active{{end}} item" href="{{AppSubURL}}/user/settings">
 			{{.i18n.Tr "settings.profile"}}
 		</a>
-		<a class="{{if .PageIsSettingsAvatar}}active{{end}} item" href="{{AppSubUrl}}/user/settings/avatar">
+		<a class="{{if .PageIsSettingsAvatar}}active{{end}} item" href="{{AppSubURL}}/user/settings/avatar">
 			{{.i18n.Tr "settings.avatar"}}
 		</a>
-		<a class="{{if .PageIsSettingsPassword}}active{{end}} item" href="{{AppSubUrl}}/user/settings/password">
+		<a class="{{if .PageIsSettingsPassword}}active{{end}} item" href="{{AppSubURL}}/user/settings/password">
 			{{.i18n.Tr "settings.password"}}
 		</a>
-		<a class="{{if .PageIsSettingsEmails}}active{{end}} item" href="{{AppSubUrl}}/user/settings/email">
+		<a class="{{if .PageIsSettingsEmails}}active{{end}} item" href="{{AppSubURL}}/user/settings/email">
 			{{.i18n.Tr "settings.emails"}}
 		</a>
-		<a class="{{if .PageIsSettingsSSHKeys}}active{{end}} item" href="{{AppSubUrl}}/user/settings/ssh">
+		<a class="{{if .PageIsSettingsSSHKeys}}active{{end}} item" href="{{AppSubURL}}/user/settings/ssh">
 			{{.i18n.Tr "settings.ssh_keys"}}
 		</a>
-		<a class="{{if .PageIsSettingsSecurity}}active{{end}} item" href="{{AppSubUrl}}/user/settings/security">
+		<a class="{{if .PageIsSettingsSecurity}}active{{end}} item" href="{{AppSubURL}}/user/settings/security">
 			{{.i18n.Tr "settings.security"}}
 		</a>
-		<a class="{{if .PageIsSettingsRepositories}}active{{end}} item" href="{{AppSubUrl}}/user/settings/repositories">
+		<a class="{{if .PageIsSettingsRepositories}}active{{end}} item" href="{{AppSubURL}}/user/settings/repositories">
 			{{.i18n.Tr "settings.repos"}}
 		</a>
-		<a class="{{if .PageIsSettingsOrganizations}}active{{end}} item" href="{{AppSubUrl}}/user/settings/organizations">
+		<a class="{{if .PageIsSettingsOrganizations}}active{{end}} item" href="{{AppSubURL}}/user/settings/organizations">
 			{{.i18n.Tr "settings.orgs"}}
 		</a>
-		<a class="{{if .PageIsSettingsApplications}}active{{end}} item" href="{{AppSubUrl}}/user/settings/applications">
+		<a class="{{if .PageIsSettingsApplications}}active{{end}} item" href="{{AppSubURL}}/user/settings/applications">
 			{{.i18n.Tr "settings.applications"}}
 		</a>
-		<a class="{{if .PageIsSettingsDelete}}active{{end}} item" href="{{AppSubUrl}}/user/settings/delete">
+		<a class="{{if .PageIsSettingsDelete}}active{{end}} item" href="{{AppSubURL}}/user/settings/delete">
 			{{.i18n.Tr "settings.delete"}}
 		</a>
 	</div>
diff --git a/templates/user/settings/organizations.tmpl b/templates/user/settings/organizations.tmpl
index b4963264..53ae6bb3 100644
--- a/templates/user/settings/organizations.tmpl
+++ b/templates/user/settings/organizations.tmpl
@@ -8,7 +8,7 @@
 				<h4 class="ui top attached header">
 					{{.i18n.Tr "settings.orgs"}}
 					<div class="ui right">
-						<a class="ui blue tiny button" href="{{AppSubUrl}}/org/create">{{.i18n.Tr "new_org"}}</a>
+						<a class="ui blue tiny button" href="{{AppSubURL}}/org/create">{{.i18n.Tr "new_org"}}</a>
 					</div>
 				</h4>
 				<div class="ui attached segment orgs {{if .Orgs}}non-empty{{end}}">
diff --git a/templates/user/settings/repositories.tmpl b/templates/user/settings/repositories.tmpl
index e4fd1a3e..416deca5 100644
--- a/templates/user/settings/repositories.tmpl
+++ b/templates/user/settings/repositories.tmpl
@@ -24,7 +24,7 @@
 										<i class="octicon octicon-repo"></i>
 									{{end}}
 								</span>
-								<a href="{{AppSubUrl}}/{{.Owner.Name}}/{{.Name}}">
+								<a href="{{AppSubURL}}/{{.Owner.Name}}/{{.Name}}">
 									{{.Owner.Name}}/{{.Name}}
 								</a> 
 								<span class="ui text light grey">{{.Size | FileSize}}</span>
diff --git a/templates/user/settings/security.tmpl b/templates/user/settings/security.tmpl
index 371f0bc7..f779b058 100644
--- a/templates/user/settings/security.tmpl
+++ b/templates/user/settings/security.tmpl
@@ -16,14 +16,14 @@
 							<button class="ui right mini red toggle button delete-button" data-url="{{$.Link}}/two_factor_disable">{{.i18n.Tr "settings.two_factor_disable"}}</button>
 						{{else}}
 							<span class="text red">{{.i18n.Tr "settings.two_factor_off"}} <i class="octicon octicon-x"></i></span>
-							<a class="ui right mini green toggle button" href="{{AppSubUrl}}/user/settings/security/two_factor_enable">{{.i18n.Tr "settings.two_factor_enable"}}</a>
+							<a class="ui right mini green toggle button" href="{{AppSubURL}}/user/settings/security/two_factor_enable">{{.i18n.Tr "settings.two_factor_enable"}}</a>
 						{{end}}
 					</p>
 				</div>
 				{{if .TwoFactor}}
 					<br>
-					<p>{{.i18n.Tr "settings.two_factor_view_recovery_codes" AppSubUrl "/user/settings/security/two_factor_recovery_codes" | Safe}}</p>
-					<p>{{.i18n.Tr "settings.two_factor_http" AppSubUrl "/user/settings/applications" "https://{token}@try.gogs.io/user/repo.git" | Safe}}</p>
+					<p>{{.i18n.Tr "settings.two_factor_view_recovery_codes" AppSubURL "/user/settings/security/two_factor_recovery_codes" | Safe}}</p>
+					<p>{{.i18n.Tr "settings.two_factor_http" AppSubURL "/user/settings/applications" "https://{token}@try.gogs.io/user/repo.git" | Safe}}</p>
 				{{end}}
 			</div>
 		</div>