From 686edf1c6fc83f0d039d287ad5d6b77ea3175ae6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= <michal@binarity.cz>
Date: Wed, 12 Oct 2016 21:22:28 +0200
Subject: [PATCH 1/6] FIX: fix error on comments overview when article was
 deleted

---
 .../Article/Resources/lang/en/comments.php    |  3 ++-
 .../views/admin/comments/overview.blade.php   | 21 +++++++++++++------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/modules/Blog/Article/Resources/lang/en/comments.php b/modules/Blog/Article/Resources/lang/en/comments.php
index 9d8818cd..de5e7301 100644
--- a/modules/Blog/Article/Resources/lang/en/comments.php
+++ b/modules/Blog/Article/Resources/lang/en/comments.php
@@ -5,7 +5,8 @@ return [
     'approve'          => 'Approve comment',
     'approved'         => 'Comment successfully approved',
     'deleted'          => 'Comment deleted',
-    'noComments' => 'No comments available',
+    'unknownArticle'   => 'Unknown article',
+    'noComments'       => 'No comments available',
     'events'           => [
         'names'        => [
             'commentCreated'  => 'Added comment',
diff --git a/modules/Blog/Article/Resources/views/admin/comments/overview.blade.php b/modules/Blog/Article/Resources/views/admin/comments/overview.blade.php
index 61a8c751..d4510791 100644
--- a/modules/Blog/Article/Resources/views/admin/comments/overview.blade.php
+++ b/modules/Blog/Article/Resources/views/admin/comments/overview.blade.php
@@ -21,19 +21,28 @@
                     </p>
                 </div>
                 <div class="card-footer">
-                    @lang('article::comments.createdAt', ['date' => \App\Helpers\Template::date($comment->created_at)]) |
+                    @lang('article::comments.createdAt', ['date' => \App\Helpers\Template::date($comment->created_at)])
+                    |
 
-                    @lang('article::comments.commentedArticle'): <a href="{{route('page.content', ['url' => $comment->article->url])}}" target="_blank">
-                        {{$comment->article->title}}
-                    </a>
+                    @lang('article::comments.commentedArticle'):
+
+                    @if($comment->article)
+                        <a href="{{route('page.content', ['url' => $comment->article->url])}}" target="_blank">
+                            {{$comment->article->title}}
+                        </a>
+                    @else
+                        @lang('article::comments.unknownArticle')
+                    @endif
 
                     <div class="pull-right">
                         @if (!$comment->approved)
-                            <a href="{{route('comments.approve', ['id' => $comment->id])}}" class="btn btn-sm btn-success" title="@lang('article::comments.approve')"
+                            <a href="{{route('comments.approve', ['id' => $comment->id])}}"
+                               class="btn btn-sm btn-success" title="@lang('article::comments.approve')"
                                data-toggle="tooltip"><i class="fa fa-fw fa-check"></i></a>
                         @endif
 
-                        <a href="{{route('comments.delete', ['id' => $comment->id])}}" class="btn btn-sm confirm btn-warning"><i class="fa fa-fw fa-trash"></i></a>
+                        <a href="{{route('comments.delete', ['id' => $comment->id])}}"
+                           class="btn btn-sm confirm btn-warning"><i class="fa fa-fw fa-trash"></i></a>
                     </div>
 
                 </div>

From 98fc287f1085176914242a0187ca4224b3350413 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= <michal@binarity.cz>
Date: Wed, 12 Oct 2016 21:24:27 +0200
Subject: [PATCH 2/6] FIX: remove comments overview from submenu

---
 modules/Blog/Article/Handlers/Article.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/modules/Blog/Article/Handlers/Article.php b/modules/Blog/Article/Handlers/Article.php
index 44f4a1f9..192386d7 100644
--- a/modules/Blog/Article/Handlers/Article.php
+++ b/modules/Blog/Article/Handlers/Article.php
@@ -113,9 +113,7 @@ class Article extends Handler implements ContentTitles
             $sub->route('content.overview', trans('article::article.overview'), ['id' => self::getModuleId()], 30, ['icon' => 'fa fa-fw fa-book']);
         }, 10, ['icon' => 'fa fa-fw fa-book']);
 
-        $blogSubmenu->dropdown(trans('article::module.comments'), function ($sub) {
-            $sub->route('comments.overview', trans('article::module.commentsOverview'), [], 10, ['icon' => 'fa fa-fw fa-commenting-o']);
-        }, 20, ['icon' => 'fa fa-fw fa-comments-o']);
+        $blogSubmenu->route('comments.overview', trans('article::module.commentsOverview'), [], 20, ['icon' => 'fa fa-fw fa-commenting-o']);
     }
 
     public static function getModuleId()

