From 24dfc47e992b40ca6c2ebac8be64b18a1be18a95 Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Fri, 4 Dec 2020 17:04:17 +0100
Subject: [PATCH] wait #4054 @2.5

---
 app/Models/Product.php                        |  7 ++++---
 public/images/product-details/icon-cad.svg    |  1 +
 .../product-details/icon-dimensions_doc.svg   |  1 +
 .../images/product-details/icon-document.svg  | 20 -------------------
 .../product-details/icon-documentation.svg    |  1 +
 .../images/product-details/icon-software.svg  |  1 +
 public/images/product-details/icon-tech.svg   | 14 -------------
 .../product-details/icon-technical_sheet.svg  |  1 +
 .../views/pages/product-detail.blade.php      |  3 ++-
 9 files changed, 11 insertions(+), 38 deletions(-)
 create mode 100644 public/images/product-details/icon-cad.svg
 create mode 100644 public/images/product-details/icon-dimensions_doc.svg
 delete mode 100644 public/images/product-details/icon-document.svg
 create mode 100644 public/images/product-details/icon-documentation.svg
 create mode 100644 public/images/product-details/icon-software.svg
 delete mode 100644 public/images/product-details/icon-tech.svg
 create mode 100644 public/images/product-details/icon-technical_sheet.svg

diff --git a/app/Models/Product.php b/app/Models/Product.php
index a8ac619..745bd17 100644
--- a/app/Models/Product.php
+++ b/app/Models/Product.php
@@ -32,7 +32,7 @@ class Product extends CubistMagicPageModel
 
     public function __construct(array $attributes = [])
     {
-        $this->_documents = ['technical_sheet' => 'Fiche technique', 'documentation' => 'Documentation', 'dimensions_doc' => 'Dimensions'];
+        $this->_documents = ['technical_sheet' => 'Fiche technique', 'documentation' => 'Documentation', 'dimensions_doc' => 'Dimensions', 'cad' => 'CAO', 'software' => 'Programme'];
         parent::__construct($attributes);
     }
 
@@ -257,8 +257,9 @@ class Product extends CubistMagicPageModel
         foreach ($this->_documents as $fieldName => $label) {
             foreach ($this->getMediaInField($this->$fieldName) as $media) {
                 /** @var $media Media */
-
-                $res[] = ['media' => $media, 'label' => $label, 'type' => in_array($media->getExtensionAttribute(), $typedocs) ? 'tech' : 'document'];
+                $e = explode('/', $media->getUrl());
+                $fname = array_pop($e);
+                $res[] = ['media' => $media, 'label' => $media->getCustomProperty('alt') ?: $fname, 'tooltip' => $label, 'type' => $fieldName];
             }
         }
 
