From 7d051d1f6a222e3b24b8d85f5016fd16ce89fae2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= Date: Wed, 21 Sep 2016 00:58:03 +0200 Subject: [PATCH] FEATURE: make templates not-editable --- app/Http/Controllers/Admin/EditTemplate.php | 2 +- app/Http/Requests/EditTemplateRequest.php | 3 +-- .../views/admin/templates/editForm.blade.php | 20 ++++++++++++------- .../admin/templates/templatesTiles.blade.php | 20 ++++++++++--------- 4 files changed, 26 insertions(+), 19 deletions(-) diff --git a/app/Http/Controllers/Admin/EditTemplate.php b/app/Http/Controllers/Admin/EditTemplate.php index e7995dc5..d5256c01 100644 --- a/app/Http/Controllers/Admin/EditTemplate.php +++ b/app/Http/Controllers/Admin/EditTemplate.php @@ -89,7 +89,7 @@ class EditTemplate extends Controller } // save new content only if something was changed - if ($this->isContentDifferent($originalTemplate, $customTemplate, $request->templateContent)) { + if ($template->editable && $this->isContentDifferent($originalTemplate, $customTemplate, $request->templateContent)) { // create directory for custom updates if (!is_dir($customDir)) { diff --git a/app/Http/Requests/EditTemplateRequest.php b/app/Http/Requests/EditTemplateRequest.php index 63b35b07..aedf05af 100644 --- a/app/Http/Requests/EditTemplateRequest.php +++ b/app/Http/Requests/EditTemplateRequest.php @@ -12,8 +12,7 @@ class EditTemplateRequest extends Request public function rules() { return [ - 'name' => 'required|max:128', - 'templateContent' => 'required' + 'name' => 'required|max:128', ]; } } diff --git a/resources/views/admin/templates/editForm.blade.php b/resources/views/admin/templates/editForm.blade.php index 7c506a00..a71377d9 100644 --- a/resources/views/admin/templates/editForm.blade.php +++ b/resources/views/admin/templates/editForm.blade.php @@ -8,13 +8,19 @@ {!! csrf_field() !!}
- @include('admin.snippets.aceEditor', [ - 'value' => old('templateContent', $templateContent), - 'theme' => 'xcode', - 'mode' => 'html', - 'name' => 'templateContent', - 'rows' => '20' - ]) + @if($template->editable) + @include('admin.snippets.aceEditor', [ + 'value' => old('templateContent', $templateContent), + 'theme' => 'xcode', + 'mode' => 'html', + 'name' => 'templateContent', + 'rows' => '20' + ]) + @else + +
{{$templateContent}}
+
+ @endif
diff --git a/resources/views/admin/templates/templatesTiles.blade.php b/resources/views/admin/templates/templatesTiles.blade.php index 5a28b8d2..9d9761f2 100644 --- a/resources/views/admin/templates/templatesTiles.blade.php +++ b/resources/views/admin/templates/templatesTiles.blade.php @@ -1,33 +1,35 @@
@forelse($templates as $template)
-
+
{{str_limit($template->name, 15)}}
-
+
{{str_limit($template->description, 150)}}
@if($isWritable) @else - @endif - - @if ($template->editable) - + @if ($template->editable) + + @else + + @endif + - @endif
@empty