From 84aea5c84770b8774e4ab83a201781aa45705cf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= <michal@binarity.cz>
Date: Thu, 13 Oct 2016 00:58:04 +0200
Subject: [PATCH 3/6] FEATURE: add missing czech translations

---
 .../Blog/Article/Resources/lang/cs/comments.php    |  1 +
 modules/Blog/Article/Resources/lang/cs/module.php  |  1 +
 .../Blog/ArticleList/Resources/lang/cs/module.php  |  1 +
 .../Resources/lang/cs/admin/widgets.php            | 14 ++++++++++++++
 resources/lang/cs/widgets/common.php               | 10 ++++++++++
 5 files changed, 27 insertions(+)
 create mode 100644 modules/ContactForm/Resources/lang/cs/admin/widgets.php
 create mode 100644 resources/lang/cs/widgets/common.php

diff --git a/modules/Blog/Article/Resources/lang/cs/comments.php b/modules/Blog/Article/Resources/lang/cs/comments.php
index 35468658..46b8e530 100644
--- a/modules/Blog/Article/Resources/lang/cs/comments.php
+++ b/modules/Blog/Article/Resources/lang/cs/comments.php
@@ -15,4 +15,5 @@ return [
 ],
 ],
 "noComments" => "Nejsou dostupné žádné komentáře",
+"unknownArticle" => "Nezn�m� �l�nek",
 ];
diff --git a/modules/Blog/Article/Resources/lang/cs/module.php b/modules/Blog/Article/Resources/lang/cs/module.php
index f000fdb7..c854e844 100644
--- a/modules/Blog/Article/Resources/lang/cs/module.php
+++ b/modules/Blog/Article/Resources/lang/cs/module.php
@@ -8,4 +8,5 @@ return [
 "editArticle" => "Upravuji článek",
 "name" => "Články",
 "newArticle" => "Napsat nový článek",
+"templatePath" => "�l�nky",
 ];
diff --git a/modules/Blog/ArticleList/Resources/lang/cs/module.php b/modules/Blog/ArticleList/Resources/lang/cs/module.php
index 8dc56bc6..6f515f48 100644
--- a/modules/Blog/ArticleList/Resources/lang/cs/module.php
+++ b/modules/Blog/ArticleList/Resources/lang/cs/module.php
@@ -2,4 +2,5 @@
 return [
 "description" => "Modul pro zobrazování seznamu článků na webu.",
 "name" => "Seznam článků",
+"templatePath" => "Seznam �l�nk�",
 ];
