From 5a019b2c92e13d948253c1ade286c529d801baf9 Mon Sep 17 00:00:00 2001 From: "George Frederick \"Buzz\" Beurling" Date: Sun, 21 Jun 2020 11:30:00 -0400 Subject: [PATCH] Update Message UI in Admin Dashboard --- public/css/custom.css | 2 +- resources/custom.css | 2 +- resources/views/admin/news/index.blade.php | 8 ++ resources/views/layouts/public/news.blade.php | 3 + resources/views/public/allnews.blade.php | 3 + resources/views/public/news.blade.php | 87 ++++++++++--------- 6 files changed, 64 insertions(+), 41 deletions(-) diff --git a/public/css/custom.css b/public/css/custom.css index 95a7c45a..c93b16c7 100644 --- a/public/css/custom.css +++ b/public/css/custom.css @@ -169,7 +169,7 @@ } .news-tags { - height: 1.5rem; + height: 2.8rem; } .news-body-small { diff --git a/resources/custom.css b/resources/custom.css index 95a7c45a..c93b16c7 100644 --- a/resources/custom.css +++ b/resources/custom.css @@ -169,7 +169,7 @@ } .news-tags { - height: 1.5rem; + height: 2.8rem; } .news-body-small { diff --git a/resources/views/admin/news/index.blade.php b/resources/views/admin/news/index.blade.php index ec5ff447..a665e588 100644 --- a/resources/views/admin/news/index.blade.php +++ b/resources/views/admin/news/index.blade.php @@ -36,6 +36,9 @@ @endif @endforeach @endif + @if($n->files != [""] && isset($n->files)) + Fichier joint + @endif @if($n->publish == 0) Brouillon @endif

@@ -44,6 +47,11 @@
+ @if(!isset($n->event_id)) +   Afficher + @else +   Afficher + @endif @if(\Auth::user()->p('news_edit') == 1 && !isset($n->event_id))   Modifier @else diff --git a/resources/views/layouts/public/news.blade.php b/resources/views/layouts/public/news.blade.php index 0801003e..7c7c0996 100644 --- a/resources/views/layouts/public/news.blade.php +++ b/resources/views/layouts/public/news.blade.php @@ -22,6 +22,9 @@ @endif @endforeach @endif + @if($new->files != [""] && isset($new->files)) + Fichier joint + @endif
event_id)) diff --git a/resources/views/public/allnews.blade.php b/resources/views/public/allnews.blade.php index b0c42fa7..7033869c 100644 --- a/resources/views/public/allnews.blade.php +++ b/resources/views/public/allnews.blade.php @@ -37,6 +37,9 @@ @endif @endforeach @endif + @if($new->files != [""]) + Fichier joint + @endif
event_id)) diff --git a/resources/views/public/news.blade.php b/resources/views/public/news.blade.php index 2972b89d..3f657f3a 100644 --- a/resources/views/public/news.blade.php +++ b/resources/views/public/news.blade.php @@ -1,51 +1,60 @@ @extends('layouts.public.main') @section('content') -
-
-

{{ $new->title }}

-
-
-
-
-
-
-
-
- @foreach ($new->pictures as $picture) - - @endforeach +
+
+
+
+
+
+
+
+

{{ $new->title }}

+
-

- {!! $new->body !!} -

- {{ \App\User::find($new->user_id)->fullname()}}, {{ $new->created_at }} -
- @if($new->tags != []) - @foreach($new->tags as $tag) - @if($tag == "Important") - {{$tag}} - @else - {{$tag}} - @endif +
+
+ @foreach ($new->pictures as $picture) +
first) + class="col-12" + @else + class="col-4" + @endif> + {{ $picture->title }} +
@endforeach - @endif -
-
- @foreach($new->files as $file) -
{{$file}}
 - @endforeach +
+

+ {!! $new->body !!} +

+ {{ \App\User::find($new->user_id)->fullname()}}, {{ $new->created_at }} +
+ @if($new->tags != []) + @foreach($new->tags as $tag) + @if($tag == "Important") + {{$tag}} + @else + {{$tag}} + @endif + @endforeach + @endif + @if($new->files != [""] && isset($new->files)) + Fichier joint + @endif +
+
+ @if($new->files != [""] && isset($new->files)) + @foreach($new->files as $file) +
{{$file}}
 + @endforeach + @endif +
+ Retour
- Retour
+
@endsection