From 9e488d21360f16f7bcc1becb3233a326a9199b60 Mon Sep 17 00:00:00 2001
From: Davide Porrovecchio <pdavide@gmail.com>
Date: Sat, 30 Oct 2021 12:49:00 +0200
Subject: [PATCH 1/5] Fix return type

---
 app/Http/Controllers/WidgetsController.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/WidgetsController.php b/app/Http/Controllers/WidgetsController.php
index e1f4966d7..04f64eca4 100644
--- a/app/Http/Controllers/WidgetsController.php
+++ b/app/Http/Controllers/WidgetsController.php
@@ -7,6 +7,7 @@
 use App\Models\PublicAdministration;
 use App\Models\Website;
 use App\Traits\HasRoleAwareUrls;
+use Illuminate\Http\RedirectResponse;
 use Illuminate\View\View;
 use Symfony\Component\Yaml\Yaml;
 
@@ -28,9 +29,9 @@ public function __construct()
      * @param Website $website The website
      * @param PublicAdministration $publicAdministration The PublicAdministration
      *
-     * @return View The view
+     * @return View|RedirectResponse The view or a redirect response
      */
-    public function index(Website $website, PublicAdministration $publicAdministration): View
+    public function index(Website $website, PublicAdministration $publicAdministration)
     {
         $publicAdministration = auth()->user()->can(UserPermission::ACCESS_ADMIN_AREA)
             ? $publicAdministration

From 5cfd271a00fca016f7a77b8c10317c009fd2ffb7 Mon Sep 17 00:00:00 2001
From: Davide Porrovecchio <pdavide@gmail.com>
Date: Sat, 30 Oct 2021 12:52:38 +0200
Subject: [PATCH 2/5] Update user message for site not active

---
 app/Http/Controllers/WidgetsController.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/WidgetsController.php b/app/Http/Controllers/WidgetsController.php
index 04f64eca4..d495d3cc8 100644
--- a/app/Http/Controllers/WidgetsController.php
+++ b/app/Http/Controllers/WidgetsController.php
@@ -39,12 +39,13 @@ public function index(Website $website, PublicAdministration $publicAdministrati
 
         if ($website->status->is(WebsiteStatus::PENDING)) {
             $redirectUrl = $this->getRoleAwareUrl('websites.show', ['website' => $website], $publicAdministration);
-            $name = $website->name;
 
             return redirect()->to($redirectUrl)->withNotification([
-                'title' => __('Errore'),
-                'message' => __("Attiva il sito '$name' prima di accedere all'anteprima dei widget."),
-                'status' => 'error',
+                'title' => __('sito non attivo'),
+                'message' => __("Attiva il sito <b>:site</b> prima di accedere all'anteprima dei widget.", [
+                    'site' => $website->name
+                ]),
+                'status' => 'warning',
                 'icon' => 'it-close-circle',
             ]);
         }

From 30fbfdff55131e955d722ee143ba280a1d335c99 Mon Sep 17 00:00:00 2001
From: Davide Porrovecchio <pdavide@gmail.com>
Date: Sat, 30 Oct 2021 12:52:54 +0200
Subject: [PATCH 3/5] Update widget preview description

---
 resources/views/pages/widgets-preview.blade.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/resources/views/pages/widgets-preview.blade.php b/resources/views/pages/widgets-preview.blade.php
index fe76f8701..87052e093 100644
--- a/resources/views/pages/widgets-preview.blade.php
+++ b/resources/views/pages/widgets-preview.blade.php
@@ -41,9 +41,11 @@
                                         ]) !!}
                                     @endif
                                     <br><br>
-                                    {!! __("È possibile modificare i parametri in URL secondo le proprie esigenze,
+                                    {{ __("I dati visualizzati si riferiscono al mese precedente.") }}
+                                    <br><br>
+                                    {{ __("È possibile modificare i parametri in URL secondo le proprie esigenze,
                                         tuttavia si consiglia di mantentere l'impostazione predefinita per garantire
-                                        la disponibilità dei dati.") !!}
+                                        la disponibilità dei dati.") }}
                                 </div>
                             </div>
                         </div>

From cf7d69970d97247f97b29bca54bce5350b2eb9c3 Mon Sep 17 00:00:00 2001
From: Davide Porrovecchio <pdavide@gmail.com>
Date: Sat, 30 Oct 2021 12:53:17 +0200
Subject: [PATCH 4/5] Bump version

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 896fe6f81..06464a8c7 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "italia/wai-portal",
     "description": "Web Analytics Italia",
-    "version": "2.1.3-beta",
+    "version": "2.1.4-beta",
     "keywords": ["analytics", "italia"],
     "license": "AGPL-3.0-or-later",
     "type": "project",

From ba0ecd3e768a2f6e108a0d265fe2273ee03ef6a7 Mon Sep 17 00:00:00 2001
From: Davide Porrovecchio <pdavide@gmail.com>
Date: Sat, 30 Oct 2021 12:55:55 +0200
Subject: [PATCH 5/5] Fix style

---
 app/Http/Controllers/WidgetsController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/WidgetsController.php b/app/Http/Controllers/WidgetsController.php
index d495d3cc8..487b47329 100644
--- a/app/Http/Controllers/WidgetsController.php
+++ b/app/Http/Controllers/WidgetsController.php
@@ -43,7 +43,7 @@ public function index(Website $website, PublicAdministration $publicAdministrati
             return redirect()->to($redirectUrl)->withNotification([
                 'title' => __('sito non attivo'),
                 'message' => __("Attiva il sito <b>:site</b> prima di accedere all'anteprima dei widget.", [
-                    'site' => $website->name
+                    'site' => $website->name,
                 ]),
                 'status' => 'warning',
                 'icon' => 'it-close-circle',