From a459bc002af0b2032d27322147a297cf337e2d2b Mon Sep 17 00:00:00 2001
From: Andy Heathershaw <andy@andys.eu>
Date: Mon, 4 Sep 2017 21:05:35 +0100
Subject: [PATCH] #23: Multi-lines in album descriptions are now displayed
 correctly

---
 resources/views/themes/base/admin/show_album.blade.php       | 5 ++---
 resources/views/themes/base/gallery/album_default.blade.php  | 2 +-
 .../views/themes/base/gallery/album_slideshow.blade.php      | 2 +-
 resources/views/themes/base/gallery/index.blade.php          | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/resources/views/themes/base/admin/show_album.blade.php b/resources/views/themes/base/admin/show_album.blade.php
index 28b19e0..fb5189e 100644
--- a/resources/views/themes/base/admin/show_album.blade.php
+++ b/resources/views/themes/base/admin/show_album.blade.php
@@ -15,10 +15,9 @@
                 <a class="pull-right btn btn-secondary" href="{{ $album->url() }}" target="_blank"><i class="fa fa-fw fa-eye"></i> @lang('admin.open_album')</a>
 
                 <h1 class="page-title">{{ $album->name }}</h1>
-                <p>{{ $album->description }}</p>
-                <hr/>
+                <p>{!! nl2br(e($album->description)) !!}</p>
 
-                <div>
+                <div class="mt-4">
                     <ul class="nav nav-tabs" role="tablist">
                         @include(Theme::viewName('partials.tab'), ['tab_name' => 'photos', 'tab_icon' => 'photo', 'tab_text' => trans('admin.album_photos_tab')])
                         @can('upload-photos', $album)
diff --git a/resources/views/themes/base/gallery/album_default.blade.php b/resources/views/themes/base/gallery/album_default.blade.php
index 8c96766..ade9ba3 100644
--- a/resources/views/themes/base/gallery/album_default.blade.php
+++ b/resources/views/themes/base/gallery/album_default.blade.php
@@ -23,7 +23,7 @@
                 </div>
 
                 <h1 class="page-title">{{ $album->name }}</h1>
-                <p>{{ $album->description }}</p>
+                <p>{!! nl2br(e($album->description)) !!}</p>
                 <div class="clearfix"><!-- --></div>
                 <hr/>
             </div>
diff --git a/resources/views/themes/base/gallery/album_slideshow.blade.php b/resources/views/themes/base/gallery/album_slideshow.blade.php
index 8402eca..e6f52c4 100644
--- a/resources/views/themes/base/gallery/album_slideshow.blade.php
+++ b/resources/views/themes/base/gallery/album_slideshow.blade.php
@@ -21,7 +21,7 @@
             </div>
 
             <h1 class="page-title">{{ $album->name }}</h1>
-            <p>{{ $album->description }}</p>
+            <p>{!! nl2br(e($album->description)) !!}</p>
             <div class="clearfix"><!-- --></div>
             <hr/>
         </div>
diff --git a/resources/views/themes/base/gallery/index.blade.php b/resources/views/themes/base/gallery/index.blade.php
index 2dee24a..b7b590b 100644
--- a/resources/views/themes/base/gallery/index.blade.php
+++ b/resources/views/themes/base/gallery/index.blade.php
@@ -13,7 +13,7 @@
                                     <a href="{{ $album->url() }}"><img class="card-img-top" src="{{ $album->thumbnailUrl('preview') }}"/></a>
                                     <div class="card-body">
                                         <h4 class="card-title"><a href="{{ $album->url() }}">{{ $album->name }}</a></h4>
-                                        <p class="card-text">{{ $album->description }}</p>
+                                        <p class="card-text">{!! nl2br(e($album->description)) !!}</p>
 
                                         @can('edit', $album)
                                             <a href="{{ route('albums.show', ['id' => $album->id]) }}" class="card-link">@lang('gallery.manage_album_link')</a>