diff --git a/modules/ContactForm/Resources/lang/cs/admin/widgets.php b/modules/ContactForm/Resources/lang/cs/admin/widgets.php
new file mode 100644
index 00000000..6902a82d
--- /dev/null
+++ b/modules/ContactForm/Resources/lang/cs/admin/widgets.php
@@ -0,0 +1,14 @@
+<?php
+return [
+"address" => ["description" => "Mal� widget ur�en� pro zobrazen� adresy, kter� byla ulo�ena u vybran�ho kontaktn�ho formul��e.",
+"edit" => "Upravuji blok s adresou",
+"name" => "Blok s adresou",
+"new" => "Nov� blok s adresou",
+],
+"form" => ["description" => "Widget pro zobrazen� kontaktn�ho formul��e kdekoliv na webu - v obsahu str�nky, menu, pati�ce, ...",
+"name" => "Kontaktn� formul��",
+"new" => "Nov� widget s kontaktn�m formul��em",
+],
+"noContactForms" => "Vypad� to, �e v syst�mu nebyl vytvo�en ��dn� kontaktn� formul��. Z toho d�vodu nen� mo�n� vytvo�it ani tento widget. Vytvo�te nejprve n�jak� kontaktn� formul�� a pak opakujte tento pokus.",
+"selectContactForm" => "Vybrat kontaktn� formul��",
+];
diff --git a/resources/lang/cs/widgets/common.php b/resources/lang/cs/widgets/common.php
new file mode 100644
index 00000000..454e483f
--- /dev/null
+++ b/resources/lang/cs/widgets/common.php
@@ -0,0 +1,10 @@
+<?php
+return [
+"containerClass" => "HTML t��da pou�it� pro obalov� element widgetu",
+"containerId" => "Unik�tn� ID widgetu (m��e b�t i pr�zdn�)",
+"description" => "Popis",
+"edit" => "Upravuji widget :name",
+"name" => "Jm�no",
+"new" => "Vytvo�it nov� widget",
+"widgetDescription" => "??",
+];

From b7f911c9b8cc62557263934b95f80e097b64fc13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= <michal@binarity.cz>
Date: Thu, 13 Oct 2016 01:06:08 +0200
Subject: [PATCH 4/6] FIX: fix encoding in translations

---
 .../Article/Resources/lang/cs/comments.php    | 35 ++++++++++---------
 .../Blog/Article/Resources/lang/cs/module.php | 18 +++++-----
 .../ArticleList/Resources/lang/cs/module.php  |  6 ++--
 .../Resources/lang/cs/admin/widgets.php       | 24 +++++++------
 resources/lang/cs/widgets/common.php          | 13 ++++---
 5 files changed, 50 insertions(+), 46 deletions(-)

diff --git a/modules/Blog/Article/Resources/lang/cs/comments.php b/modules/Blog/Article/Resources/lang/cs/comments.php
index 46b8e530..fa9aca67 100644
--- a/modules/Blog/Article/Resources/lang/cs/comments.php
+++ b/modules/Blog/Article/Resources/lang/cs/comments.php
@@ -1,19 +1,22 @@
 <?php
 return [
-"approve" => "Schválit komentář a zobrazovat ho u článku",
-"approved" => "Komentář úspěšně schválen",
-"commentedArticle" => "Komentovaný článek",
-"createdAt" => "Vloženo :date",
-"deleted" => "Komentář smazán",
-"events" => ["descriptions" => ["commentApproved" => "Schválen komentář od autora :authro (:email) s následujícím obsahem: :content",
-"commentCreated" => "Přidán komentář od autora :author (e-mail :e-mail) s následujícím obsahem: :content",
-"commentDeleted" => "Smazán komentář od autora :author (:email) s následujícím obsahem: :content",
-],
-"names" => ["commentApproved" => "Komentář schválen",
-"commentCreated" => "Komentář úspěšně přidán.",
-"commentDeleted" => "Smazán komentář",
-],
-],
-"noComments" => "Nejsou dostupné žádné komentáře",
-"unknownArticle" => "Nezn�m� �l�nek",
+    "approve"          => "Schválit komentář a zobrazovat ho u článku",
+    "approved"         => "Komentář úspěšně schválen",
+    "commentedArticle" => "Komentovaný článek",
+    "createdAt"        => "Vloženo :date",
+    "deleted"          => "Komentář smazán",
+    "events"           => [
+        "descriptions" => [
+            "commentApproved" => "Schválen komentář od autora :authro (:email) s následujícím obsahem: :content",
+            "commentCreated"  => "Přidán komentář od autora :author (e-mail :e-mail) s následujícím obsahem: :content",
+            "commentDeleted"  => "Smazán komentář od autora :author (:email) s následujícím obsahem: :content",
+        ],
+        "names"        => [
+            "commentApproved" => "Komentář schválen",
+            "commentCreated"  => "Komentář úspěšně přidán.",
+            "commentDeleted"  => "Smazán komentář",
+        ],
+    ],
+    "noComments"       => "Nejsou dostupné žádné komentáře",
+    "unknownArticle"   => "Neznámý článek",
 ];
