From f6fd924cbd42674be070ede0d803f80537c063f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= Date: Fri, 19 Aug 2016 13:20:16 +0200 Subject: [PATCH] FEATURE #1435: few smaller UI tweaks in creating new content page --- resources/assets/admin/css/vendor.css | 5 +++++ resources/assets/admin/js/app.js | 4 ++-- resources/lang/en/admin/contents.php | 1 + .../views/admin/content/formParts/appearance.blade.php | 1 - .../admin/content/formParts/basicInformation.blade.php | 2 +- resources/views/admin/content/formParts/files.blade.php | 7 +++++-- resources/views/admin/content/new.blade.php | 9 ++++++++- 7 files changed, 22 insertions(+), 7 deletions(-) diff --git a/resources/assets/admin/css/vendor.css b/resources/assets/admin/css/vendor.css index 5358f701..ac0fd097 100644 --- a/resources/assets/admin/css/vendor.css +++ b/resources/assets/admin/css/vendor.css @@ -13032,4 +13032,9 @@ a:focus { color: #FF4444; font-size: 13px; display: block !important; +} + +.tab-with-error { + color: red !important; + font-weight: bold; } \ No newline at end of file diff --git a/resources/assets/admin/js/app.js b/resources/assets/admin/js/app.js index 5e5bfbe2..faea5bd0 100644 --- a/resources/assets/admin/js/app.js +++ b/resources/assets/admin/js/app.js @@ -1430,13 +1430,13 @@ $ (document).ready (function () { target.val (slugify (source.val (), true)); }); + // find if any error occured and mark tab with that error $('.has-error').each(function () { var error = $(this); var tabCard = error.closest('.tab-pane'); - $("#"+tabCard.prop('id')+"-tab").css('background-color', 'red'); + $("#"+tabCard.prop('id')+"-tab").addClass('tab-with-error'); }); - }); diff --git a/resources/lang/en/admin/contents.php b/resources/lang/en/admin/contents.php index 33a616be..51dc80c3 100644 --- a/resources/lang/en/admin/contents.php +++ b/resources/lang/en/admin/contents.php @@ -47,4 +47,5 @@ return [ 'files' => 'Files', 'lockUrl' => 'Keep URL', 'noCategory' => ' -- No category -- ', + 'noTemplates' => 'Cannot create content page. There are no available templates for this module.' ]; \ No newline at end of file diff --git a/resources/views/admin/content/formParts/appearance.blade.php b/resources/views/admin/content/formParts/appearance.blade.php index 77831836..550e454a 100644 --- a/resources/views/admin/content/formParts/appearance.blade.php +++ b/resources/views/admin/content/formParts/appearance.blade.php @@ -12,7 +12,6 @@ @lang('admin/contents.uploadTitleImage') - Neplatny template @include('admin.snippets.hasError', ['field' => 'titlePhoto']) diff --git a/resources/views/admin/content/formParts/basicInformation.blade.php b/resources/views/admin/content/formParts/basicInformation.blade.php index bff8450a..5efbbf58 100644 --- a/resources/views/admin/content/formParts/basicInformation.blade.php +++ b/resources/views/admin/content/formParts/basicInformation.blade.php @@ -1,6 +1,6 @@
- diff --git a/resources/views/admin/content/formParts/files.blade.php b/resources/views/admin/content/formParts/files.blade.php index 1b6eaa74..991ad2b4 100644 --- a/resources/views/admin/content/formParts/files.blade.php +++ b/resources/views/admin/content/formParts/files.blade.php @@ -4,7 +4,10 @@
    @foreach($page->files as $file) -
  • +
  • + + {{$file->original_filename}} +
  • @endforeach
@@ -15,6 +18,6 @@ @lang('admin/contents.files') - +
\ No newline at end of file diff --git a/resources/views/admin/content/new.blade.php b/resources/views/admin/content/new.blade.php index a3742aa4..896ff7a0 100644 --- a/resources/views/admin/content/new.blade.php +++ b/resources/views/admin/content/new.blade.php @@ -3,6 +3,13 @@ @section('pageHeading', @trans('admin/contents.new', ['name' => $moduleName])) @section('content') + + @if(!count($templates)) +
+ @lang('admin/contents.noTemplates') +
+ @endif +
{!! csrf_field() !!} @@ -10,7 +17,7 @@
-@stop +@endsection @section('javascripts') @include('admin.snippets.ckEditor', ['textareaId' => 'pageContent'])