atcoder
diff --git a/‎modules/testrunner/app/views/TestRunner/Index.html
Copy file name to clipboardExpand all lines: modules/testrunner/app/views/TestRunner/Index.html
+3-3Lines changed: 3 additions & 3 deletions b/‎modules/testrunner/app/views/TestRunner/Index.html
Copy file name to clipboardExpand all lines: modules/testrunner/app/views/TestRunner/Index.html
+3-3Lines changed: 3 additions & 3 deletions
diff --git a/‎revel.go
Copy file name to clipboardExpand all lines: revel.go
+2Lines changed: 2 additions & 0 deletions b/‎revel.go
Copy file name to clipboardExpand all lines: revel.go
+2Lines changed: 2 additions & 0 deletions
diff --git a/‎router.go
Copy file name to clipboardExpand all lines: router.go
+5-1Lines changed: 5 additions & 1 deletion b/‎router.go
Copy file name to clipboardExpand all lines: router.go
+5-1Lines changed: 5 additions & 1 deletion
diff --git a/‎template.go
Copy file name to clipboardExpand all lines: template.go
+5-2Lines changed: 5 additions & 2 deletions b/‎template.go
Copy file name to clipboardExpand all lines: template.go
+5-2Lines changed: 5 additions & 2 deletions
@@ -3,8 +3,8 @@
 	<head>
 		<title>Revel Test Runner</title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-		<link href="/@tests/public/css/bootstrap.css" type="text/css" rel="stylesheet"></link>
-		<script src="/@tests/public/js/jquery-1.9.1.min.js" type="text/javascript"></script>
+		<link href="{{url `Root`}}/@tests/public/css/bootstrap.css" type="text/css" rel="stylesheet"></link>
+		<script src="{{url `Root`}}/@tests/public/js/jquery-1.9.1.min.js" type="text/javascript"></script>
 		<style>
 		header { padding:20px 0; background-color:#ADD8E6 }
 		.passed td { background-color: #90EE90 !important; }
@@ -62,7 +62,7 @@ <h1>Test Runner</h1>
 	var resultCell = row.children(".result");
 	$.ajax({
 		dataType: "json",
-		url: "/@tests/"+suite+"/"+test,
+		url: "{{url `Root`}}/@tests/"+suite+"/"+test,
 		async: false,
 		success: function(result) {
 			row.attr("class", result.Passed ? "passed" : "failed");
 
@@ -30,6 +30,7 @@ func (r *revelLogs) Write(p []byte) (n int, err error) {
 var (
 	// App details
 	AppName    string // e.g. "sample"
+	AppRoot    string // e.g. "/app1"
 	BasePath   string // e.g. "/Users/robfig/gocode/src/corp/sample"
 	AppPath    string // e.g. "/Users/robfig/gocode/src/corp/sample/app"
 	ViewsPath  string // e.g. "/Users/robfig/gocode/src/corp/sample/app/views"
@@ -178,6 +179,7 @@ func Init(mode, importPath, srcPath string) {
 	}
 
 	AppName = Config.StringDefault("app.name", "(not set)")
+	AppRoot = Config.StringDefault("app.root", "")
 	CookiePrefix = Config.StringDefault("cookie.prefix", "REVEL")
 	CookieHttpOnly = Config.BoolDefault("cookie.httponly", false)
 	CookieSecure = Config.BoolDefault("cookie.secure", false)
 
@@ -205,7 +205,11 @@ func parseRoutes(routesPath, joinedPath, content string, validate bool) ([]*Rout
 		if strings.HasSuffix(joinedPath, "/") && strings.HasPrefix(path, "/") {
 			joinedPath = joinedPath[0 : len(joinedPath)-1]
 		}
-		path = strings.Join([]string{joinedPath, path}, "")
+		if AppRoot == "" {
+			path = strings.Join([]string{joinedPath, path}, "")
+		} else {
+			path = strings.Join([]string{AppRoot, joinedPath, path}, "")
+		}
 
 		// This will import the module routes under the path described in the
 		// routes file (joinedPath param). e.g. "* /jobs module:jobs" -> all
 
@@ -391,13 +391,16 @@ func (gotmpl GoTemplate) Content() []string {
 
 // Return a url capable of invoking a given controller method:
 // "Application.ShowApp 123" => "/app/123"
-func ReverseUrl(args ...interface{}) (string, error) {
+func ReverseUrl(args ...interface{}) (template.URL, error) {
 	if len(args) == 0 {
 		return "", fmt.Errorf("no arguments provided to reverse route")
 	}
 
 	action := args[0].(string)
 	actionSplit := strings.Split(action, ".")
+	if len(actionSplit) == 1 && actionSplit[0] == "Root" {
+		return template.URL(AppRoot), nil
+	}
 	if len(actionSplit) != 2 {
 		return "", fmt.Errorf("reversing '%s', expected 'Controller.Action'", action)
 	}
@@ -414,7 +417,7 @@ func ReverseUrl(args ...interface{}) (string, error) {
 		Unbind(argsByName, c.MethodType.Args[i].Name, argValue)
 	}
 
-	return MainRouter.Reverse(args[0].(string), argsByName).Url, nil
+	return template.URL(MainRouter.Reverse(args[0].(string), argsByName).Url), nil
 }
 
 func Slug(text string) string {
Original file line number	Diff line number	Diff line change
`@@ -391,13 +391,16 @@ func (gotmpl GoTemplate) Content() []string {`
`391`	`391`
`392`	`392`	`// Return a url capable of invoking a given controller method:`
`393`	`393`	`// "Application.ShowApp 123" => "/app/123"`
`394`		`-func ReverseUrl(args ...interface{}) (string, error) {`
	`394`	`+func ReverseUrl(args ...interface{}) (template.URL, error) {`
`395`	`395`	`if len(args) == 0 {`
`396`	`396`	`return "", fmt.Errorf("no arguments provided to reverse route")`
`397`	`397`	`}`
`398`	`398`
`399`	`399`	`action := args[0].(string)`
`400`	`400`	`actionSplit := strings.Split(action, ".")`
	`401`	`+ if len(actionSplit) == 1 && actionSplit[0] == "Root" {`
	`402`	`+ return template.URL(AppRoot), nil`
	`403`	`+ }`
`401`	`404`	`if len(actionSplit) != 2 {`
`402`	`405`	`return "", fmt.Errorf("reversing '%s', expected 'Controller.Action'", action)`
`403`	`406`	`}`
`@@ -414,7 +417,7 @@ func ReverseUrl(args ...interface{}) (string, error) {`
`414`	`417`	`Unbind(argsByName, c.MethodType.Args[i].Name, argValue)`
`415`	`418`	`}`
`416`	`419`
`417`		`- return MainRouter.Reverse(args[0].(string), argsByName).Url, nil`
	`420`	`+ return template.URL(MainRouter.Reverse(args[0].(string), argsByName).Url), nil`
`418`	`421`	`}`
`419`	`422`
`420`	`423`	`func Slug(text string) string {`