diff options
| -rw-r--r-- | addons/website_forum/controllers/main.py | 2 | ||||
| -rw-r--r-- | addons/website_forum/i18n/website_forum.pot | 10 | ||||
| -rw-r--r-- | addons/website_forum/views/website_forum.xml | 10 |
3 files changed, 19 insertions, 3 deletions
diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py index f8b268d902b..6ad0af1f2f1 100644 --- a/addons/website_forum/controllers/main.py +++ b/addons/website_forum/controllers/main.py @@ -235,6 +235,8 @@ class WebsiteForum(WebsiteProfile): 'filters': filters, 'reversed': reversed, }) + if (request.httprequest.referrer or "").startswith(request.httprequest.url_root): + values['back_button_url'] = request.httprequest.referrer return request.render("website_forum.post_description_full", values) @http.route('/forum/<model("forum.forum"):forum>/question/<model("forum.post"):question>/toggle_favourite', type='json', auth="user", methods=['POST'], website=True) diff --git a/addons/website_forum/i18n/website_forum.pot b/addons/website_forum/i18n/website_forum.pot index 7c57e7a64df..864e420e463 100644 --- a/addons/website_forum/i18n/website_forum.pot +++ b/addons/website_forum/i18n/website_forum.pot @@ -394,6 +394,11 @@ msgid "<i class=\"fa fa-chevron-left mr-1\"/>All Forums" msgstr "" #. module: website_forum +#: model_terms:ir.ui.view,arch_db:website_forum.forum_nav_header +msgid "<i class=\"fa fa-chevron-left mr-1\"/>Back" +msgstr "" + +#. module: website_forum #: model_terms:ir.ui.view,arch_db:website_forum.new_question msgid "<i class=\"fa fa-chevron-left mr-2\"/>Back to All Topics" msgstr "" @@ -891,6 +896,11 @@ msgid "Avatar" msgstr "" #. module: website_forum +#: model_terms:ir.ui.view,arch_db:website_forum.forum_nav_header +msgid "Back" +msgstr "" + +#. module: website_forum #: model_terms:ir.ui.view,arch_db:website_forum.edit_post #: model_terms:ir.ui.view,arch_db:website_forum.header #: model_terms:ir.ui.view,arch_db:website_forum.new_question diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml index ebc265471f2..bf4800285a0 100644 --- a/addons/website_forum/views/website_forum.xml +++ b/addons/website_forum/views/website_forum.xml @@ -128,13 +128,17 @@ <template id="forum_nav_header"> <div class="navbar navbar-expand-sm navbar-light"> <div class="container flex-wrap flex-md-nowrap"> - <a t-if="request.website.forums_count > 1" class="btn btn-light border mr-2" href="/forum/" title="All forums"> - <i class="fa fa-chevron-left mr-1"/>All Forums + <a t-if="back_button_url" class="btn btn-light border mr-2" t-attf-href="#{back_button_url}" title="Back"> + <i class="fa fa-chevron-left mr-1"/>Back </a> - <!-- Desktop --> <ul class="navbar-nav mr-auto d-none d-lg-flex"> <li class="nav-item"> + <a t-if="request.website.forums_count > 1" class="nav-link" href="/forum/" title="All forums"> + All Forums + </a> + </li> + <li class="nav-item"> <a t-attf-href="/forum/#{ slug(forum) }" t-attf-class="nav-link #{question_count and 'active'}">Topics</a> </li> <li class="nav-item"> |