Update 'next-3.x' with latest changes from 'main'

quiqqer/faq/types/category.html

 {if $Template->getAttribute('content-body') && $Site->getAttribute('content')}
-<section class="content-body">
-    {$Site->getAttribute('content')}
-</section>
+    <section class="content-body">
+        {$Site->getAttribute('content')}
+    </section>
 {/if}
 
-<section itemscope itemtype="http://schema.org/ItemList"
-         class="content-template quiqqer-faq clear-fix cologne-quiqqer-faq"
-         data-qui="package/quiqqer/faq/bin/Category"
->
-    {if count($entries)}
-    <ul class="quiqqer-faq-list">
-        {foreach $entries as $Faq}
-        <li>
-            <a href="{url site=$Site}#faq{$Faq->getId()}">
-                <span class="fa fa-file-text-o"></span>
-                {$Faq->getAttribute('title')}
-            </a>
-        </li>
-        {/foreach}
-    </ul>
+{* Template: default*}
+{if $faqTemplate == 'default'}
+    {if $offset}
+        {*
+        This CSS is used to scroll the page down a bit when accessed with a # in the url.
+        By doing this the menu no longer hides the linked content.
+        *}
+        <style type="text/css">
+            :target::before {
+                content: '';
+                display: block;
+                height: {$offset}px;
+                margin-top: -{$offset}px;
+            }
+        </style>
     {/if}
 
-    {foreach $entries as $Faq}
-    <article id="faq{$Faq->getId()}" class="clear-fix">
-        <header>
-            <h2><span class="fa fa-file-text"></span> {$Faq->getAttribute('title')}</h2>
-        </header>
-
-        {if $Faq->getAttribute('short')}
-        <div class="content-short">
-            {$Faq->getAttribute('short')|nl2br}
-        </div>
+    <section itemscope itemtype="http://schema.org/ItemList"
+             class="content-template quiqqer-faq clear-fix cologne-quiqqer-faq"
+             data-qui="package/quiqqer/faq/bin/Category"
+             data-qui-options-offset="{$offset}"
+    >
+        {if count($entries)}
+            <ul class="quiqqer-faq-list" id="faqList" name="faqList">
+                {foreach $entries as $Faq}
+                    <li>
+                        <a href="{url site=$Site}#faq{$Faq->getId()}">
+                            <span class="fa fa-file-text-o"></span>
+                            {$Faq->getAttribute('title')}
+                        </a>
+                    </li>
+                {/foreach}
+            </ul>
         {/if}
 
-        <div class="content-body">
-            {$Faq->getAttribute('content')}
-        </div>
+        {foreach $entries as $Faq}
+            <article id="faq{$Faq->getId()}" class="clear-fix">
+                <header>
+                    <h2><span class="fa fa-file-text"></span> {$Faq->getAttribute('title')}</h2>
+                </header>
+
+                {if $Faq->getAttribute('short')}
+                    <div class="content-short">
+                        {$Faq->getAttribute('short')|nl2br}
+                    </div>
+                {/if}
 
-        <a href="#top" class=" quiqqer-faq-list-linkToTop">
-            {locale group="quiqqer/faq" value="link.to.top"} <span class="fa fa-fw fa-level-up"></span>
-        </a>
+                <div class="content-body">
+                    {$Faq->getAttribute('content')}
+                </div>
 
-    </article>
+                <a href="#faqList" class="quiqqer-faq-list-linkToTop">
+                    {locale group="quiqqer/faq" value="link.to.top"} <span class="fa fa-fw fa-level-up"></span>
+                </a>
 
-    {if !($Faq@last)}
+            </article>
 
-    {/if}
+            {if !($Faq@last)}
 
-    {/foreach}
+            {/if}
+        {/foreach}
+    </section>
+{/if}
 
-</section>
+{* Template: accordion*}
+{if $faqTemplate == 'accordion'}
+    <section class="content-template quiqqer-faq">
+        {$FAQControl->create()}
+    </section>
+{/if}
\ No newline at end of file