Merge pull request phpbb#6798 from marc1706/ticket/17492-master

[ticket/17492] Show current state of topic subscription in dropdown -- master version

Author: marc1706

phpBB/styles/prosilver/template/navbar_footer.html

@@ -35,11 +35,11 @@
 					<li class="in-menu">
 						<a href="{{ U_WATCH_FORUM_LINK }}" title="{{ S_WATCH_FORUM_TITLE }}" data-ajax="toggle_link" data-toggle-text="{{ S_WATCH_FORUM_TOGGLE }}" data-toggle-url="{{ U_WATCH_FORUM_TOGGLE }}">
 							{% if S_WATCHING_FORUM %}
-								{{ Icon('font', 'bell-slash', '', true, 'far c-watch-icon is-active') }}
-								{{ Icon('font', 'bell', '', true, 'far c-watch-icon') }}
-							{% else %}
 								{{ Icon('font', 'bell', '', true, 'far c-watch-icon is-active') }}
 								{{ Icon('font', 'bell-slash', '', true, 'far c-watch-icon') }}
+							{% else %}
+								{{ Icon('font', 'bell-slash', '', true, 'far c-watch-icon is-active') }}
+								{{ Icon('font', 'bell', '', true, 'far c-watch-icon') }}
 							{% endif %}
 							<span>{{ S_WATCH_FORUM_TITLE }}</span>
 						</a>

phpBB/styles/prosilver/template/viewtopic_topic_tools.html

@@ -8,20 +8,20 @@
 			<div class="pointer"><div class="pointer-inner"></div></div>
 			<ul class="dropdown-contents">
 				<!-- EVENT viewtopic_topic_tools_before -->
-				<!-- IF U_WATCH_TOPIC -->
+				{% if U_WATCH_TOPIC %}
 					<li>
-						<a href="{U_WATCH_TOPIC}" class="watch-topic-link" title="{S_WATCH_TOPIC_TITLE}" data-ajax="toggle_link" data-toggle-text="{S_WATCH_TOPIC_TOGGLE}" data-toggle-url="{U_WATCH_TOPIC_TOGGLE}" data-update-all=".watch-topic-link">
+						<a href="{{ U_WATCH_TOPIC }}" class="watch-topic-link" title="{{ S_WATCH_TOPIC_TITLE }}" data-ajax="toggle_link" data-toggle-text="{{ S_WATCH_TOPIC_TOGGLE }}" data-toggle-url="{{ U_WATCH_TOPIC_TOGGLE }}" data-update-all=".watch-topic-link">
 							{% if S_WATCHING_TOPIC %}
-								{{ Icon('font', 'bell-slash', '', true, 'far c-watch-icon is-active') }}
-								{{ Icon('font', 'bell', '', true, 'far c-watch-icon') }}
-							{% else %}
 								{{ Icon('font', 'bell', '', true, 'far c-watch-icon is-active') }}
 								{{ Icon('font', 'bell-slash', '', true, 'far c-watch-icon') }}
+							{% else %}
+								{{ Icon('font', 'bell-slash', '', true, 'far c-watch-icon is-active') }}
+								{{ Icon('font', 'bell', '', true, 'far c-watch-icon') }}
 							{% endif %}
 							<span>{S_WATCH_TOPIC_TITLE}</span>
 						</a>
 					</li>
-				<!-- ENDIF -->
+				{% endif %}
 				<!-- IF U_BOOKMARK_TOPIC -->
 					<li>
 						<a href="{U_BOOKMARK_TOPIC}" class="bookmark-link" title="{L_BOOKMARK_TOPIC}" data-ajax="alt_text" data-alt-text="{S_BOOKMARK_TOGGLE}" data-update-all=".bookmark-link">