Merge branch '2021.03-rc' into copyright-2021

[friendica.git] / view / templates / widget_forumlist.tpl

diff --git a/view/templates/widget_forumlist.tpl b/view/templates/widget_forumlist.tpl
index 272cdd92e8c0309b5bf71f00ed57305502e02b98..49e66df7b9bf48c39aa7e815e628fcf539251f00 100644 (file)
--- a/view/templates/widget_forumlist.tpl
+++ b/view/templates/widget_forumlist.tpl
@@ -2,20 +2,21 @@
 function showHideForumlist() {
        if( $("li[id^='forum-widget-entry-extended-']").is(':visible')) {
                $("li[id^='forum-widget-entry-extended-']").hide();
-               $("li#forum-widget-collapse").html(window.showMore);
+               $("li#forum-widget-collapse").html('{{$showmore}}');
 
        }
        else {
                $("li[id^='forum-widget-entry-extended-']").show();
-               $("li#forum-widget-collapse").html(window.showFewer);
+               $("li#forum-widget-collapse").html('{{$showless}}');
        }
 }
 </script>
-<span id="forumlist-sidebar-inflated" class="widget fakelink" style="display: block;" onclick="openClose('forumlist-sidebar'); openClose('forumlist-sidebar-inflated');">
+<span id="forumlist-sidebar-frame">
+<span id="forumlist-sidebar-inflated" class="widget fakelink" onclick="openCloseWidget('forumlist-sidebar', 'forumlist-sidebar-inflated');">
        <h3>{{$title}}</h3>
 </span>
-<div id="forumlist-sidebar" class="widget" style="display: none;">
-       <span class="fakelink" onclick="openClose('forumlist-sidebar'); openClose('forumlist-sidebar-inflated');">
+<div id="forumlist-sidebar" class="widget">
+       <span class="fakelink" onclick="openCloseWidget('forumlist-sidebar', 'forumlist-sidebar-inflated');">
                <h3 id="forumlist">{{$title}}</h3>
        </span>
        <ul id="forumlist-sidbar-ul" role="menu">
@@ -23,7 +24,7 @@ function showHideForumlist() {
                {{if $forum.id <= $visible_forums}}
                <li class="forum-widget-entry forum-{{$forum.cid}}" id="forum-widget-entry-{{$forum.id}}" role="menuitem">
                        <span class="notify badge pull-right"></span>
-                       <a href="{{$forum.external_url}}" title="{{$forum.link_desc}}" class="label sparkle" target="_blank">
+                       <a href="{{$forum.external_url}}" title="{{$forum.link_desc}}" class="label sparkle" target="_blank" rel="noopener noreferrer">
                                <img class="forumlist-img" src="{{$forum.micro}}" alt="{{$forum.link_desc}}" />
                        </a>
                        <a class="forum-widget-link {{if $forum.selected}}forum-selected{{/if}}" id="forum-widget-link-{{$forum.id}}" href="{{$forum.url}}" >{{$forum.name}}</a>
@@ -33,7 +34,7 @@ function showHideForumlist() {
                {{if $forum.id > $visible_forums}}
                <li class="forum-widget-entry forum-{{$forum.cid}}" id="forum-widget-entry-extended-{{$forum.id}}" role="menuitem" style="display: none;">
                        <span class="notify badge pull-right"></span>
-                       <a href="{{$forum.external_url}}" title="{{$forum.link_desc}}" class="label sparkle" target="_blank">
+                       <a href="{{$forum.external_url}}" title="{{$forum.link_desc}}" class="label sparkle" target="_blank" rel="noopener noreferrer">
                                <img class="forumlist-img" src="{{$forum.micro}}" alt="{{$forum.link_desc}}" />
                        </a>
                        <a class="forum-widget-link {{if $forum.selected}}forum-selected{{/if}}" id="forum-widget-link-{{$forum.id}}" href="{{$forum.url}}" >{{$forum.name}}</a>
@@ -46,3 +47,7 @@ function showHideForumlist() {
                {{/if}}
        </ul>
 </div>
+</span>
+<script>
+initWidget('forumlist-sidebar', 'forumlist-sidebar-inflated');
+</script>