Skip to content

Commit 09dd61b

Browse files
committed
Tinymce added & form changes
1 parent 1fdcaa5 commit 09dd61b

File tree

8 files changed

+49
-44
lines changed

8 files changed

+49
-44
lines changed

publish/resources/crud-generator/views/html/form-fields/wrap-field.blade.stub

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<div class="form-group {{ $errors->has('%1$s') ? 'has-error' : ''}}">
2-
<label for="%1$s" class="col-md-4 control-label">{{ %2$s }}</label>
3-
<div class="col-md-6">
1+
<div class="form-group row{{ $errors->has('%1$s') ? 'has-error' : ''}}">
2+
<label for="%1$s" class="col-md-2 control-label">{{ %2$s }}</label>
3+
<div class="col-md-10">
44
%3$s
55
{!! $errors->first('%1$s', '<p class="help-block">:message</p>') !!}
66
</div>
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
%%formFieldsHtml%%
22

3-
<div class="form-group">
4-
<div class="col-md-offset-4 col-md-4">
3+
<div class="form-group row">
4+
<div class="col-md-offset-2 col-md-10">
55
<input class="btn btn-primary" type="submit" value="{{ $formMode === 'edit' ? 'Update' : 'Create' }}">
66
</div>
77
</div>

publish/resources/crud-generator/views/laravelcollective/form-fields/wrap-field.blade.stub

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<div class="form-group {{ $errors->has('%1$s') ? 'has-error' : ''}}">
2-
{!! Form::label('%1$s', %2$s, ['class' => 'col-md-4 control-label']) !!}
3-
<div class="col-md-6">
1+
<div class="form-group row{{ $errors->has('%1$s') ? 'has-error' : ''}}">
2+
{!! Form::label('%1$s', %2$s, ['class' => 'col-md-2 control-label']) !!}
3+
<div class="col-md-10">
44
%3$s
55
{!! $errors->first('%1$s', '<p class="help-block">:message</p>') !!}
66
</div>
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
%%formFieldsHtml%%
22

