From 0055cbd3651ebde0f8b6cc70c9c44de56dc38830 Mon Sep 17 00:00:00 2001
From: Martin van Beurden <chadoe@gmail.com>
Date: Sun, 14 Sep 2014 19:35:22 +0200
Subject: Allow Gogs to run from a suburl behind a reverse proxy. e.g.
 http://mydomain.com/gogs/

Conflicts:
	modules/setting/setting.go

Conflicts:
	templates/repo/release/list.tmpl
	templates/user/dashboard/dashboard.tmpl

Conflicts:
	routers/repo/setting.go
---
 templates/user/settings/delete.tmpl   |  2 +-
 templates/user/settings/nav.tmpl      | 10 +++++-----
 templates/user/settings/password.tmpl |  2 +-
 templates/user/settings/profile.tmpl  |  2 +-
 templates/user/settings/social.tmpl   |  2 +-
 templates/user/settings/sshkeys.tmpl  |  4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'templates/user/settings')

diff --git a/templates/user/settings/delete.tmpl b/templates/user/settings/delete.tmpl
index 9bfc287d..78574ba1 100644
--- a/templates/user/settings/delete.tmpl
+++ b/templates/user/settings/delete.tmpl
@@ -11,7 +11,7 @@
                         <p class="panel-header"><strong>{{.i18n.Tr "settings.delete_account"}}</strong></p>
                         <div class="panel-body panel-content">
                             <span class="alert alert-red alert-radius block"><i class="octicon octicon-alert"></i>{{.i18n.Tr "settings.delete_prompt" | Str2html}}</span>
-                            <form  action="/user/settings/delete" method="post">
+                            <form  action="{{AppRootSubUrl}}/user/settings/delete" method="post">
                                 {{.CsrfTokenHtml}}
                                 <p class="field">
                                     <span class="form-label"></span>
diff --git a/templates/user/settings/nav.tmpl b/templates/user/settings/nav.tmpl
index d6d20dee..52fc83e1 100644
--- a/templates/user/settings/nav.tmpl
+++ b/templates/user/settings/nav.tmpl
@@ -2,11 +2,11 @@
     <p class="panel-header"><strong>{{.i18n.Tr "settings"}}</strong></p>
     <div class="panel-body">
         <ul class="menu menu-vertical switching-list grid-1-5 left">
-            <li {{if .PageIsSettingsProfile}}class="current"{{end}}><a href="/user/settings">{{.i18n.Tr "settings.profile"}}</a></li>
-            <li {{if .PageIsSettingsPassword}}class="current"{{end}}><a href="/user/settings/password">{{.i18n.Tr "settings.password"}}</a></li>
-            <li {{if .PageIsSettingsSSHKeys}}class="current"{{end}}><a href="/user/settings/ssh">{{.i18n.Tr "settings.ssh_keys"}}</a></li>
-            <li {{if .PageIsSettingsSocial}}class="current"{{end}}><a href="/user/settings/social">{{.i18n.Tr "settings.social"}}</a></li>
-            <li {{if .PageIsSettingsDelete}}class="current"{{end}}><a href="/user/settings/delete">{{.i18n.Tr "settings.delete"}}</a></li>
+            <li {{if .PageIsSettingsProfile}}class="current"{{end}}><a href="{{AppRootSubUrl}}/user/settings">{{.i18n.Tr "settings.profile"}}</a></li>
+            <li {{if .PageIsSettingsPassword}}class="current"{{end}}><a href="{{AppRootSubUrl}}/user/settings/password">{{.i18n.Tr "settings.password"}}</a></li>
+            <li {{if .PageIsSettingsSSHKeys}}class="current"{{end}}><a href="{{AppRootSubUrl}}/user/settings/ssh">{{.i18n.Tr "settings.ssh_keys"}}</a></li>
+            <li {{if .PageIsSettingsSocial}}class="current"{{end}}><a href="{{AppRootSubUrl}}/user/settings/social">{{.i18n.Tr "settings.social"}}</a></li>
+            <li {{if .PageIsSettingsDelete}}class="current"{{end}}><a href="{{AppRootSubUrl}}/user/settings/delete">{{.i18n.Tr "settings.delete"}}</a></li>
         </ul>
     </div>
 </div>
