Merge branch 'dev' of https://github.com/ewhal/nyaa into dev

router/templateFunctions.go

@@ -47,13 +47,13 @@ var FuncMap = template.FuncMap{
 				order = false //Default to descending when sorting by something new
 			}
 		}
-		currentUrl.Path = "/search"
 		values.Set("sort", sortBy)
 		values.Set("order", strconv.FormatBool(order))
 
-		currentUrl.RawQuery = values.Encode()
+		url, _ := Router.Get("search").URL()
+		url.RawQuery = values.Encode()
 
-		return template.URL(currentUrl.String())
+		return template.URL(url.String())
 	},
 	"genNav": func(nav Navigation, currentUrl *url.URL, pagesSelectable int) template.HTML {
 		var ret = ""

templates/home.html

@@ -17,9 +17,9 @@
                 <a href="{{ genSearchWithOrdering .URL "1" }}">{{T "name"}}</a>
               </th>
               <th class="col-xs-1 hidden-xs">
-                <a href="{{ genSearchWithOrdering .URL "4" }}">{{T "S"}}</a> / 
-                <a href="{{ genSearchWithOrdering .URL "4" }}">{{T "L"}}</a> / 
-                <a href="{{ genSearchWithOrdering .URL "3" }}">{{T "D"}}</a>
+                <a href="{{ genSearchWithOrdering .URL "5" }}">{{T "S"}}</a> / 
+                <a href="{{ genSearchWithOrdering .URL "6" }}">{{T "L"}}</a> / 
+                <a href="{{ genSearchWithOrdering .URL "7" }}">{{T "D"}}</a>
               </th>
               <th class="col-xs-1 hidden-xs"><a href="{{ genSearchWithOrdering .URL "2" }}">{{T "date"}}</th></a>
               <th class="col-xs-1 hidden-xs"><a href="{{ genSearchWithOrdering .URL "4" }}">{{T "size"}}</a></th>