minicms/core
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev' into user_management

Browse Source
This commit is contained in:
Michal Kváček
2016-01-29 12:27:03 +01:00
parent f262be1dcb 780ee89d21
commit 0216d923d4
156 changed files with 6753 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/admin/customFields/editForm.blade.php
+2 -2
View File
@@ -43,7 +43,7 @@
<select name="type" disabled>
@foreach($types as $type => $translation)
<option value="{{$type}}"@if($field->type_id == $type) selected @endif>@lang($translation)</option>
<option value="{{$type}}"@if($field->type_id == $type) selected @endif>{{$translation}}</option>
@endforeach
</select>
@@ -59,7 +59,7 @@
<select name="resource" disabled>
@foreach($resources as $resource => $translation)
<option value="{{$resource}}"@if($field->resource_id == $resource) selected @endif>@lang($translation)</option>
<option value="{{$resource}}"@if($field->resource_id == $resource) selected @endif>{{$translation}}</option>
@endforeach
</select>
resources/views/admin/customFields/newForm.blade.php
+2 -2
View File
@@ -31,7 +31,7 @@
<select name="type">
@foreach($types as $type => $translation)
<option value="{{$type}}"@if(old('type') == $type) selected @endif>@lang($translation)</option>
<option value="{{$type}}"@if(old('type') == $type) selected @endif>{{$translation}}</option>
@endforeach
</select>
@@ -47,7 +47,7 @@
<select name="resource">
@foreach($resources as $resource => $translation)
<option value="{{$resource}}"@if(old('resource') == $resource) selected @endif>@lang($translation)</option>
<option value="{{$resource}}"@if(old('resource') == $resource) selected @endif>{{$translation}}</option>
@endforeach
</select>