Merge branch 'master' of git://github.com/sazuna/nyaa into sazuna-master

main.go

@@ -1,14 +1,13 @@
 package main
 
 import (
-"bufio"
+	"bufio"
-	"fmt"
 	"flag"
+	"fmt"
 
-	"github.com/ewhal/nyaa/util/log"
-	"github.com/ewhal/nyaa/router"
 	"github.com/ewhal/nyaa/config"
-
+	"github.com/ewhal/nyaa/router"
+	"github.com/ewhal/nyaa/util/log"
 
 	"net/http"
 	"os"
@@ -16,7 +15,6 @@ import (
 )
 
 func RunServer(conf *config.Config) {
-
 	http.Handle("/", router.Router)
 
 	// Set up server,

templates/index.html

@@ -41,7 +41,8 @@
               <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
                   <ul class="nav navbar-nav">
                       <li><a href="https://sukebei.pantsu.cat">Fap</a></li>
-                      <li><a href="{{.URL.Parse "/faq"}}">FAQ</a></li>
+                      <li><a href="{{.URL.Parse "/feed"}}?c={{.Search.Category}}&q={{.Search.Query}}&s={{.Search.Status}}">RSS</a></li>
+                      <li><a href="{{.URL.Parse "/faq"}}">FAQ</a></li>                      
                       <li><a href="irc://irc.rizon.net/nyaapantsu">IRC</a></li>
                       <li><a href="{{ genRouteWithQuery "feed" .URL }}">Feed RSS</a></li>
                   </ul>