From 1ba54694475e5da09e668f475f9dfa6547ded6c4 Mon Sep 17 00:00:00 2001
From: Valentin Szczupak <valentin.szczupak@prestashop.com>
Date: Tue, 24 Nov 2020 17:20:54 +0100
Subject: [PATCH 1/2] Add new column template for dislayLeft/right hook

---
 .../views/templates/hook/linkblock-column.tpl | 56 +++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 themes/classic/modules/ps_linklist/views/templates/hook/linkblock-column.tpl

diff --git a/themes/classic/modules/ps_linklist/views/templates/hook/linkblock-column.tpl b/themes/classic/modules/ps_linklist/views/templates/hook/linkblock-column.tpl
new file mode 100644
index 0000000000000..c24f007ea038c
--- /dev/null
+++ b/themes/classic/modules/ps_linklist/views/templates/hook/linkblock-column.tpl
@@ -0,0 +1,56 @@
+{**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License 3.0 (AFL-3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/AFL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
+ *}
+<div class="links">
+  {foreach $linkBlocks as $linkBlock}
+    <div class="wrapper">
+      <p class="h3 hidden-sm-down">{$linkBlock.title}</p>
+      {assign var=_expand_id value=10|mt_rand:100000}
+      <div class="title clearfix hidden-md-up" data-target="#footer_sub_menu_{$_expand_id}" data-toggle="collapse">
+        <span class="h3">{$linkBlock.title}</span>
+        <span class="float-xs-right">
+          <span class="navbar-toggler collapse-icons">
+            <i class="material-icons add">&#xE313;</i>
+            <i class="material-icons remove">&#xE316;</i>
+          </span>
+        </span>
+      </div>
+      <ul id="footer_sub_menu_{$_expand_id}" class="collapse">
+        {foreach $linkBlock.links as $link}
+          <li>
+            <a
+                id="{$link.id}-{$linkBlock.id}"
+                class="{$link.class}"
+                href="{$link.url}"
+                title="{$link.description}"
+                {if !empty($link.target)} target="{$link.target}" {/if}
+            >
+              {$link.title}
+            </a>
+          </li>
+        {/foreach}
+      </ul>
+    </div>
+  {/foreach}
+</div>

From 8e7158ac7510ea0896996fea76850a18db899311 Mon Sep 17 00:00:00 2001
From: Valentin Szczupak <valentin.szczupak@prestashop.com>
Date: Fri, 27 Nov 2020 10:26:12 +0100
Subject: [PATCH 2/2] Change random to linkBlock id

---
 .../ps_linklist/views/templates/hook/linkblock-column.tpl    | 5 ++---
 .../modules/ps_linklist/views/templates/hook/linkblock.tpl   | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/themes/classic/modules/ps_linklist/views/templates/hook/linkblock-column.tpl b/themes/classic/modules/ps_linklist/views/templates/hook/linkblock-column.tpl
index c24f007ea038c..4c57499f96dfc 100644
--- a/themes/classic/modules/ps_linklist/views/templates/hook/linkblock-column.tpl
+++ b/themes/classic/modules/ps_linklist/views/templates/hook/linkblock-column.tpl
@@ -26,8 +26,7 @@
   {foreach $linkBlocks as $linkBlock}
     <div class="wrapper">
       <p class="h3 hidden-sm-down">{$linkBlock.title}</p>
-      {assign var=_expand_id value=10|mt_rand:100000}
-      <div class="title clearfix hidden-md-up" data-target="#footer_sub_menu_{$_expand_id}" data-toggle="collapse">
+      <div class="title clearfix hidden-md-up" data-target="#footer_sub_menu_{$linkBlock.id}" data-toggle="collapse">
         <span class="h3">{$linkBlock.title}</span>
         <span class="float-xs-right">
           <span class="navbar-toggler collapse-icons">
@@ -36,7 +35,7 @@
           </span>
         </span>
       </div>
-      <ul id="footer_sub_menu_{$_expand_id}" class="collapse">
+      <ul id="footer_sub_menu_{$linkBlock.id}" class="collapse">
         {foreach $linkBlock.links as $link}
           <li>
             <a
diff --git a/themes/classic/modules/ps_linklist/views/templates/hook/linkblock.tpl b/themes/classic/modules/ps_linklist/views/templates/hook/linkblock.tpl
index 9334203745fc6..736c34a8c9509 100644
--- a/themes/classic/modules/ps_linklist/views/templates/hook/linkblock.tpl
+++ b/themes/classic/modules/ps_linklist/views/templates/hook/linkblock.tpl
@@ -27,8 +27,7 @@
   {foreach $linkBlocks as $linkBlock}
     <div class="col-md-6 wrapper">
       <p class="h3 hidden-sm-down">{$linkBlock.title}</p>
-      {assign var=_expand_id value=10|mt_rand:100000}
-      <div class="title clearfix hidden-md-up" data-target="#footer_sub_menu_{$_expand_id}" data-toggle="collapse">
+      <div class="title clearfix hidden-md-up" data-target="#footer_sub_menu_{$linkBlock.id}" data-toggle="collapse">
         <span class="h3">{$linkBlock.title}</span>
         <span class="float-xs-right">
           <span class="navbar-toggler collapse-icons">
@@ -37,7 +36,7 @@
           </span>
         </span>
       </div>
-      <ul id="footer_sub_menu_{$_expand_id}" class="collapse">
+      <ul id="footer_sub_menu_{$linkBlock.id}" class="collapse">
         {foreach $linkBlock.links as $link}
           <li>
             <a