From cf25efb4d9202573b5b8eeb8ff56df9568b4c331 Mon Sep 17 00:00:00 2001 From: Diego Agulló Date: Fri, 14 Dec 2018 09:54:25 +0100 Subject: Allow to switch between unread only and all entries on category/feed views --- locale/translations.go | 28 +++++++++++---- locale/translations/de_DE.json | 2 ++ locale/translations/en_US.json | 2 ++ locale/translations/fr_FR.json | 2 ++ locale/translations/nl_NL.json | 2 ++ locale/translations/pl_PL.json | 2 ++ locale/translations/ru_RU.json | 2 ++ locale/translations/zh_CN.json | 2 ++ template/html/category_entries.html | 13 +++++-- template/html/feed_entries.html | 9 +++++ template/views.go | 26 +++++++++++--- ui/category_entries.go | 3 +- ui/category_entries_all.go | 72 +++++++++++++++++++++++++++++++++++++ ui/feed_entries.go | 3 +- ui/feed_entries_all.go | 72 +++++++++++++++++++++++++++++++++++++ ui/ui.go | 2 ++ 16 files changed, 227 insertions(+), 15 deletions(-) create mode 100644 ui/category_entries_all.go create mode 100644 ui/feed_entries_all.go diff --git a/locale/translations.go b/locale/translations.go index 2a81c56..f830d6d 100644 --- a/locale/translations.go +++ b/locale/translations.go @@ -39,6 +39,8 @@ var translations = map[string]string{ "menu.mark_page_as_read": "Diese Seite als gelesen markieren", "menu.mark_all_as_read": "Alle als gelesen markieren", "menu.mark_all_as_read_wip": "In Arbeit...", + "menu.show_all_entries": "Zeige alle Artikel", + "menu.show_only_unread_entries": "Nur ungelesene Artikel anzeigen", "menu.refresh_feed": "Aktualisieren", "menu.refresh_all_feeds": "Alle Abonnements im Hintergrund aktualisieren", "menu.edit_feed": "Bearbeiten", @@ -330,6 +332,8 @@ var translations = map[string]string{ "menu.mark_page_as_read": "Mark this page as read", "menu.mark_all_as_read": "Mark all as read", "menu.mark_all_as_read_wip": "Operation in progress...", + "menu.show_all_entries": "Show all entries", + "menu.show_only_unread_entries": "Show only unread entries", "menu.refresh_feed": "Refresh", "menu.refresh_all_feeds": "Refresh all feeds in the background", "menu.edit_feed": "Edit", @@ -601,6 +605,8 @@ var translations = map[string]string{ "menu.mark_page_as_read": "Marquer cette page comme lu", "menu.mark_all_as_read": "Tout marquer comme lu", "menu.mark_all_as_read_wip": "Opération en cours...", + "menu.show_all_entries": "Afficher tous les articles", + "menu.show_only_unread_entries": "Afficher uniquement les articles non lus", "menu.refresh_feed": "Actualiser", "menu.refresh_all_feeds": "Actualiser les abonnements en arrière-plan", "menu.edit_feed": "Modifier", @@ -892,6 +898,8 @@ var translations = map[string]string{ "menu.mark_page_as_read": "Markeer deze pagina als gelezen", "menu.mark_all_as_read": "Markeer alle items als gelezen", "menu.mark_all_as_read_wip": "Bezig...", + "menu.show_all_entries": "Toon alle artikelen", + "menu.show_only_unread_entries": "Toon alleen ongelezen artikelen", "menu.refresh_feed": "Vernieuwen", "menu.refresh_all_feeds": "Vernieuw alle feeds in de achtergrond", "menu.edit_feed": "Bewerken", @@ -1181,6 +1189,8 @@ var translations = map[string]string{ "menu.mark_page_as_read": "Oznacz jako przeczytane", "menu.mark_all_as_read": "Oznacz wszystko jako przeczytane", "menu.mark_all_as_read_wip": "W toku...", + "menu.show_all_entries": "Pokaż wszystkie artykuły", + "menu.show_only_unread_entries": "Pokaż tylko nieprzeczytane artykuły", "menu.refresh_feed": "Odśwież", "menu.refresh_all_feeds": "Odśwież wszystkie subskrypcje w tle", "menu.edit_feed": "Edytuj", @@ -1478,6 +1488,8 @@ var translations = map[string]string{ "menu.mark_page_as_read": "Отметить эту страницу прочитанной", "menu.mark_all_as_read": "Отметить всё как прочитанное", "menu.mark_all_as_read_wip": "В процессе…", + "menu.show_all_entries": "Показать все статьи", + "menu.show_only_unread_entries": "Показывать только непрочитанные статьи", "menu.refresh_feed": "Обновить", "menu.refresh_all_feeds": "Обновить все подписки в фоне", "menu.edit_feed": "Изменить", @@ -1757,6 +1769,8 @@ var translations = map[string]string{ "menu.mark_page_as_read": "标记为已读", "menu.mark_all_as_read": "全部标为已读", "menu.mark_all_as_read_wip": "执行中…", + "menu.show_all_entries": "显示所有条目", + "menu.show_only_unread_entries": "仅显示未读文章", "menu.refresh_feed": "更新", "menu.refresh_all_feeds": "在后台更新全部源", "menu.edit_feed": "编辑", @@ -2005,11 +2019,11 @@ var translations = map[string]string{ } var translationsChecksums = map[string]string{ - "de_DE": "51ddd870cc5c228f2cc92f32797f805a5ca62baa5be95c037ba78eb41e69c490", - "en_US": "1e8dc7b4b620593c76f59b04d2bfc5dd2da092d3505b74a50ba93d907910c221", - "fr_FR": "687d1c0147eb3925911d48972b39c94a4accf2e03e7327fe99ae05e0b5f11a9f", - "nl_NL": "08513979f3194bb1df3207f14ea7adf81cc4a62abec347a9dacbc201ce6846f0", - "pl_PL": "7c445e94570e42c08268153ba63b297874e22da519eb161551fdf56957627a17", - "ru_RU": "03aef503278965e7dbc2f2d9b34d32d50c4e75c2834bd8814bbdd6c261450385", - "zh_CN": "7da39bcd94fa3c7a3bbada384fb8d09e5a46879849b31bae0c4b76d78c11facd", + "de_DE": "8c8e9f2689d2f548f72ddc7baaff11f8654fbe34d8f8f2e74adada6b9e8197ef", + "en_US": "28b26945e8b0a5231e0e1faf475775a6e61e8d551de13a81eb33441e8d0dc78c", + "fr_FR": "f492529a9f2860dbf85275fe80355546e735c2ef067de93b697b14be5a70d96a", + "nl_NL": "7e711f9100f3935ace0dcbb76d740248da9ab6e6e81b0a985db042947160f915", + "pl_PL": "ab6acff9d61748cd1f2d815d5580fa4c02aa52fb9c937220d1b569715cf09f51", + "ru_RU": "2d07221418c6188656730eb41af7944f2b347622381835ba08d04ca074283674", + "zh_CN": "f7a036f9d51aaaf108921e6ca636fa19d16adf1347dadc40044ff3e58ea0c308", } diff --git a/locale/translations/de_DE.json b/locale/translations/de_DE.json index 344ee7e..21aa2c5 100644 --- a/locale/translations/de_DE.json +++ b/locale/translations/de_DE.json @@ -34,6 +34,8 @@ "menu.mark_page_as_read": "Diese Seite als gelesen markieren", "menu.mark_all_as_read": "Alle als gelesen markieren", "menu.mark_all_as_read_wip": "In Arbeit...", + "menu.show_all_entries": "Zeige alle Artikel", + "menu.show_only_unread_entries": "Nur ungelesene Artikel anzeigen", "menu.refresh_feed": "Aktualisieren", "menu.refresh_all_feeds": "Alle Abonnements im Hintergrund aktualisieren", "menu.edit_feed": "Bearbeiten", diff --git a/locale/translations/en_US.json b/locale/translations/en_US.json index 0db723f..c33a376 100644 --- a/locale/translations/en_US.json +++ b/locale/translations/en_US.json @@ -34,6 +34,8 @@ "menu.mark_page_as_read": "Mark this page as read", "menu.mark_all_as_read": "Mark all as read", "menu.mark_all_as_read_wip": "Operation in progress...", + "menu.show_all_entries": "Show all entries", + "menu.show_only_unread_entries": "Show only unread entries", "menu.refresh_feed": "Refresh", "menu.refresh_all_feeds": "Refresh all feeds in the background", "menu.edit_feed": "Edit", diff --git a/locale/translations/fr_FR.json b/locale/translations/fr_FR.json index 1aeaeeb..12ba515 100644 --- a/locale/translations/fr_FR.json +++ b/locale/translations/fr_FR.json @@ -34,6 +34,8 @@ "menu.mark_page_as_read": "Marquer cette page comme lu", "menu.mark_all_as_read": "Tout marquer comme lu", "menu.mark_all_as_read_wip": "Opération en cours...", + "menu.show_all_entries": "Afficher tous les articles", + "menu.show_only_unread_entries": "Afficher uniquement les articles non lus", "menu.refresh_feed": "Actualiser", "menu.refresh_all_feeds": "Actualiser les abonnements en arrière-plan", "menu.edit_feed": "Modifier", diff --git a/locale/translations/nl_NL.json b/locale/translations/nl_NL.json index fde071b..d538d94 100644 --- a/locale/translations/nl_NL.json +++ b/locale/translations/nl_NL.json @@ -34,6 +34,8 @@ "menu.mark_page_as_read": "Markeer deze pagina als gelezen", "menu.mark_all_as_read": "Markeer alle items als gelezen", "menu.mark_all_as_read_wip": "Bezig...", + "menu.show_all_entries": "Toon alle artikelen", + "menu.show_only_unread_entries": "Toon alleen ongelezen artikelen", "menu.refresh_feed": "Vernieuwen", "menu.refresh_all_feeds": "Vernieuw alle feeds in de achtergrond", "menu.edit_feed": "Bewerken", diff --git a/locale/translations/pl_PL.json b/locale/translations/pl_PL.json index 3a3e0f6..d4873fa 100644 --- a/locale/translations/pl_PL.json +++ b/locale/translations/pl_PL.json @@ -34,6 +34,8 @@ "menu.mark_page_as_read": "Oznacz jako przeczytane", "menu.mark_all_as_read": "Oznacz wszystko jako przeczytane", "menu.mark_all_as_read_wip": "W toku...", + "menu.show_all_entries": "Pokaż wszystkie artykuły", + "menu.show_only_unread_entries": "Pokaż tylko nieprzeczytane artykuły", "menu.refresh_feed": "Odśwież", "menu.refresh_all_feeds": "Odśwież wszystkie subskrypcje w tle", "menu.edit_feed": "Edytuj", diff --git a/locale/translations/ru_RU.json b/locale/translations/ru_RU.json index 60bd4ff..4dd17cf 100644 --- a/locale/translations/ru_RU.json +++ b/locale/translations/ru_RU.json @@ -34,6 +34,8 @@ "menu.mark_page_as_read": "Отметить эту страницу прочитанной", "menu.mark_all_as_read": "Отметить всё как прочитанное", "menu.mark_all_as_read_wip": "В процессе…", + "menu.show_all_entries": "Показать все статьи", + "menu.show_only_unread_entries": "Показывать только непрочитанные статьи", "menu.refresh_feed": "Обновить", "menu.refresh_all_feeds": "Обновить все подписки в фоне", "menu.edit_feed": "Изменить", diff --git a/locale/translations/zh_CN.json b/locale/translations/zh_CN.json index 269d1eb..22455bb 100644 --- a/locale/translations/zh_CN.json +++ b/locale/translations/zh_CN.json @@ -34,6 +34,8 @@ "menu.mark_page_as_read": "标记为已读", "menu.mark_all_as_read": "全部标为已读", "menu.mark_all_as_read_wip": "执行中…", + "menu.show_all_entries": "显示所有条目", + "menu.show_only_unread_entries": "仅显示未读文章", "menu.refresh_feed": "更新", "menu.refresh_all_feeds": "在后台更新全部源", "menu.edit_feed": "编辑", diff --git a/template/html/category_entries.html b/template/html/category_entries.html index 69e4f74..671634d 100644 --- a/template/html/category_entries.html +++ b/template/html/category_entries.html @@ -3,13 +3,22 @@ {{ define "content"}}

{{ .category.Title }} ({{ .total }})

- {{ if .entries }} {{ end }} + {{ if .showOnlyUnreadEntries }} +
  • + {{ t "menu.show_all_entries" }} +
    • + {{ else }} +
  • + {{ t "menu.show_only_unread_entries" }} +
    • + {{ end }} +
    {{ if not .entries }} diff --git a/template/html/feed_entries.html b/template/html/feed_entries.html index cdc435c..7e2f9c6 100644 --- a/template/html/feed_entries.html +++ b/template/html/feed_entries.html @@ -9,6 +9,15 @@ {{ t "menu.mark_page_as_read" }} {{ end }} + {{ if .showOnlyUnreadEntries }} +
  • + {{ t "menu.show_all_entries" }} +
    • + {{ else }} +
  • + {{ t "menu.show_only_unread_entries" }} +
    • + {{ end }}
  • {{ t "menu.refresh_feed" }}
    • diff --git a/template/views.go b/template/views.go index 76fab8a..ad6a92e 100644 --- a/template/views.go +++ b/template/views.go @@ -206,13 +206,22 @@ var templateViewsMap = map[string]string{ {{ define "content"}}

    {{ .category.Title }} ({{ .total }})

    - {{ if .entries }} {{ end }} + {{ if .showOnlyUnreadEntries }} +
  • + {{ t "menu.show_all_entries" }} +
    • + {{ else }} +
  • + {{ t "menu.show_only_unread_entries" }} +
    • + {{ end }} +
    {{ if not .entries }} @@ -692,6 +701,15 @@ var templateViewsMap = map[string]string{ {{ t "menu.mark_page_as_read" }} {{ end }} + {{ if .showOnlyUnreadEntries }} +
  • + {{ t "menu.show_all_entries" }} +
    • + {{ else }} +
  • + {{ t "menu.show_only_unread_entries" }} +
    • + {{ end }}
  • {{ t "menu.refresh_feed" }}
    • @@ -1385,7 +1403,7 @@ var templateViewsMapChecksums = map[string]string{ "add_subscription": "a0f1d2bc02b6adc83dbeae593f74d9b936102cd6dd73302cdbec2137cafdcdd9", "bookmark_entries": "609f4b2342152fe495a219a32f17a4528b01807d61f53cee0cbebf728be73c42", "categories": "642ee3cddbd825ee6ab5a77caa0d371096b55de0f1bd4ae3055b8c8a70507d8d", - "category_entries": "a803570ba91268646b2c55cffc8a3f2f162388a73bc007dd9ab61e144faa359b", + "category_entries": "07ff798025f8527de5351a89fd5fc51973c1ea6c56710b4f703cbae183fbcbb6", "choose_subscription": "33c04843d7c1b608d034e605e52681822fc6d79bc6b900c04915dd9ebae584e2", "create_category": "6b22b5ce51abf4e225e23a79f81be09a7fb90acb265e93a8faf9446dff74018d", "create_user": "1e940be3afefc0a5c6273bbadcddc1e29811e9548e5227ac2adfe697ca5ce081", @@ -1393,7 +1411,7 @@ var templateViewsMapChecksums = map[string]string{ "edit_feed": "ab30c31a4385a7b16c54baa78bdcb93a57181ed1c5018ce097d7eb50673bb995", "edit_user": "f4f99412ba771cfca2a2a42778b023b413c5494e9a287053ba8cf380c2865c5f", "entry": "2ea9fee1ae5513ef1abb5923221c2ef1212e26d3bb651da66069ce8a336cbb7c", - "feed_entries": "0f3d02d820475a3b0e165e10be2bf39fa5ab6a9dc5b0945c9ad886434e64e6ca", + "feed_entries": "632f0518acb19a2d2723ca4a45dfbe023d828355ebf2982b27558efe32017e81", "feeds": "31acc253c547a6cce5710d72a6f6b3b396162ecd5e5af295b2cf47c1ff55bd06", "history_entries": "b65ca1d85615caa7c314a33f1cb997aa3477a79e66b9894b2fd387271ad467d2", "import": "8349e47a783bb40d8e9248b4771656e5f006185e11079e1c4680dd52633420ed", diff --git a/ui/category_entries.go b/ui/category_entries.go index 19b17b9..998f207 100644 --- a/ui/category_entries.go +++ b/ui/category_entries.go @@ -39,7 +39,7 @@ func (h *handler) showCategoryEntriesPage(w http.ResponseWriter, r *http.Request builder.WithCategoryID(category.ID) builder.WithOrder(model.DefaultSortingOrder) builder.WithDirection(user.EntryDirection) - builder.WithoutStatus(model.EntryStatusRemoved) + builder.WithStatus(model.EntryStatusUnread) builder.WithOffset(offset) builder.WithLimit(nbItemsPerPage) @@ -66,6 +66,7 @@ func (h *handler) showCategoryEntriesPage(w http.ResponseWriter, r *http.Request view.Set("countUnread", h.store.CountUnreadEntries(user.ID)) view.Set("countErrorFeeds", h.store.CountErrorFeeds(user.ID)) view.Set("hasSaveEntry", h.store.HasSaveEntry(user.ID)) + view.Set("showOnlyUnreadEntries", true) html.OK(w, r, view.Render("category_entries")) } diff --git a/ui/category_entries_all.go b/ui/category_entries_all.go new file mode 100644 index 0000000..3ae98e9 --- /dev/null +++ b/ui/category_entries_all.go @@ -0,0 +1,72 @@ +// Copyright 2018 Frédéric Guillot. All rights reserved. +// Use of this source code is governed by the Apache 2.0 +// license that can be found in the LICENSE file. + +package ui // import "miniflux.app/ui" + +import ( + "net/http" + + "miniflux.app/http/request" + "miniflux.app/http/response/html" + "miniflux.app/http/route" + "miniflux.app/model" + "miniflux.app/ui/session" + "miniflux.app/ui/view" +) + +func (h *handler) showCategoryEntriesAllPage(w http.ResponseWriter, r *http.Request) { + user, err := h.store.UserByID(request.UserID(r)) + if err != nil { + html.ServerError(w, r, err) + return + } + + categoryID := request.RouteInt64Param(r, "categoryID") + category, err := h.store.Category(request.UserID(r), categoryID) + if err != nil { + html.ServerError(w, r, err) + return + } + + if category == nil { + html.NotFound(w, r) + return + } + + offset := request.QueryIntParam(r, "offset", 0) + builder := h.store.NewEntryQueryBuilder(user.ID) + builder.WithCategoryID(category.ID) + builder.WithOrder(model.DefaultSortingOrder) + builder.WithDirection(user.EntryDirection) + builder.WithoutStatus(model.EntryStatusRemoved) + builder.WithOffset(offset) + builder.WithLimit(nbItemsPerPage) + + entries, err := builder.GetEntries() + if err != nil { + html.ServerError(w, r, err) + return + } + + count, err := builder.CountEntries() + if err != nil { + html.ServerError(w, r, err) + return + } + + sess := session.New(h.store, request.SessionID(r)) + view := view.New(h.tpl, r, sess) + view.Set("category", category) + view.Set("total", count) + view.Set("entries", entries) + view.Set("pagination", getPagination(route.Path(h.router, "categoryEntriesAll", "categoryID", category.ID), count, offset)) + view.Set("menu", "categories") + view.Set("user", user) + view.Set("countUnread", h.store.CountUnreadEntries(user.ID)) + view.Set("countErrorFeeds", h.store.CountErrorFeeds(user.ID)) + view.Set("hasSaveEntry", h.store.HasSaveEntry(user.ID)) + view.Set("showOnlyUnreadEntries", false) + + html.OK(w, r, view.Render("category_entries")) +} diff --git a/ui/feed_entries.go b/ui/feed_entries.go index 46fec9a..4191ed7 100644 --- a/ui/feed_entries.go +++ b/ui/feed_entries.go @@ -37,7 +37,7 @@ func (h *handler) showFeedEntriesPage(w http.ResponseWriter, r *http.Request) { offset := request.QueryIntParam(r, "offset", 0) builder := h.store.NewEntryQueryBuilder(user.ID) builder.WithFeedID(feed.ID) - builder.WithoutStatus(model.EntryStatusRemoved) + builder.WithStatus(model.EntryStatusUnread) builder.WithOrder(model.DefaultSortingOrder) builder.WithDirection(user.EntryDirection) builder.WithOffset(offset) @@ -66,6 +66,7 @@ func (h *handler) showFeedEntriesPage(w http.ResponseWriter, r *http.Request) { view.Set("countUnread", h.store.CountUnreadEntries(user.ID)) view.Set("countErrorFeeds", h.store.CountErrorFeeds(user.ID)) view.Set("hasSaveEntry", h.store.HasSaveEntry(user.ID)) + view.Set("showOnlyUnreadEntries", true) html.OK(w, r, view.Render("feed_entries")) } diff --git a/ui/feed_entries_all.go b/ui/feed_entries_all.go new file mode 100644 index 0000000..f5bbab2 --- /dev/null +++ b/ui/feed_entries_all.go @@ -0,0 +1,72 @@ +// Copyright 2018 Frédéric Guillot. All rights reserved. +// Use of this source code is governed by the Apache 2.0 +// license that can be found in the LICENSE file. + +package ui // import "miniflux.app/ui" + +import ( + "net/http" + + "miniflux.app/http/request" + "miniflux.app/http/response/html" + "miniflux.app/http/route" + "miniflux.app/model" + "miniflux.app/ui/session" + "miniflux.app/ui/view" +) + +func (h *handler) showFeedEntriesAllPage(w http.ResponseWriter, r *http.Request) { + user, err := h.store.UserByID(request.UserID(r)) + if err != nil { + html.ServerError(w, r, err) + return + } + + feedID := request.RouteInt64Param(r, "feedID") + feed, err := h.store.FeedByID(user.ID, feedID) + if err != nil { + html.ServerError(w, r, err) + return + } + + if feed == nil { + html.NotFound(w, r) + return + } + + offset := request.QueryIntParam(r, "offset", 0) + builder := h.store.NewEntryQueryBuilder(user.ID) + builder.WithFeedID(feed.ID) + builder.WithoutStatus(model.EntryStatusRemoved) + builder.WithOrder(model.DefaultSortingOrder) + builder.WithDirection(user.EntryDirection) + builder.WithOffset(offset) + builder.WithLimit(nbItemsPerPage) + + entries, err := builder.GetEntries() + if err != nil { + html.ServerError(w, r, err) + return + } + + count, err := builder.CountEntries() + if err != nil { + html.ServerError(w, r, err) + return + } + + sess := session.New(h.store, request.SessionID(r)) + view := view.New(h.tpl, r, sess) + view.Set("feed", feed) + view.Set("entries", entries) + view.Set("total", count) + view.Set("pagination", getPagination(route.Path(h.router, "feedEntriesAll", "feedID", feed.ID), count, offset)) + view.Set("menu", "feeds") + view.Set("user", user) + view.Set("countUnread", h.store.CountUnreadEntries(user.ID)) + view.Set("countErrorFeeds", h.store.CountErrorFeeds(user.ID)) + view.Set("hasSaveEntry", h.store.HasSaveEntry(user.ID)) + view.Set("showOnlyUnreadEntries", false) + + html.OK(w, r, view.Render("feed_entries")) +} diff --git a/ui/ui.go b/ui/ui.go index 0a41042..23440e7 100644 --- a/ui/ui.go +++ b/ui/ui.go @@ -66,6 +66,7 @@ func Serve(router *mux.Router, cfg *config.Config, store *storage.Storage, pool uiRouter.HandleFunc("/feed/{feedID}/remove", handler.removeFeed).Name("removeFeed").Methods("POST") uiRouter.HandleFunc("/feed/{feedID}/update", handler.updateFeed).Name("updateFeed").Methods("POST") uiRouter.HandleFunc("/feed/{feedID}/entries", handler.showFeedEntriesPage).Name("feedEntries").Methods("GET") + uiRouter.HandleFunc("/feed/{feedID}/entries/all", handler.showFeedEntriesAllPage).Name("feedEntriesAll").Methods("GET") uiRouter.HandleFunc("/feed/{feedID}/entry/{entryID}", handler.showFeedEntryPage).Name("feedEntry").Methods("GET") uiRouter.HandleFunc("/feed/icon/{iconID}", handler.showIcon).Name("icon").Methods("GET") @@ -75,6 +76,7 @@ func Serve(router *mux.Router, cfg *config.Config, store *storage.Storage, pool uiRouter.HandleFunc("/category/create", handler.showCreateCategoryPage).Name("createCategory").Methods("GET") uiRouter.HandleFunc("/category/save", handler.saveCategory).Name("saveCategory").Methods("POST") uiRouter.HandleFunc("/category/{categoryID}/entries", handler.showCategoryEntriesPage).Name("categoryEntries").Methods("GET") + uiRouter.HandleFunc("/category/{categoryID}/entries/all", handler.showCategoryEntriesAllPage).Name("categoryEntriesAll").Methods("GET") uiRouter.HandleFunc("/category/{categoryID}/edit", handler.showEditCategoryPage).Name("editCategory").Methods("GET") uiRouter.HandleFunc("/category/{categoryID}/update", handler.updateCategory).Name("updateCategory").Methods("POST") uiRouter.HandleFunc("/category/{categoryID}/remove", handler.removeCategory).Name("removeCategory").Methods("POST") -- cgit v1.2.3