\ No newline at end of file
diff --git a/templates/user/settings/password.tmpl b/templates/user/settings/password.tmpl
index 44e087af..ccafd3ed 100644
--- a/templates/user/settings/password.tmpl
+++ b/templates/user/settings/password.tmpl
@@ -9,7 +9,7 @@
                 <div id="setting-content">
                     <div id="user-profile-setting-content" class="panel panel-radius">
                         <p class="panel-header"><strong>{{.i18n.Tr "settings.change_password"}}</strong></p>
-                        <form class="form form-align panel-body" id="user-profile-form" action="/user/settings/password" method="post">
+                        <form class="form form-align panel-body" id="user-profile-form" action="{{AppRootSubUrl}}/user/settings/password" method="post">
                             {{.CsrfTokenHtml}}
                             <p class="field">
                                 <label class="req" for="old-password">{{.i18n.Tr "settings.old_password"}}</label>
diff --git a/templates/user/settings/profile.tmpl b/templates/user/settings/profile.tmpl
index 663d8bdb..e344fb9a 100644
--- a/templates/user/settings/profile.tmpl
+++ b/templates/user/settings/profile.tmpl
@@ -11,7 +11,7 @@
                         <div class="panel-header">
                             <strong>{{.i18n.Tr "settings.public_profile"}}</strong>
                         </div>
-                        <form class="form form-align panel-body" id="user-profile-form" action="/user/settings" method="post">
+                        <form class="form form-align panel-body" id="user-profile-form" action="{{AppRootSubUrl}}/user/settings" method="post">
                             {{.CsrfTokenHtml}}
                         	<div class="text-center panel-desc">{{.i18n.Tr "settings.profile_desc"}}</div>
                             <div class="field">
diff --git a/templates/user/settings/social.tmpl b/templates/user/settings/social.tmpl
index bcbc1fc5..a2585922 100644
--- a/templates/user/settings/social.tmpl
+++ b/templates/user/settings/social.tmpl
@@ -20,7 +20,7 @@
                                     <p class="print">{{.Identity}}</p>
                                     <p class="activity"><i>{{$.i18n.Tr "settings.add_on"}} {{DateFormat .Created "M d, Y"}} —  <i class="octicon octicon-info"></i>{{$.i18n.Tr "settings.last_used"}} {{DateFormat .Updated "M d, Y"}}</i></p>
                                 </div>
-                                <a class="right btn btn-small btn-red btn-header btn-radius" href="/user/settings/social?remove={{.Id}}">{{$.i18n.Tr "settings.unbind"}}</a>
+                                <a class="right btn btn-small btn-red btn-header btn-radius" href="{{AppRootSubUrl}}/user/settings/social?remove={{.Id}}">{{$.i18n.Tr "settings.unbind"}}</a>
                             </li>
                             {{end}}
                         </ul>
diff --git a/templates/user/settings/sshkeys.tmpl b/templates/user/settings/sshkeys.tmpl
index 3db0f54b..2d186121 100644
--- a/templates/user/settings/sshkeys.tmpl
+++ b/templates/user/settings/sshkeys.tmpl
@@ -23,7 +23,7 @@
                                     <p class="print">{{.Fingerprint}}</p>
                                     <p class="activity"><i>{{$.i18n.Tr "settings.add_on"}} {{DateFormat .Created "M d, Y"}} —  <i class="octicon octicon-info"></i>{{if .HasUsed}}{{$.i18n.Tr "settings.last_used"}} {{DateFormat .Updated "M d, Y"}}{{else}}{{$.i18n.Tr "settings.no_activity"}}{{end}}</i></p>
                                 </div>
-                                <form action="/user/settings/ssh" method="post">
+                                <form action="{{AppRootSubUrl}}/user/settings/ssh" method="post">
                                     {{$.CsrfTokenHtml}}
                                     <input name="_method" type="hidden" value="DELETE">
                                     <input name="id" type="hidden" value="{{.Id}}">
@@ -35,7 +35,7 @@
                     </div>
                     <p>{{.i18n.Tr "settings.ssh_helper" | Str2html}}</p>
                     <br>
-                    <form class="panel panel-radius form form-align hide" id="user-ssh-add-form" action="/user/settings/ssh" method="post">
+                    <form class="panel panel-radius form form-align hide" id="user-ssh-add-form" action="{{AppRootSubUrl}}/user/settings/ssh" method="post">
                         {{.CsrfTokenHtml}}
                         <p class="panel-header"><strong>{{.i18n.Tr "settings.add_new_key"}}</strong></p>
                         <div class="panel-body">
-- 
cgit v1.2.3