diff --git a/config/trackers.go b/config/trackers.go index ed0eed33..a3c74e62 100644 --- a/config/trackers.go +++ b/config/trackers.go @@ -1,5 +1,5 @@ package config const ( - Trackers = "&tr=udp://zer0day.to:1337/announce&tr=udp://tracker.leechers-paradise.org:6969&tr=udp://explodie.org:6969&tr=udp://tracker.opentrackr.org:1337&tr=udp://tracker.coppersurfer.tk:6969&tr=http://tracker.baka-sub.cf/announce" -) \ No newline at end of file + Trackers = "&tr=udp://tracker.coppersurfer.tk:6969&tr=udp://zer0day.to:1337/announce&tr=udp://tracker.leechers-paradise.org:6969&tr=udp://explodie.org:6969&tr=udp://tracker.opentrackr.org:1337&tr=http://tracker.baka-sub.cf/announce" +) diff --git a/css/style.css b/css/style.css index 5dd91a5c..9afeb256 100644 --- a/css/style.css +++ b/css/style.css @@ -9,7 +9,6 @@ background-color: #81d3fa; } - /* modified copy of NyaaTorrent theme */ nav#mainmenu { background: #263238; @@ -72,11 +71,16 @@ a { white-space: nowrap; } +/* Styling/fixes for the table: */ .table > tbody > tr > td { /* fix bootstrap uglyness */ vertical-align: middle; } +.custom-table-hover > tbody > tr:hover { + opacity: 0.82; +} + div.container div.blockBody:nth-of-type(2) table{table-layout:fixed;} div.container div.blockBody:nth-of-type(2) table tr:first-of-type th:first-of-type, div.container div.blockBody:nth-of-type(2) table tr:first-of-type th:nth-of-type(5){width:10%;} div.container div.blockBody:nth-of-type(2) table tr:first-of-type th:nth-of-type(3){width:15%;} diff --git a/main.go b/main.go index 0abed484..c9843886 100644 --- a/main.go +++ b/main.go @@ -108,6 +108,7 @@ func searchHandler(w http.ResponseWriter, r *http.Request) { search_param.Category, search_param.Sort, search_param.Order, + false, } htv := HomeTemplateVariables{b, torrentService.GetAllCategories(false), searchForm, navigationTorrents, r.URL, mux.CurrentRoute(r)} @@ -180,7 +181,10 @@ func searchByQuery(r *http.Request, pagenum int) (SearchParam, []model.Torrents, func faqHandler(w http.ResponseWriter, r *http.Request) { var templates = template.Must(template.New("FAQ").Funcs(funcMap).ParseFiles("templates/index.html", "templates/FAQ.html")) templates.ParseGlob("templates/_*.html") // common - err := templates.ExecuteTemplate(w, "index.html", FaqTemplateVariables{Navigation{}, NewSearchForm(), r.URL, mux.CurrentRoute(r)}) + + searchForm := NewSearchForm() + searchForm.HideAdvancedSearch = true + err := templates.ExecuteTemplate(w, "index.html", FaqTemplateVariables{Navigation{}, searchForm, r.URL, mux.CurrentRoute(r)}) if err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) } @@ -206,8 +210,7 @@ func rssHandler(w http.ResponseWriter, r *http.Request) { timestamp_as_time := time.Unix(torrents[0].Date, 0) torrent_json := torrents[i].ToJson() feed.Items[i] = &feeds.Item{ - // need a torrent view first - //Id: URL + torrents[i].Hash, + Id: "https://nyaa.pantsu.cat/view/" + strconv.Itoa(torrents[i].Id), Title: torrents[i].Name, Link: &feeds.Link{Href: string(torrent_json.Magnet)}, Description: "", diff --git a/templateVariables.go b/templateVariables.go index 637009be..216268eb 100644 --- a/templateVariables.go +++ b/templateVariables.go @@ -53,6 +53,7 @@ type SearchForm struct { Category string Sort string Order string + HideAdvancedSearch bool } // Some Default Values to ease things out @@ -74,4 +75,4 @@ func NewSearchForm(params ...string) SearchForm { searchForm.Order = "DESC" } return searchForm -} \ No newline at end of file +} diff --git a/templates/_search.html b/templates/_search.html index 75246c95..69ca25af 100644 --- a/templates/_search.html +++ b/templates/_search.html @@ -43,7 +43,7 @@ - diff --git a/templates/home.html b/templates/home.html index a64d064c..eec8478a 100644 --- a/templates/home.html +++ b/templates/home.html @@ -8,7 +8,7 @@
- +
@@ -34,7 +34,7 @@
Category Name{{.Date}} {{.Filesize}} - +