3-
<div class="form-group">
4-
<div class="col-md-offset-4 col-md-4">
3+
<div class="form-group row">
4+
<div class="col-md-offset-2 col-md-10">
55
{!! Form::submit($formMode === 'edit' ? 'Update' : 'Create', ['class' => 'btn btn-primary']) !!}
66
</div>
77
</div>
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
<div class="form-group{{ $errors->has('name') ? ' has-error' : ''}}">
2-
{!! Form::label('name', 'Name: ', ['class' => 'col-md-4 control-label']) !!}
3-
<div class="col-md-6">
1+
<div class="form-group row{{ $errors->has('name') ? ' has-error' : ''}}">
2+
{!! Form::label('name', 'Name: ', ['class' => 'col-md-2 control-label']) !!}
3+
<div class="col-md-10">
44
{!! Form::text('name', null, ['class' => 'form-control', 'required' => 'required']) !!}
55
{!! $errors->first('name', '<p class="help-block">:message</p>') !!}
66
</div>
77
</div>
8-
<div class="form-group{{ $errors->has('label') ? ' has-error' : ''}}">
9-
{!! Form::label('label', 'Label: ', ['class' => 'col-md-4 control-label']) !!}
10-
<div class="col-md-6">
8+
<div class="form-group row{{ $errors->has('label') ? ' has-error' : ''}}">
9+
{!! Form::label('label', 'Label: ', ['class' => 'col-md-2 control-label']) !!}
10+
<div class="col-md-10">
1111
{!! Form::text('label', null, ['class' => 'form-control']) !!}
1212
{!! $errors->first('label', '<p class="help-block">:message</p>') !!}
1313
</div>
1414
</div>
15-
<div class="form-group">
16-
<div class="col-md-offset-4 col-md-4">
15+
<div class="form-group row">
16+
<div class="col-md-offset-2 col-md-10">
1717
{!! Form::submit($formMode === 'edit' ? 'Update' : 'Create', ['class' => 'btn btn-primary']) !!}
1818
</div>
1919
</div>
Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
<div class="form-group{{ $errors->has('name') ? ' has-error' : ''}}">
2-
{!! Form::label('name', 'Name: ', ['class' => 'col-md-4 control-label']) !!}
3-
<div class="col-md-6">
1+
<div class="form-group row{{ $errors->has('name') ? ' has-error' : ''}}">
2+
{!! Form::label('name', 'Name: ', ['class' => 'col-md-2 control-label']) !!}
3+
<div class="col-md-10">
44
{!! Form::text('name', null, ['class' => 'form-control', 'required' => 'required']) !!}
55
{!! $errors->first('name', '<p class="help-block">:message</p>') !!}
66
</div>
77
</div>
8-
<div class="form-group{{ $errors->has('label') ? ' has-error' : ''}}">
9-
{!! Form::label('label', 'Label: ', ['class' => 'col-md-4 control-label']) !!}
10-
<div class="col-md-6">
8+
<div class="form-group row{{ $errors->has('label') ? ' has-error' : ''}}">
9+
{!! Form::label('label', 'Label: ', ['class' => 'col-md-2 control-label']) !!}
10+
<div class="col-md-10">
1111
{!! Form::text('label', null, ['class' => 'form-control']) !!}
1212
{!! $errors->first('label', '<p class="help-block">:message</p>') !!}
1313
</div>
1414
</div>
15-
<div class="form-group{{ $errors->has('label') ? ' has-error' : ''}}">
16-
{!! Form::label('label', 'Permissions: ', ['class' => 'col-md-4 control-label']) !!}
17-
<div class="col-md-6">
15+
<div class="form-group row{{ $errors->has('label') ? ' has-error' : ''}}">
16+
{!! Form::label('label', 'Permissions: ', ['class' => 'col-md-2 control-label']) !!}
17+
<div class="col-md-10">
1818
{!! Form::select('permissions[]', $permissions, isset($role) ? $role->permissions->pluck('name') : [], ['class' => 'form-control', 'multiple' => true]) !!}
1919
{!! $errors->first('label', '<p class="help-block">:message</p>') !!}
2020
</div>
2121
</div>
22-
<div class="form-group">
23-
<div class="col-md-offset-4 col-md-4">
22+
<div class="form-group row">
23+
<div class="col-md-offset-2 col-md-10">
2424
{!! Form::submit($formMode === 'edit' ? 'Update' : 'Create', ['class' => 'btn btn-primary']) !!}
2525
</div>
2626
</div>
Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
<div class="form-group{{ $errors->has('name') ? ' has-error' : ''}}">
2-
{!! Form::label('name', 'Name: ', ['class' => 'col-md-4 control-label']) !!}
3-
<div class="col-md-6">
1+
<div class="form-group row{{ $errors->has('name') ? ' has-error' : ''}}">
2+
{!! Form::label('name', 'Name: ', ['class' => 'col-md-2 control-label']) !!}
3+
<div class="col-md-10">
44
{!! Form::text('name', null, ['class' => 'form-control', 'required' => 'required']) !!}
55
{!! $errors->first('name', '<p class="help-block">:message</p>') !!}
66
</div>
77
</div>
8-
<div class="form-group{{ $errors->has('email') ? ' has-error' : ''}}">
9-
{!! Form::label('email', 'Email: ', ['class' => 'col-md-4 control-label']) !!}
10-
<div class="col-md-6">
8+
<div class="form-group row{{ $errors->has('email') ? ' has-error' : ''}}">
9+
{!! Form::label('email', 'Email: ', ['class' => 'col-md-2 control-label']) !!}
10+
<div class="col-md-10">
1111
{!! Form::email('email', null, ['class' => 'form-control', 'required' => 'required']) !!}
1212
{!! $errors->first('email', '<p class="help-block">:message</p>') !!}
1313
</div>
1414
</div>
15-
<div class="form-group{{ $errors->has('password') ? ' has-error' : ''}}">
16-
{!! Form::label('password', 'Password: ', ['class' => 'col-md-4 control-label']) !!}
17-
<div class="col-md-6">
15+
<div class="form-group row{{ $errors->has('password') ? ' has-error' : ''}}">
16+
{!! Form::label('password', 'Password: ', ['class' => 'col-md-2 control-label']) !!}
17+
<div class="col-md-10">
1818
@php
1919
$passwordOptions = ['class' => 'form-control'];
2020
if ($formMode === 'create') {
@@ -25,14 +25,14 @@
2525
{!! $errors->first('password', '<p class="help-block">:message</p>') !!}
2626
</div>
2727
</div>
28-
<div class="form-group{{ $errors->has('roles') ? ' has-error' : ''}}">
29-
{!! Form::label('role', 'Role: ', ['class' => 'col-md-4 control-label']) !!}
30-
<div class="col-md-6">
28+
<div class="form-group row{{ $errors->has('roles') ? ' has-error' : ''}}">
29+
{!! Form::label('role', 'Role: ', ['class' => 'col-md-2 control-label']) !!}
30+
<div class="col-md-10">
3131
{!! Form::select('roles[]', $roles, isset($user_roles) ? $user_roles : [], ['class' => 'form-control', 'multiple' => true]) !!}
3232
</div>
3333
</div>
34-
<div class="form-group">
35-
<div class="col-md-offset-4 col-md-4">
34+
<div class="form-group row">
35+
<div class="col-md-offset-2 col-md-10">
3636
{!! Form::submit($formMode === 'edit' ? 'Update' : 'Create', ['class' => 'btn btn-primary']) !!}
3737
</div>
3838
</div>

publish/resources/views/layouts/backend.blade.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,12 @@
8585

8686
<!-- Scripts -->
8787
<script src="{{ asset('js/app.js') }}"></script>
88-
88+
<script src="https://cdnjs.cloudflare.com/ajax/libs/tinymce/4.8.1/tinymce.min.js"></script>
89+
<script type="text/javascript">
90+
tinymce.init({
91+
selector: '.crud-richtext'
92+
});
93+
</script>
8994
<script type="text/javascript">
9095
$(function () {
9196
// Navigation active

0 commit comments

Comments
 (0)