REFACTORING #1880 @4h30m: another ugly refactoring commit

This commit is contained in:
Michal Kváček
2016-10-25 16:50:04 +02:00
parent 28f67ffe3c
commit cc999dd24e
71 changed files with 827 additions and 608 deletions
@@ -55,11 +55,11 @@
@if($module->support_categories && count($categories))
<div class="col-lg-12">
<select class="form-control" name="category">
<select class="form-control" name="categoryId">
<option value="">@lang('admin/contents.noCategory')</option>
@foreach($categories as $category)
<option value="{{$category->id}}"
@if($category->id == old('category', $page->category_id)) selected @endif>
@if($category->id == old('categoryId', $page->categoryId)) selected @endif>
{{str_repeat(' - ', $category->real_depth)}} {{$category->name}}
</option>
@endforeach
@@ -77,26 +77,26 @@
@lang('contactform::admin/content.email')
</label>
<input class="form-control" type="email" name="email" value="{{$page->module_settings->email or ""}}" />
<input class="form-control" type="email" name="email" value="{{$page->moduleSettings->email or ""}}" />
<label class="label-control">
@lang('contactform::admin/content.phone')
</label>
<input class="form-control" type="tel" name="phone" value="{{$page->module_settings->phone or ""}}" />
<input class="form-control" type="tel" name="phone" value="{{$page->moduleSettings->phone or ""}}" />
<label class="label-control">
@lang('contactform::admin/content.compName')
</label>
<input class="form-control" type="text" name="companyName"
value="{{$page->module_settings->companyName or ""}}" />
value="{{$page->moduleSettings->companyName or ""}}" />
<label class="label-control">
@lang('contactform::admin/content.address')
</label>
<textarea rows="3" class="form-control" name="address">{{$page->module_settings->address or ""}}</textarea>
<textarea rows="3" class="form-control" name="address">{{$page->moduleSettings->address or ""}}</textarea>
</div>
<div class="column col-lg-6">
@@ -105,14 +105,14 @@
</label>
<input class="form-control" type="email" name="contactEmail"
value="{{$page->module_settings->contactEmail or \Auth::user()->email}}" />
value="{{$page->moduleSettings->contactEmail or \Auth::user()->email}}" />
<label class="label-control">
@lang('contactform::admin/content.subject')
</label>
<input class="form-control" type="text" name="subject"
value="{{$page->module_settings->subject or trans('contactform::admin/content.defaultSubject')}}" />
value="{{$page->moduleSettings->subject or trans('contactform::admin/content.defaultSubject')}}" />
<div class="row">
<div class="column col-lg-6">
@@ -120,7 +120,7 @@
@lang('contactform::admin/content.gpsLat')
</label>
<input class="form-control" type="text" value="{{$page->module_settings->gpsLat or ""}}"
<input class="form-control" type="text" value="{{$page->moduleSettings->gpsLat or ""}}"
name="gpsLat" />
</div>
<div class="column col-lg-6">
@@ -128,7 +128,7 @@
@lang('contactform::admin/content.gpsLng')
</label>
<input class="form-control" type="text" value="{{$page->module_settings->gpsLng or ""}}"
<input class="form-control" type="text" value="{{$page->moduleSettings->gpsLng or ""}}"
name="gpsLng" />
</div>
</div>