diff --git a/modules/Blog/Article/Resources/lang/cs/module.php b/modules/Blog/Article/Resources/lang/cs/module.php
index c854e844..22653cac 100644
--- a/modules/Blog/Article/Resources/lang/cs/module.php
+++ b/modules/Blog/Article/Resources/lang/cs/module.php
@@ -1,12 +1,12 @@
 <?php
 return [
-"allArticles" => "Všechny články",
-"blog" => "Blog",
-"comments" => "Komentáře",
-"commentsOverview" => "Všechny komentáře",
-"description" => "Základní submodul pro blog. Tento modul umožňuje psát články.",
-"editArticle" => "Upravuji článek",
-"name" => "Články",
-"newArticle" => "Napsat nový článek",
-"templatePath" => "�l�nky",
+    "allArticles"      => "Všechny články",
+    "blog"             => "Blog",
+    "comments"         => "Komentáře",
+    "commentsOverview" => "Všechny komentáře",
+    "description"      => "Základní submodul pro blog. Tento modul umožňuje psát články.",
+    "editArticle"      => "Upravuji článek",
+    "name"             => "Články",
+    "newArticle"       => "Napsat nový článek",
+    "templatePath"     => "Články",
 ];
diff --git a/modules/Blog/ArticleList/Resources/lang/cs/module.php b/modules/Blog/ArticleList/Resources/lang/cs/module.php
index 6f515f48..09d24c67 100644
--- a/modules/Blog/ArticleList/Resources/lang/cs/module.php
+++ b/modules/Blog/ArticleList/Resources/lang/cs/module.php
@@ -1,6 +1,6 @@
 <?php
 return [
-"description" => "Modul pro zobrazování seznamu článků na webu.",
-"name" => "Seznam článků",
-"templatePath" => "Seznam �l�nk�",
+    "description"  => "Modul pro zobrazování seznamu článků na webu.",
+    "name"         => "Seznam článků",
+    "templatePath" => "Seznam článků",
 ];
diff --git a/modules/ContactForm/Resources/lang/cs/admin/widgets.php b/modules/ContactForm/Resources/lang/cs/admin/widgets.php
index 6902a82d..9c2f1d09 100644
--- a/modules/ContactForm/Resources/lang/cs/admin/widgets.php
+++ b/modules/ContactForm/Resources/lang/cs/admin/widgets.php
@@ -1,14 +1,16 @@
 <?php
 return [
-"address" => ["description" => "Mal� widget ur�en� pro zobrazen� adresy, kter� byla ulo�ena u vybran�ho kontaktn�ho formul��e.",
-"edit" => "Upravuji blok s adresou",
-"name" => "Blok s adresou",
-"new" => "Nov� blok s adresou",
-],
-"form" => ["description" => "Widget pro zobrazen� kontaktn�ho formul��e kdekoliv na webu - v obsahu str�nky, menu, pati�ce, ...",
-"name" => "Kontaktn� formul��",
-"new" => "Nov� widget s kontaktn�m formul��em",
-],
-"noContactForms" => "Vypad� to, �e v syst�mu nebyl vytvo�en ��dn� kontaktn� formul��. Z toho d�vodu nen� mo�n� vytvo�it ani tento widget. Vytvo�te nejprve n�jak� kontaktn� formul�� a pak opakujte tento pokus.",
-"selectContactForm" => "Vybrat kontaktn� formul��",
+    "address"           => [
+        "description" => "Malý widget určený pro zobrazení adresy, která byla uložena u vybraného kontaktního formuláře.",
+        "edit"        => "Upravuji blok s adresou",
+        "name"        => "Blok s adresou",
+        "new"         => "Nový blok s adresou",
+    ],
+    "form"              => [
+        "description" => "Widget pro zobrazení kontaktního formuláře kdekoliv na webu - v obsahu stránky, menu, patičce, ...",
+        "name"        => "Kontaktní formulář",
+        "new"         => "Nový widget s kontaktním formulářem",
+    ],
+    "noContactForms"    => "Vypadá to, že v systému nebyl vytvořen žádný kontaktní formulář. Z toho důvodu není možné vytvořit ani tento widget. Vytvořte nejprve nějaký kontaktní formulář a pak opakujte tento pokus.",
+    "selectContactForm" => "Vybrat kontaktní formulář",
 ];
