Merge branch 'dev' into test.customwristbands.cz

This commit is contained in:
Michal Kváček
2016-04-08 14:14:40 +02:00
19 changed files with 282 additions and 86 deletions
+2 -2
View File
@@ -1,11 +1,11 @@
@extends('admin.layout')
@section('pageName', @trans('admin/contents.edit', ['name' => $page->title]))
@section('pageName', @trans('admin/contents.edit', ['name' => e($page->title)]))
@section('content')
<div class="row">
<h2>@lang('admin/contents.edit', ['name' => $page->title])</h2>
<h2>@lang('admin/contents.edit', ['name' => e($page->title)])</h2>
</div>
<div class="row">
@@ -29,9 +29,5 @@
</form>
@section('javascripts')
<script src="{{asset('/resources/assets/js/vendor/ckeditor/ckeditor.js')}}"></script>
<script type="application/javascript">
CKEDITOR.replace ('pageContent');
</script>
@include('admin.snippets.ckEditor', ['textareaId' => 'pageContent'])
@stop
@@ -23,9 +23,5 @@
</form>
@section('javascripts')
<script src="{{asset('/resources/assets/js/vendor/ckeditor/ckeditor.js')}}"></script>
<script type="application/javascript">
CKEDITOR.replace ('pageContent');
</script>
@include('admin.snippets.ckEditor', ['textareaId' => 'pageContent'])
@stop
@@ -0,0 +1,26 @@
<script src="{{asset('/resources/assets/js/vendor/ckeditor/ckeditor.js')}}"></script>
<script type="application/javascript">
CKEDITOR.replace ('{{$textareaId}}', {
uiColor: "#F5F5F5",
forcePasteAsPlainText: true,
entities: false,
basicEntities: false,
entities_greek: false,
entities_latin: false,
removePlugins: 'elementspath,about,scayt',
extraPlugins: 'justify',
toolbarGroups: [
{name: 'undo', groups: ['undo']},
{name: 'styles'},
{name: 'basicstyles', groups: ['basicstyles', 'cleanup']},
{name: 'paragraph', groups: ['list', 'indent', 'align', 'blocks']},
{name: 'links'},
{name: 'editing', groups: ['find', 'selection']},
{name: 'insert'},
{name: 'forms'},
{name: 'document', groups: ['mode', 'document', 'doctools']},
{name: 'tools'}
]
});
</script>