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/admin/auth/edit.tmpl |  2 +-
 templates/admin/auth/list.tmpl | 10 +++++-----
 templates/admin/auth/new.tmpl  |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'templates/admin/auth')

diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl
index 400a4ceb..4dead7f0 100644
--- a/templates/admin/auth/edit.tmpl
+++ b/templates/admin/auth/edit.tmpl
@@ -12,7 +12,7 @@
                             <div class="panel-header">
                                 <strong>{{.i18n.Tr "admin.auths.edit"}}</strong>
                             </div>
-                            <form class="form form-align panel-body" id="auth-setting-form" action="/admin/auths/{{.Source.Id}}" data-delete-url="/admin/auths/{{.Source.Id}}/delete" method="post">
+                            <form class="form form-align panel-body" id="auth-setting-form" action="{{AppRootSubUrl}}/admin/auths/{{.Source.Id}}" data-delete-url="/admin/auths/{{.Source.Id}}/delete" method="post">
                                 {{.CsrfTokenHtml}}
                                 <input type="hidden" value="{{.Source.Id}}" name="id"/>
                                 {{$type := .Source.Type}}
diff --git a/templates/admin/auth/list.tmpl b/templates/admin/auth/list.tmpl
index 591d2ed4..ba10e1d2 100644
--- a/templates/admin/auth/list.tmpl
+++ b/templates/admin/auth/list.tmpl
@@ -13,7 +13,7 @@
                                 <strong>{{.i18n.Tr "admin.auths.auth_manage_panel"}}</strong>
                             </div>
                             <div class="panel-body admin-panel">
-								<a class="btn-blue btn-medium btn-link btn-radius" href="/admin/auths/new">{{.i18n.Tr "admin.auths.new"}}</a>
+								<a class="btn-blue btn-medium btn-link btn-radius" href="{{AppRootSubUrl}}/admin/auths/new">{{.i18n.Tr "admin.auths.new"}}</a>
                                 <div class="admin-table">
 					                <table class="table table-striped">
 					                    <thead>
@@ -31,20 +31,20 @@
 					                        {{range .Sources}}
 					                        <tr>
 					                            <td>{{.Id}}</td>
-					                            <td><a href="/admin/auths/{{.Id}}">{{.Name}}</a></td>
+					                            <td><a href="{{AppRootSubUrl}}/admin/auths/{{.Id}}">{{.Name}}</a></td>
 					                            <td>{{.TypeString}}</td>
 					                            <td><i class="fa fa{{if .IsActived}}-check{{end}}-square-o"></i></td>
 					                            <td>{{DateFormat .Updated "M d, Y"}}</td>
 					                            <td>{{DateFormat .Created "M d, Y"}}</td>
-					                            <td><a href="/admin/auths/{{.Id}}"><i class="fa fa-pencil-square-o"></i></a></td>
+					                            <td><a href="{{AppRootSubUrl}}/admin/auths/{{.Id}}"><i class="fa fa-pencil-square-o"></i></a></td>
 					                        </tr>
 					                        {{end}}
 					                    </tbody>
 					                </table>
 					                {{if or .LastPageNum .NextPageNum}}
 					                <ul class="pagination">
-					                    {{if .LastPageNum}}<li><a class="btn btn-medium btn-gray btn-radius" href="/admin/auths?p={{.LastPageNum}}">&laquo; Prev.</a></li>{{end}}
-					                    {{if .NextPageNum}}<li><a class="btn btn-medium btn-gray btn-radius" href="/admin/auths?p={{.NextPageNum}}">&raquo; Next</a></li>{{end}}
+					                    {{if .LastPageNum}}<li><a class="btn btn-medium btn-gray btn-radius" href="{{AppRootSubUrl}}/admin/auths?p={{.LastPageNum}}">&laquo; Prev.</a></li>{{end}}
+					                    {{if .NextPageNum}}<li><a class="btn btn-medium btn-gray btn-radius" href="{{AppRootSubUrl}}/admin/auths?p={{.NextPageNum}}">&raquo; Next</a></li>{{end}}
 					                </ul>
 					                {{end}}
 				                </div>
diff --git a/templates/admin/auth/new.tmpl b/templates/admin/auth/new.tmpl
index 8f9f5ccc..869eff32 100644
--- a/templates/admin/auth/new.tmpl
+++ b/templates/admin/auth/new.tmpl
@@ -12,7 +12,7 @@
                             <div class="panel-header">
                                 <strong>{{.i18n.Tr "admin.auths.new"}}</strong>
                             </div>
-                            <form class="form form-align panel-body" id="repo-setting-form" action="/admin/auths/new" method="post">
+                            <form class="form form-align panel-body" id="repo-setting-form" action="{{AppRootSubUrl}}/admin/auths/new" method="post">
                                 {{.CsrfTokenHtml}}
                                 <div class="field">
                                     <label class="req">{{.i18n.Tr "admin.auths.auth_type"}}</label>
-- 
cgit v1.2.3