diff --git a/resources/lang/cs/widgets/common.php b/resources/lang/cs/widgets/common.php
index 454e483f..5d545038 100644
--- a/resources/lang/cs/widgets/common.php
+++ b/resources/lang/cs/widgets/common.php
@@ -1,10 +1,9 @@
 <?php
 return [
-"containerClass" => "HTML t��da pou�it� pro obalov� element widgetu",
-"containerId" => "Unik�tn� ID widgetu (m��e b�t i pr�zdn�)",
-"description" => "Popis",
-"edit" => "Upravuji widget :name",
-"name" => "Jm�no",
-"new" => "Vytvo�it nov� widget",
-"widgetDescription" => "??",
+    "containerClass" => "HTML třída použitá pro obalový element widgetu",
+    "containerId"    => "Unikátní ID widgetu (může být i prázdné)",
+    "description"    => "Popis",
+    "edit"           => "Upravuji widget :name",
+    "name"           => "Jméno",
+    "new"            => "Vytvořit nový widget"
 ];

From 87f19203732da4c7f85144b46f024707ce999b64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= <michal@binarity.cz>
Date: Thu, 13 Oct 2016 01:14:24 +0200
Subject: [PATCH 5/6] FEATURE: temporarily display large image as thumbnail in
 reference detail

---
 .../views/modules/staticpages/visitor/referenceDetail.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/Binarity/Resources/views/modules/staticpages/visitor/referenceDetail.blade.php b/templates/Binarity/Resources/views/modules/staticpages/visitor/referenceDetail.blade.php
index 8631ea5a..982e9059 100644
--- a/templates/Binarity/Resources/views/modules/staticpages/visitor/referenceDetail.blade.php
+++ b/templates/Binarity/Resources/views/modules/staticpages/visitor/referenceDetail.blade.php
@@ -16,7 +16,7 @@
                 <div class="ref-scr b-invo column xlarge-4 large-4 medium-4 small-6"
                      data-img="@upload($page->title_photo)"
                      data-label="{{$file->description}}">
-                    <img class="thumbnail pointer m-b-26" src="@thumbnail($file->filename)"
+                    <img class="thumbnail pointer m-b-26" src="@upload($file->filename)"
                          alt="{{$file->name}}">
                 </div>
             @endforeach

From 34feaac2acbe24f6047e2a512c9f140d6c550a84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= <michal@binarity.cz>
Date: Tue, 25 Oct 2016 18:04:07 +0200
Subject: [PATCH 6/6] FIX: fix editing menu widget

---
 app/Widgets/Menu/Presenters/Menu.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Widgets/Menu/Presenters/Menu.php b/app/Widgets/Menu/Presenters/Menu.php
index d2edc8e8..e86dd0fc 100644
--- a/app/Widgets/Menu/Presenters/Menu.php
+++ b/app/Widgets/Menu/Presenters/Menu.php
@@ -117,7 +117,7 @@ class Menu implements WidgetRenderer
                          ->get();
 
         // make object from JSON
-        $widget->settingsObj = json_decode($widget->settings);
+        $widget->settingsObj = $widget->settings;
         if (!isset($widget->settingsObj->links)) {
             $links = new \stdClass();
         } else {