aheathershaw/blue-twilight
1
0
Fork 0
Code Issues 32 Pull Requests Releases 15 Wiki Activity

#23: Multi-lines in album descriptions are now displayed correctly

Browse Source
This commit is contained in:
Andy Heathershaw 2017-09-04 21:05:35 +01:00
parent 86954effbf
commit a459bc002a
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
resources/views/themes/base/admin/show_album.blade.php
View File

@ -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> <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> <h1 class="page-title">{{ $album->name }}</h1>
<p>{{ $album->description }}</p> <p>{!! nl2br(e($album->description)) !!}</p>
<hr/>
<div> <div class="mt-4">
<ul class="nav nav-tabs" role="tablist"> <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')]) @include(Theme::viewName('partials.tab'), ['tab_name' => 'photos', 'tab_icon' => 'photo', 'tab_text' => trans('admin.album_photos_tab')])
@can('upload-photos', $album) @can('upload-photos', $album)

2
resources/views/themes/base/gallery/album_default.blade.php
View File

@ -23,7 +23,7 @@
</div> </div>
<h1 class="page-title">{{ $album->name }}</h1> <h1 class="page-title">{{ $album->name }}</h1>
<p>{{ $album->description }}</p> <p>{!! nl2br(e($album->description)) !!}</p>
<div class="clearfix"><!-- --></div> <div class="clearfix"><!-- --></div>
<hr/> <hr/>
</div> </div>

2
resources/views/themes/base/gallery/album_slideshow.blade.php
View File

@ -21,7 +21,7 @@
</div> </div>
<h1 class="page-title">{{ $album->name }}</h1> <h1 class="page-title">{{ $album->name }}</h1>
<p>{{ $album->description }}</p> <p>{!! nl2br(e($album->description)) !!}</p>
<div class="clearfix"><!-- --></div> <div class="clearfix"><!-- --></div>
<hr/> <hr/>
</div> </div>

2
resources/views/themes/base/gallery/index.blade.php
View File

@ -13,7 +13,7 @@
<a href="{{ $album->url() }}"><img class="card-img-top" src="{{ $album->thumbnailUrl('preview') }}"/></a> <a href="{{ $album->url() }}"><img class="card-img-top" src="{{ $album->thumbnailUrl('preview') }}"/></a>
<div class="card-body"> <div class="card-body">
<h4 class="card-title"><a href="{{ $album->url() }}">{{ $album->name }}</a></h4> <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) @can('edit', $album)
<a href="{{ route('albums.show', ['id' => $album->id]) }}" class="card-link">@lang('gallery.manage_album_link')</a> <a href="{{ route('albums.show', ['id' => $album->id]) }}" class="card-link">@lang('gallery.manage_album_link')</a>