From 84a1b863a67eeb10be306a69cf1b8de02874ba4f Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Wed, 15 Jun 2016 12:38:47 +1000
Subject: [PATCH] UX: add link to watched topics from prefs page

---
 app/assets/javascripts/discourse/models/user.js.es6           | 2 ++
 .../javascripts/discourse/templates/user/preferences.hbs      | 4 ++++
 config/locales/client.en.yml                                  | 1 +
 3 files changed, 7 insertions(+)

diff --git a/app/assets/javascripts/discourse/models/user.js.es6 b/app/assets/javascripts/discourse/models/user.js.es6
index 9797cec04f5..666fc5614b7 100644
--- a/app/assets/javascripts/discourse/models/user.js.es6
+++ b/app/assets/javascripts/discourse/models/user.js.es6
@@ -94,6 +94,8 @@ const User = RestModel.extend({
 
   mutedTopicsPath: url('/latest?state=muted'),
 
+  watchingTopicsPath: url('/latest?state=watching'),
+
   @computed("username")
   username_lower(username) {
     return username.toLowerCase();
diff --git a/app/assets/javascripts/discourse/templates/user/preferences.hbs b/app/assets/javascripts/discourse/templates/user/preferences.hbs
index a69a8b6295f..e33b03afebe 100644
--- a/app/assets/javascripts/discourse/templates/user/preferences.hbs
+++ b/app/assets/javascripts/discourse/templates/user/preferences.hbs
@@ -255,6 +255,10 @@
         {{category-group categories=model.watchedCategories blacklist=selectedCategories}}
       </div>
       <div class="instructions">{{i18n 'user.watched_categories_instructions'}}</div>
+      <div class="controls category-controls">
+      <a href="{{unbound model.watchingTopicsPath}}">{{i18n 'user.watched_topics_link'}}</a>
+      </div>
+      <div class="instructions"></div>
       <div class="controls category-controls">
         <label><span class="icon fa fa-circle tracking"></span> {{i18n 'user.tracked_categories'}}</label>
         {{category-group categories=model.trackedCategories blacklist=selectedCategories}}
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index f0177aa9dd5..e73a69971b5 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -535,6 +535,7 @@ en:
       muted_users: "Muted"
       muted_users_instructions: "Suppress all notifications from these users."
       muted_topics_link: "Show muted topics"
+      watched_topics_link: "Show watched topics"
       automatically_unpin_topics: "Automatically unpin topics when I reach the bottom."
 
       staff_counters: