From e63f78e67b40f6aef254badd24a1b3c8bc603e28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= Date: Wed, 27 Jan 2016 16:07:30 +0100 Subject: [PATCH] FEATURE: add content status and wysiwyg editor --- .../Controllers/Admin/CreateNewStaticPage.php | 12 +++++- .../Resources/views/admin/newForm.blade.php | 43 +++++++++++++------ .../js/vendor/trumbowyg/ui/trumbowyg.css | 4 +- 3 files changed, 42 insertions(+), 17 deletions(-) diff --git a/modules/StaticPages/Http/Controllers/Admin/CreateNewStaticPage.php b/modules/StaticPages/Http/Controllers/Admin/CreateNewStaticPage.php index 995d2b97..15719ada 100644 --- a/modules/StaticPages/Http/Controllers/Admin/CreateNewStaticPage.php +++ b/modules/StaticPages/Http/Controllers/Admin/CreateNewStaticPage.php @@ -1,6 +1,7 @@ []]); + $statuses = ContentStatuses::getWithTranslations(); + + // we do not want to create deleted page + unset($statuses[Content::STATUS_DELETED]); + + // render view + return view('staticpages::admin.new', [ + 'contentStatuses' => $statuses, + 'selectedStatus' => Content::STATUS_DRAFT + ]); } /** diff --git a/modules/StaticPages/Resources/views/admin/newForm.blade.php b/modules/StaticPages/Resources/views/admin/newForm.blade.php index f0ecad59..90978b09 100644 --- a/modules/StaticPages/Resources/views/admin/newForm.blade.php +++ b/modules/StaticPages/Resources/views/admin/newForm.blade.php @@ -48,10 +48,24 @@
- +
+ +
+
+ +
+
@@ -100,22 +114,23 @@
-
-
- -
-
-
+ - \ No newline at end of file +@section('head_stylesheets') + +@stop + +@section('javascripts') + + + +@stop \ No newline at end of file diff --git a/resources/assets/js/vendor/trumbowyg/ui/trumbowyg.css b/resources/assets/js/vendor/trumbowyg/ui/trumbowyg.css index bac67eb0..0a35cd76 100644 --- a/resources/assets/js/vendor/trumbowyg/ui/trumbowyg.css +++ b/resources/assets/js/vendor/trumbowyg/ui/trumbowyg.css @@ -21,9 +21,9 @@ display: block; position: relative; border: 1px solid #DDD; - width: 96%; + width: 100%; min-height: 300px; - margin: 17px auto; } + } .trumbowyg-box .trumbowyg-editor { margin: 0 auto; }