diff --git a/public/images/product-details/icon-cad.svg b/public/images/product-details/icon-cad.svg
new file mode 100644
index 0000000..55ddcc4
--- /dev/null
+++ b/public/images/product-details/icon-cad.svg
@@ -0,0 +1 @@
+<svg id="Calque_1" data-name="Calque 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 31" width="24" height="31"><defs><style>.cls-1,.cls-2{fill:#0eaada;}.cls-1,.cls-2,.cls-3{stroke:#f7f8fc;stroke-linecap:round;stroke-linejoin:round;}.cls-1{stroke-width:1px;}.cls-2,.cls-3{stroke-width:1.21px;}.cls-3{fill:none;}.cls-4{fill:#f7f8fc;}</style></defs><g id="Groupe_123" data-name="Groupe 123"><path id="Tracé_199" data-name="Tracé 199" class="cls-1" d="M22.13,30.5H1.87A1.36,1.36,0,0,1,.5,29.14V1.86A1.36,1.36,0,0,1,1.87.5h15L23.5,7.15v22a1.36,1.36,0,0,1-1.37,1.36Z"/><path id="Tracé_200" data-name="Tracé 200" class="cls-1" d="M23.5,7.15H18.2a1.37,1.37,0,0,1-1.37-1.36h0V.5Z"/></g><polygon class="cls-2" points="12 10.5 6 14 6 21 12 24.5 18 21 18 14 12 10.5"/><polyline class="cls-2" points="6 14 12 17.5 18 14"/><line class="cls-3" x1="12" y1="17.5" x2="12" y2="24.5"/><rect class="cls-4" x="10.5" y="9" width="3" height="3"/><rect class="cls-4" x="10.5" y="23" width="3" height="3"/><rect class="cls-4" x="4.5" y="20" width="3" height="3"/><rect class="cls-4" x="4.5" y="12" width="3" height="3"/><rect class="cls-4" x="16.5" y="20" width="3" height="3"/><rect class="cls-4" x="16.5" y="12" width="3" height="3"/></svg>
diff --git a/public/images/product-details/icon-dimensions_doc.svg b/public/images/product-details/icon-dimensions_doc.svg
new file mode 100644
index 0000000..3bf3305
--- /dev/null
+++ b/public/images/product-details/icon-dimensions_doc.svg
@@ -0,0 +1 @@
+<svg id="Calque_1" data-name="Calque 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 31" width="24" height="31"><defs><style>.cls-1{fill:#0eaada;stroke-linecap:round;stroke-width:1px;}.cls-1,.cls-3,.cls-4{stroke:#f7f8fc;stroke-linejoin:round;}.cls-2,.cls-3,.cls-4{fill:none;}.cls-3{stroke-linecap:square;}.cls-4{stroke-width:1.01px;}.cls-5{fill:#f7f8fc;}</style></defs><g id="Groupe_123" data-name="Groupe 123"><path id="Tracé_199" data-name="Tracé 199" class="cls-1" d="M22.13,30.5H1.87A1.36,1.36,0,0,1,.5,29.14V1.86A1.36,1.36,0,0,1,1.87.5h15L23.5,7.15v22a1.36,1.36,0,0,1-1.37,1.36Z"/><path id="Tracé_200" data-name="Tracé 200" class="cls-1" d="M23.5,7.15H18.2a1.37,1.37,0,0,1-1.37-1.36h0V.5Z"/></g><g id="Rectangle_472" data-name="Rectangle 472"><rect class="cls-2" x="8.5" y="12.55" width="7.01" height="7.01"/><rect class="cls-3" x="9" y="13.05" width="6.01" height="6.01"/></g><polyline id="Ligne_137" data-name="Ligne 137" class="cls-4" points="5.5 10.75 5.5 22.75 17.5 22.75"/><polygon class="cls-5" points="5.5 7.75 4 11.75 7 11.75 5.5 7.75"/><polygon class="cls-5" points="20 22.75 16 21.25 16 24.25 20 22.75"/></svg>
diff --git a/public/images/product-details/icon-document.svg b/public/images/product-details/icon-document.svg
deleted file mode 100644
index 6309327..0000000
--- a/public/images/product-details/icon-document.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="23.944" height="31" viewBox="0 0 23.944 31">
-  <g id="Groupe_129" data-name="Groupe 129" transform="translate(-126.5 -1244.5)">
-    <g id="Groupe_127" data-name="Groupe 127" transform="translate(127 1244.999)">
-      <g id="Groupe_123" data-name="Groupe 123" transform="translate(0)">
-        <path id="Tracé_199" data-name="Tracé 199" d="M3845.179-1343.333h-20.215a1.365,1.365,0,0,1-1.365-1.364v-27.272a1.365,1.365,0,0,1,1.365-1.364h14.928l6.652,6.651v21.985A1.364,1.364,0,0,1,3845.179-1343.333Z" transform="translate(-3823.6 1373.333)" fill="#0eaada" stroke="#f7f8fc" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
-        <path id="Tracé_200" data-name="Tracé 200" d="M3897.947-1366.683h-5.287a1.364,1.364,0,0,1-1.364-1.364v-5.286Z" transform="translate(-3875.003 1373.333)" fill="#0eaada" stroke="#f7f8fc" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
-      </g>
-      <g id="Groupe_117" data-name="Groupe 117" transform="translate(3.334 8.334)">
-        <g id="Rectangle_472" data-name="Rectangle 472" transform="translate(0.126 0)" fill="none" stroke="#f7f8fc" stroke-linecap="square" stroke-width="1">
-          <rect width="7.008" height="7.007" stroke="none"/>
-          <rect x="0.5" y="0.5" width="6.008" height="6.007" fill="none"/>
-        </g>
-        <line id="Ligne_136" data-name="Ligne 136" x2="5.785" transform="translate(10.181 2.666)" fill="none" stroke="#f7f8fc" stroke-linejoin="round" stroke-width="1"/>
-        <line id="Ligne_137" data-name="Ligne 137" x2="15.841" transform="translate(0.126 10.031)" fill="none" stroke="#f7f8fc" stroke-linejoin="round" stroke-width="1"/>
-        <path id="Tracé_201" data-name="Tracé 201" d="M0,0H10.048" transform="translate(0 13.395)" fill="#0eaada" stroke="#f7f8fc" stroke-width="1"/>
-        <line id="Ligne_140" data-name="Ligne 140" x2="5.718" transform="translate(10.181 6.374)" fill="none" stroke="#f7f8fc" stroke-linejoin="round" stroke-width="1"/>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/public/images/product-details/icon-documentation.svg b/public/images/product-details/icon-documentation.svg
new file mode 100644
index 0000000..0b502e2
--- /dev/null
+++ b/public/images/product-details/icon-documentation.svg
@@ -0,0 +1 @@
+<svg id="Calque_1" data-name="Calque 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 31" width="24" height="31"><defs><style>.cls-1,.cls-5{fill:#0eaada;}.cls-1,.cls-3,.cls-4,.cls-5{stroke:#f7f8fc;}.cls-1{stroke-linecap:round;stroke-width:1px;}.cls-1,.cls-3,.cls-4{stroke-linejoin:round;}.cls-2,.cls-3,.cls-4{fill:none;}.cls-3{stroke-linecap:square;}</style></defs><g id="Groupe_123" data-name="Groupe 123"><path id="Tracé_199" data-name="Tracé 199" class="cls-1" d="M22.13,30.5H1.87A1.36,1.36,0,0,1,.5,29.14V1.86A1.36,1.36,0,0,1,1.87.5h15L23.5,7.15v22a1.36,1.36,0,0,1-1.37,1.36Z"/><path id="Tracé_200" data-name="Tracé 200" class="cls-1" d="M23.5,7.15H18.2a1.37,1.37,0,0,1-1.37-1.36h0V.5Z"/></g><g id="Groupe_117" data-name="Groupe 117"><g id="Rectangle_472" data-name="Rectangle 472"><rect class="cls-2" x="4.14" y="10.8" width="7.01" height="7.01"/><rect class="cls-3" x="4.64" y="11.3" width="6.01" height="6.01"/></g><line id="Ligne_136" data-name="Ligne 136" class="cls-4" x1="14.2" y1="13.47" x2="19.98" y2="13.47"/><line id="Ligne_137" data-name="Ligne 137" class="cls-4" x1="4.14" y1="20.83" x2="19.98" y2="20.83"/><path id="Tracé_201" data-name="Tracé 201" class="cls-5" d="M4,24.2h10"/><line id="Ligne_140" data-name="Ligne 140" class="cls-4" x1="14.2" y1="17.18" x2="19.92" y2="17.18"/></g></svg>
diff --git a/public/images/product-details/icon-software.svg b/public/images/product-details/icon-software.svg
new file mode 100644
index 0000000..c857a45
--- /dev/null
+++ b/public/images/product-details/icon-software.svg
@@ -0,0 +1 @@
+<svg id="Calque_1" data-name="Calque 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 31" width="24" height="31"><defs><style>.cls-1{fill:#0eaada;stroke-linecap:round;stroke-width:1px;}.cls-1,.cls-2,.cls-3{stroke:#f7f8fc;stroke-linejoin:round;}.cls-2,.cls-3{fill:none;}.cls-2{stroke-width:1.01px;}.cls-3{stroke-width:1.09px;}</style></defs><g id="Groupe_123" data-name="Groupe 123"><path id="Tracé_199" data-name="Tracé 199" class="cls-1" d="M22.13,30.5H1.87A1.36,1.36,0,0,1,.5,29.14V1.86A1.36,1.36,0,0,1,1.87.5h15L23.5,7.15v22a1.36,1.36,0,0,1-1.37,1.36Z"/><path id="Tracé_200" data-name="Tracé 200" class="cls-1" d="M23.5,7.15H18.2a1.37,1.37,0,0,1-1.37-1.36h0V.5Z"/></g><path class="cls-2" d="M7.73,25h8.54"/><path class="cls-2" d="M12,22.7v2.8"/><path class="cls-2" d="M5,20.25H19"/><path class="cls-3" d="M4.5,10.5h15v12H4.5Z"/><path class="cls-2" d="M10.87,13.25,8.63,15.5l2.24,2.25"/><path class="cls-2" d="M13.12,13.25l2.25,2.25-2.25,2.25"/></svg>
diff --git a/public/images/product-details/icon-tech.svg b/public/images/product-details/icon-tech.svg
deleted file mode 100644
index e78821b..0000000
--- a/public/images/product-details/icon-tech.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="23.942" height="31" viewBox="0 0 23.942 31">
-  <g id="Groupe_130" data-name="Groupe 130" transform="translate(-207.499 -1302.5)">
-    <g id="Groupe_120" data-name="Groupe 120" transform="translate(208 1302.999)">
-      <g id="Groupe_124" data-name="Groupe 124" transform="translate(0 0)">
-        <path id="Tracé_202" data-name="Tracé 202" d="M4004.51-1343.333H3984.3a1.365,1.365,0,0,1-1.365-1.364v-27.271a1.365,1.365,0,0,1,1.365-1.364h14.926l6.651,6.651v21.985A1.364,1.364,0,0,1,4004.51-1343.333Z" transform="translate(-3982.933 1373.333)" fill="#0eaada" stroke="#f7f8fc" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
-        <path id="Tracé_203" data-name="Tracé 203" d="M4057.28-1366.683h-5.286a1.364,1.364,0,0,1-1.365-1.364v-5.287Z" transform="translate(-4034.338 1373.333)" fill="#0eaada" stroke="#f7f8fc" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
-      </g>
-      <g id="Groupe_125" data-name="Groupe 125" transform="translate(5 9.167)">
-        <path id="Tracé_204" data-name="Tracé 204" d="M515.025,11614.639a5.759,5.759,0,0,0-1.715.984l-1.315-.757-1.8,3.119,1.309.757a5.259,5.259,0,0,0,0,1.973l-1.31.756,1.8,3.119,1.319-.755a5.774,5.774,0,0,0,1.715.982v1.515h3.6v-1.515a5.7,5.7,0,0,0,1.7-.982l1.307.755,1.8-3.119-1.312-.756a5.541,5.541,0,0,0,.093-.986,5.465,5.465,0,0,0-.094-.986l1.311-.757-1.8-3.119-1.3.757a5.687,5.687,0,0,0-1.7-.984V11613h-3.6Z" transform="translate(-510.19 -11612.999)" fill="none" stroke="#f7f8fc" stroke-linecap="round" stroke-width="1"/>
-        <circle id="Ellipse_18" data-name="Ellipse 18" cx="2.381" cy="2.381" r="2.381" transform="translate(4.239 4.348)" fill="none" stroke="#f7f8fc" stroke-linecap="round" stroke-width="1"/>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/public/images/product-details/icon-technical_sheet.svg b/public/images/product-details/icon-technical_sheet.svg
new file mode 100644
index 0000000..60ba8fe
--- /dev/null
+++ b/public/images/product-details/icon-technical_sheet.svg
@@ -0,0 +1 @@
+<svg id="Calque_1" data-name="Calque 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 31" width="24" height="31"><defs><style>.cls-1{fill:#0eaada;stroke-width:1px;}.cls-1,.cls-2{stroke:#f7f8fc;stroke-linecap:round;stroke-linejoin:round;}.cls-2{fill:none;}</style></defs><g id="Groupe_123" data-name="Groupe 123"><path id="Tracé_199" data-name="Tracé 199" class="cls-1" d="M22.13,30.5H1.87A1.36,1.36,0,0,1,.5,29.14V1.86A1.36,1.36,0,0,1,1.87.5h15L23.5,7.15v22a1.36,1.36,0,0,1-1.37,1.36Z"/><path id="Tracé_200" data-name="Tracé 200" class="cls-1" d="M23.5,7.15H18.2a1.37,1.37,0,0,1-1.37-1.36h0V.5Z"/></g><g id="icone-gear-PMI"><g id="Groupe_120" data-name="Groupe 120"><g id="Groupe_125" data-name="Groupe 125"><path id="Tracé_204" data-name="Tracé 204" class="cls-2" d="M10.21,12.47a5.75,5.75,0,0,0-1.71,1L7.18,12.7l-1.8,3.12,1.31.76a5.44,5.44,0,0,0,0,2l-1.31.75,1.8,3.12,1.32-.75a5.94,5.94,0,0,0,1.71,1v1.52h3.6V22.65a5.76,5.76,0,0,0,1.7-1l1.31.75,1.8-3.12-1.31-.75a5.52,5.52,0,0,0,.09-1,5.33,5.33,0,0,0-.09-1l1.31-.76-1.8-3.12-1.3.76a5.7,5.7,0,0,0-1.7-1V10.83h-3.6Z"/><circle id="Ellipse_18" data-name="Ellipse 18" class="cls-2" cx="12" cy="17.56" r="2.38"/></g></g></g></svg>
diff --git a/resources/views/pages/product-detail.blade.php b/resources/views/pages/product-detail.blade.php
index 25f660a..a3c5951 100644
--- a/resources/views/pages/product-detail.blade.php
+++ b/resources/views/pages/product-detail.blade.php
@@ -79,7 +79,8 @@
                         @foreach($product->getEntity()->getDocuments() as $document)
                             <li>
                                 <a href="{{ $document['media']->getUrl() }}" target="_blank"
-                                   class="flex items-center text-grey-dark hover:text-primary">
+                                   data-tooltip="{{$document['tooltip']}}"
+                                   class="inline-flex items-center text-grey-dark hover:text-primary">
                                     <img class="mr-4 mb-2"
                                          src="{{asset('images/product-details/icon-'.$document['type'].'.svg')}}"
                                          alt="{{__('Icône %s',[$document['type']])}}">
-- 
2.39.5