#1944 Drop /org/ URL path prefix in organization home page

5 files changed, 11 insertions, 11 deletions

diff --git a/templates/.VERSION b/templates/.VERSION
index 5ca4043c1f..06ee4e4704 100644
--- a/templates/.VERSION
+++ b/templates/.VERSION
@@ -1 +1 @@
-0.7.21.1124 Beta
\ No newline at end of file
+0.7.22.1124 Beta
\ No newline at end of file
diff --git a/templates/org/header.tmpl b/templates/org/header.tmpl
index 68c25a9865..c30433d96b 100644
--- a/templates/org/header.tmpl
+++ b/templates/org/header.tmpl
@@ -4,7 +4,7 @@
 		<div class="column">
 			<div class="ui header">
 				<img class="ui image" src="{{.AvatarLink}}?s=100">
-				<span class="text thin grey"><a href="{{AppSubUrl}}/org/{{.Name}}">{{.DisplayName}}</a></span>
+				<span class="text thin grey"><a href="{{.HomeLink}}">{{.DisplayName}}</a></span>
 
 				<div class="ui right">
 			    <div class="ui menu">
diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl
index 9f64f30259..f1e19e30dc 100644
--- a/templates/org/home.tmpl
+++ b/templates/org/home.tmpl
@@ -40,7 +40,7 @@
           <strong>{{.i18n.Tr "org.people"}}</strong>
           {{if $isMember}}
           <div class="ui right">
-            <a class="text grey" href="{{.Org.HomeLink}}/members"><strong>{{.Org.NumMembers}}</strong><span class="octicon octicon-chevron-right"></span></a>
+            <a class="text grey" href="{{.OrgLink}}/members"><strong>{{.Org.NumMembers}}</strong><span class="octicon octicon-chevron-right"></span></a>
           </div>
           {{end}}
         </h4>
@@ -53,7 +53,7 @@
         </div>
         {{if .IsOrganizationOwner}}
         <div class="ui bottom attached segment">
-          <a class="ui blue small button" href="{{.Org.HomeLink}}/invitations/new">{{.i18n.Tr "org.invite_someone"}}</a>
+          <a class="ui blue small button" href="{{.OrgLink}}/invitations/new">{{.i18n.Tr "org.invite_someone"}}</a>
         </div>
         {{end}}
 
@@ -61,20 +61,20 @@
         <div class="ui top attached header">
           <strong>{{.i18n.Tr "org.teams"}}</strong>
           <div class="ui right">
-            <a class="text grey" href="{{.Org.HomeLink}}/teams"><strong>{{.Org.NumTeams}}</strong><span class="octicon octicon-chevron-right"></span></a>
+            <a class="text grey" href="{{.OrgLink}}/teams"><strong>{{.Org.NumTeams}}</strong><span class="octicon octicon-chevron-right"></span></a>
           </div>
         </div>
         <div class="ui attached table segment teams">
           {{range .Teams}}
           <div class="item">
-            <a href="{{$.Org.HomeLink}}/teams/{{.LowerName}}"><strong class="team-name">{{.Name}}</strong></a>
+            <a href="{{$.OrgLink}}/teams/{{.LowerName}}"><strong class="team-name">{{.Name}}</strong></a>
             <p class="text grey">{{.NumMembers}} {{$.i18n.Tr "org.lower_members"}} · {{.NumRepos}} {{$.i18n.Tr "org.lower_repositories"}}</p>
           </div>
           {{end}}
         </div>
         {{if .IsOrganizationOwner}}
         <div class="ui bottom attached segment">
-          <a class="ui blue small button" href="{{.Org.HomeLink}}/teams/new">{{.i18n.Tr "org.create_new_team"}}</a>
+          <a class="ui blue small button" href="{{.OrgLink}}/teams/new">{{.i18n.Tr "org.create_new_team"}}</a>
         </div>
         {{end}}
         {{end}}
diff --git a/templates/org/settings/navbar.tmpl b/templates/org/settings/navbar.tmpl
index 30f5818768..d6bfe04145 100644
--- a/templates/org/settings/navbar.tmpl
+++ b/templates/org/settings/navbar.tmpl
@@ -1,13 +1,13 @@
 <div class="four wide column">
 	<div class="ui vertical menu">
 		<div class="header item">{{.i18n.Tr "org.settings"}}</div>
-	  <a class="{{if .PageIsSettingsOptions}}active{{end}} item" href="{{.Org.HomeLink}}/settings">
+	  <a class="{{if .PageIsSettingsOptions}}active{{end}} item" href="{{.OrgLink}}/settings">
 	    {{.i18n.Tr "org.settings.options"}}
 	  </a>
-	  <a class="{{if .PageIsSettingsHooks}}active{{end}} item" href="{{.Org.HomeLink}}/settings/hooks">
+	  <a class="{{if .PageIsSettingsHooks}}active{{end}} item" href="{{.OrgLink}}/settings/hooks">
 	    {{.i18n.Tr "repo.settings.hooks"}}
 	  </a>
-	  <a class="{{if .PageIsSettingsDelete}}active{{end}} item" href="{{.Org.HomeLink}}/settings/delete">
+	  <a class="{{if .PageIsSettingsDelete}}active{{end}} item" href="{{.OrgLink}}/settings/delete">
 	    {{.i18n.Tr "org.settings.delete"}}
 	  </a>
 	</div>
diff --git a/templates/user/dashboard/navbar.tmpl b/templates/user/dashboard/navbar.tmpl
index 7d9c999507..eb74191702 100644
--- a/templates/user/dashboard/navbar.tmpl
+++ b/templates/user/dashboard/navbar.tmpl
@@ -41,7 +41,7 @@
       </a>
       <div class="right menu">
         <div class="item">
-          <a class="ui blue basic button" href="{{AppSubUrl}}/org/{{.ContextUser.Name}}">
+          <a class="ui blue basic button" href="{{.ContextUser.HomeLink}}">
             {{.i18n.Tr "home.view_home" (.ContextUser.ShortName 10)}}
           </a>
         </div>