Index: PatternSkin/templates/view.pattern.tmpl =================================================================== --- PatternSkin/templates/view.pattern.tmpl (revision 11602) +++ PatternSkin/templates/view.pattern.tmpl (working copy) @@ -23,7 +23,7 @@ --------------------------------------------------- }%%TMPL:DEF{"top"}%
%TMPL:P{"breadcrumb"}%%TMPL:P{"top:toolbarbuttons"}%
%TMPL:END% -%TMPL:DEF{"top:toolbarbuttons"}%%TMPL:P{"activatable_edit_or_create"}%%TMPL:P{"activatable_attach"}%%TMPL:END%%{ +%TMPL:DEF{"top:toolbarbuttons"}%%TMPL:P{"activatable_edit_or_create"}%%TMPL:P{"activatable_attach"}%%TMPL:P{context="SubscribePluginEnabled" then="activatable_subscribe"}%%TMPL:END%%{ --------------------------------------------------- }%%TMPL:DEF{"breadcrumb:separator"}%>%TMPL:END% @@ -73,4 +73,4 @@ --------------------------------------------------- }%%TMPL:DEF{"horizontalnavigation"}%%IF{"istopic '%PATTERNSKIN_NAVIGATION_TOPIC%'" then="$percntINCLUDE{$quot%PATTERNSKIN_NAVIGATION_TOPIC%$quot section=$quotmain$quot warn=$quotoff$quot}$percnt"}%%TMPL:END%%{ --------------------------------------------------- -}%%TMPL:DEF{"metanavigation"}%%IF{"istopic '%PATTERNSKIN_NAVIGATION_TOPIC%'" then="$percntINCLUDE{$quot%PATTERNSKIN_NAVIGATION_TOPIC%$quot section=$quotmeta$quot warn=$quotoff$quot}$percnt"}%%TMPL:END% \ No newline at end of file +}%%TMPL:DEF{"metanavigation"}%%IF{"istopic '%PATTERNSKIN_NAVIGATION_TOPIC%'" then="$percntINCLUDE{$quot%PATTERNSKIN_NAVIGATION_TOPIC%$quot section=$quotmeta$quot warn=$quotoff$quot}$percnt"}%%TMPL:END% Index: core/templates/viewtopicactionbuttons.tmpl =================================================================== --- core/templates/viewtopicactionbuttons.tmpl (revision 11602) +++ core/templates/viewtopicactionbuttons.tmpl (working copy) @@ -1,4 +1,4 @@ -%TMPL:DEF{"topicactionbuttons"}%%TMPL:P{"action_activatable_edit_or_create"}%%TMPL:P{"action_activatable_attach"}%%TMPL:P{"action_printable"}%%TMPL:P{"action_revisions"}%%TMPL:P{"action_backlinks_simple"}%%TMPL:P{"action_raw_or_view"}%%TMPL:P{"action_activatable_raw_edit"}%%TMPL:P{"activatable_more"}%%TMPL:END% +%TMPL:DEF{"topicactionbuttons"}%%TMPL:P{"action_activatable_edit_or_create"}%%TMPL:P{"action_activatable_attach"}%%TMPL:P{"action_activatable_subscribe"}%%TMPL:P{"action_printable"}%%TMPL:P{"action_revisions"}%%TMPL:P{"action_backlinks_simple"}%%TMPL:P{"action_raw_or_view"}%%TMPL:P{"action_activatable_raw_edit"}%%TMPL:P{"activatable_more"}%%TMPL:END% %TMPL:DEF{"create_topic_link"}%&Create"}%%TMPL:END% @@ -13,6 +13,7 @@ %TMPL:DEF{"attach_link"}%&Attach"}%%TMPL:END% +%TMPL:DEF{"subscribe_link"}%%SUBSCRIBE{format="&Subscribe"}%" formatunsubscribe="Un&subscribe"}%"}%%TMPL:END% %TMPL:DEF{"more_link"}%&More topic actions"}%%TMPL:END% @@ -70,7 +71,17 @@ %TMPL:DEF{"activatable_attach"}%%TMPL:P{context="inactive" then="inactive_attach" else="active_attach"}%%TMPL:END% +%TMPL:DEF{"active_subscribe"}%%TMPL:P{"subscribe_link"}%%TMPL:P{"sep"}%%TMPL:END% +%TMPL:DEF{"inactive_subscribe"}%%MAKETEXT{"Subscribe"}%%TMPL:P{"sep"}%%TMPL:END% + +%TMPL:DEF{"enabled_active_subscribe"}%%TMPL:P{context="authenticated" then="activatable_subscribe"}%%TMPL:END% + +%TMPL:DEF{"action_activatable_subscribe"}%%TMPL:P{context="SubscribePluginEnabled" then="enabled_active_subscribe"}%%TMPL:END% + +%TMPL:DEF{"activatable_subscribe"}%%TMPL:P{context="inactive" then="inactive_subscribe" else="active_subscribe"}%%TMPL:END% + + %TMPL:DEF{"active_more"}%%TMPL:P{"more_link"}%%TMPL:END% %TMPL:DEF{"inactive_more"}%%MAKETEXT{"More topic actions..."}%%TMPL:END% Index: FamFamFamContrib/templates/view.famfamfam.tmpl =================================================================== --- FamFamFamContrib/templates/view.famfamfam.tmpl (revision 11602) +++ FamFamFamContrib/templates/view.famfamfam.tmpl (working copy) @@ -8,6 +8,13 @@ %MAKETEXT{ %TMPL:END% + +%TMPL:DEF{"top:toolbarbutton_subscribe"}% + %SUBSCRIBE{format=" + %MAKETEXT{"Subscribe to this topic (s)"}% + " formatunsubscribe=" + %MAKETEXT{"Unsubscribe from this topic (s)"}% + "}%%TMPL:END% %TMPL:DEF{"top:toolbarbutton_rdiff"}% @@ -34,13 +41,13 @@ %MAKETEXT{ %TMPL:END% -%{ TODO: add a conditional SubScribePlugin icon? }% - %TMPL:DEF{"top:toolbarbuttons_inner"}% %TMPL:P{ "top:toolbarbutton_edit" }%%TMPL:P{ "top:toolbarbutton_attach" }%%TMPL:P{ + context="SubscribePluginEnabled" then="top:toolbarbutton_subscribe" + }%%TMPL:P{ "top:toolbarbutton_rdiff" }%%TMPL:P{ "top:toolbarbutton_raw" Index: core/lib/Foswiki.spec =================================================================== --- core/lib/Foswiki.spec (revision 11602) +++ core/lib/Foswiki.spec (working copy) @@ -1535,6 +1535,8 @@ $Foswiki::cfg{Plugins}{RenderListPlugin}{Module} = 'Foswiki::Plugins::RenderListPlugin'; $Foswiki::cfg{Plugins}{MailerContribPlugin}{Enabled} = 1; $Foswiki::cfg{Plugins}{MailerContribPlugin}{Module} = 'Foswiki::Plugins::MailerContribPlugin'; +$Foswiki::cfg{Plugins}{SubscribePlugin}{Enabled} = 1; +$Foswiki::cfg{Plugins}{SubscribePlugin}{Module} = 'Foswiki::Plugins::SubscribePlugin'; #---++ Plugin settings #

Expert settings controlling extension operation.