Skip to content

Commit e5a4a49

Browse files
xaviqvxaviqv
committed
New classes on horizontal forms
1 parent 1145a33 commit e5a4a49

30 files changed

Lines changed: 208 additions & 234 deletions

‎src/Views/admin/administrator/create.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
@if ($users->isEmpty())
1212
<h3 class="text-center">{{ trans('panichd::admin.administrator-create-no-users') }}</h3>
1313
@else
14-
{!! CollectiveForm::open(['route'=> $setting->grab('admin_route').'.administrator.store', 'method' => 'POST', 'class' => 'form-horizontal']) !!}
14+
{!! CollectiveForm::open(['route'=> $setting->grab('admin_route').'.administrator.store', 'method' => 'POST']) !!}
1515
<div class="card-body">
1616
{{ trans('panichd::admin.administrator-create-select-user') }}
1717
</div>

‎src/Views/admin/agent/form_new.blade.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
$setting->grab('admin_route').'.agent.store'
1313
],
1414
]) !!}
15-
<div class="form-group">
16-
<label for="usuari" class="control-label col-sm-2">{{ trans('panichd::admin.agent-create-form-agent') }}</label>
15+
<div class="form-group row">
16+
<label for="usuari" class="col-form-label col-sm-2">{{ trans('panichd::admin.agent-create-form-agent') }}</label>
1717
<div class="col-sm-10">
1818
<select class="generate_default_select2" style="width: 100%" name="agent_id">
1919
@foreach ($not_agents as $newagent)

‎src/Views/admin/category/create.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
@section('content')
88
<div class="card bg-light">
99
<div class="card-body">
10-
{!! CollectiveForm::open(['route'=> $setting->grab('admin_route').'.category.store', 'method' => 'POST', 'class' => 'form-horizontal']) !!}
10+
{!! CollectiveForm::open(['route'=> $setting->grab('admin_route').'.category.store', 'method' => 'POST']) !!}
1111
<legend>{{ trans('panichd::admin.category-create-title') }}</legend>
1212
@include('panichd::admin.category.form')
1313
@include('panichd::admin.category.modal-email')

‎src/Views/admin/category/edit.blade.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,8 @@
2525
<div class="card-body">
2626
{!! CollectiveForm::model($category, [
2727
'route' => [$setting->grab('admin_route').'.category.update', $category->id],
28-
'method' => 'PATCH',
29-
'class' => 'form-horizontal'
30-
]) !!}
28+
'method' => 'PATCH'
29+
]) !!}
3130
<legend>{{ trans('panichd::admin.category-edit-title', ['name' => ucwords($category->name)]) }}</legend>
3231
@include('panichd::admin.category.form', ['update', true])
3332
@include('panichd::admin.category.modal-email')

‎src/Views/admin/category/form.blade.php‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<div class="row">
22
<div class="col-md-3">
3-
<div class="form-group">
4-
{!! CollectiveForm::label('name', trans('panichd::admin.category-create-name') . trans('panichd::admin.colon'), ['class' => 'col-lg-4 control-label']) !!}
3+
<div class="form-group row">
4+
{!! CollectiveForm::label('name', trans('panichd::admin.category-create-name') . trans('panichd::admin.colon'), ['class' => 'col-lg-4 col-form-label']) !!}
55
<div class="col-lg-8">
66
{!! CollectiveForm::text('name', isset($category) ? $category->name : null, ['class' => 'form-control']) !!}
77
</div>
88
</div>
9-
<div class="form-group">
10-
{!! CollectiveForm::label('color', trans('panichd::admin.category-create-color') . trans('panichd::admin.colon'), ['class' => 'col-lg-4 control-label']) !!}
9+
<div class="form-group row">
10+
{!! CollectiveForm::label('color', trans('panichd::admin.category-create-color') . trans('panichd::admin.colon'), ['class' => 'col-lg-4 col-form-label']) !!}
1111
<div class="col-lg-8 ">
1212
@yield('colorpicker_snippet')
1313
</div>
1414
</div>
15-
<div class="form-group">
16-
<label class="control-label col-lg-4 tooltip-info" data-toggle="tooltip" data-placement="bottom" title="{{ trans('panichd::admin.category-email-from-info') }}">{{ trans('panichd::admin.category-create-email') . trans('panichd::admin.colon') }}<span class="fa fa-question-circle"></span></label>
15+
<div class="form-group row">
16+
<label class="col-form-label col-lg-4 tooltip-info" data-toggle="tooltip" data-placement="bottom" title="{{ trans('panichd::admin.category-email-from-info') }}">{{ trans('panichd::admin.category-create-email') . trans('panichd::admin.colon') }}<span class="fa fa-question-circle"></span></label>
1717
<div class="col-lg-8">
1818
@if (isset($category) && isset($category->email))
1919
@php
@@ -39,8 +39,8 @@
3939
<button type="button" class="btn btn-light btn-sm" id="edit_email" data-toggle="modal" data-target="#email-edit-modal">{{ trans('panichd::admin.btn-edit') }}</button>
4040
</div>
4141
</div>
42-
<div class="form-group">
43-
<label class="control-label col-lg-4 tooltip-info" data-toggle="tooltip" data-placement="bottom" title="{{ trans('panichd::admin.category-create-new-tickets-help') }}">{{ trans('panichd::admin.category-create-new-tickets') . trans('panichd::admin.colon') }}<span class="fa fa-question-circle"></span></label>
42+
<div class="form-group row">
43+
<label class="col-form-label col-lg-4 tooltip-info" data-toggle="tooltip" data-placement="bottom" title="{{ trans('panichd::admin.category-create-new-tickets-help') }}">{{ trans('panichd::admin.category-create-new-tickets') . trans('panichd::admin.colon') }}<span class="fa fa-question-circle"></span></label>
4444
<div class="col-lg-8">
4545
<select name="create_level" class="generate_default_select2" style="display: none; width: 100%">
4646
<?php $levels = [1, 2, 3];
@@ -53,8 +53,8 @@
5353
</div>
5454
</div>
5555
<div class="col-md-9">
56-
<div class="form-group">
57-
<label class="control-label col-sm-2 tooltip-info" data-toggle="tooltip" data-placement="bottom" title="{{ trans('panichd::admin.category-edit-closing-reasons-help') }}">{{ trans('panichd::admin.category-edit-closing-reasons') . trans('panichd::admin.colon') }}<span class="fa fa-question-circle"></span></label>
56+
<div class="form-group row">
57+
<label class="col-form-label col-sm-2 tooltip-info" data-toggle="tooltip" data-placement="bottom" title="{{ trans('panichd::admin.category-edit-closing-reasons-help') }}">{{ trans('panichd::admin.category-edit-closing-reasons') . trans('panichd::admin.colon') }}<span class="fa fa-question-circle"></span></label>
5858
<div class="col-sm-10">
5959
<p><button type="button" class="btn btn-light" id="button_new_reason" data-toggle="modal" data-target="#reason-edit-modal" data-i="new">{{ trans('panichd::admin.btn-create') }}</button></p>
6060

@@ -99,15 +99,15 @@
9999
</div>
100100
</div>
101101

102-
<div class="form-group">
103-
<label class="control-label col-sm-2" for="admin-select2-tags">{{ trans('panichd::admin.category-edit-new-tags') . trans('panichd::admin.colon') }}</label>
102+
<div class="form-group row">
103+
<label class="col-form-label col-sm-2" for="admin-select2-tags">{{ trans('panichd::admin.category-edit-new-tags') . trans('panichd::admin.colon') }}</label>
104104
<div class="col-sm-10">
105105
<select id="admin-select2-tags" class="select2-multiple" name="new_tags[]" multiple="multiple" style="display: none; width: 100%"></select></div>
106106

107107
</div>
108108
@if (isset($category) and $category->has('tags'))
109-
<div class="form-group">
110-
<label class="control-label col-sm-2">{{ trans('panichd::admin.category-edit-current-tags') . trans('panichd::admin.colon') }}</label>
109+
<div class="form-group row">
110+
<label class="col-form-label col-sm-2">{{ trans('panichd::admin.category-edit-current-tags') . trans('panichd::admin.colon') }}</label>
111111
<div class="col-sm-10">
112112
<div id="tag-panel" class="grouped_check_list deletion_list no-border coloured-list pull-left">
113113
@foreach ($category->tags as $i=>$tag)

‎src/Views/admin/category/modal-email.blade.php‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">{{ trans('panichd::lang.flash-x') }}</span></button>
77
</div>
88
<div class="modal-body">
9-
<form action="" class="form-horizontal">
10-
<div class="form-group">
9+
<form action="">
10+
<div class="form-group row">
1111
<div class="col-lg-12">{{ trans('panichd::admin.category-email-from-info') }}
1212
</div>
1313
</div>
1414

15-
<div class="form-group">
16-
{!! CollectiveForm::label('email_scope', trans('panichd::admin.category-email-from') . trans('panichd::admin.colon'), ['class' => 'col-lg-3 control-label']) !!}
15+
<div class="form-group row">
16+
{!! CollectiveForm::label('email_scope', trans('panichd::admin.category-email-from') . trans('panichd::admin.colon'), ['class' => 'col-lg-3 col-form-label']) !!}
1717

1818
<div class="col-lg-9"><label id="email_scope_default">{!! CollectiveForm::radio('email_scope','default', !isset($category) || (isset($category) && $category->email == "") ? true : false) !!} {{ trans('panichd::admin.category-email-default') . trans('panichd::admin.colon') }}</label>
1919
@if ($setting->grab('email.account.mailbox') != 'default' && $setting->grab('email.account.name') != 'default')
@@ -24,15 +24,15 @@
2424

2525
</div>
2626
</div>
27-
<div class="form-group">
27+
<div class="form-group row">
2828
<div class="col-lg-9 col-lg-offset-3">
2929
<label id="email_scope_category">{!! CollectiveForm::radio('email_scope','category', isset($category) && $category->email != "" ? true : false) !!} {{ trans('panichd::admin.category-email-this') . trans('panichd::admin.colon') }}</label>
3030
</div>
3131
</div>
3232

33-
<div class="form-group">
33+
<div class="form-group row">
3434
{!! CollectiveForm::label('email_name', trans('panichd::admin.category-email-name') . trans('panichd::admin.colon'), [
35-
'class' => 'col-sm-2 col-sm-offset-1 col-lg-offset-3 control-label']) !!}
35+
'class' => 'col-sm-2 col-sm-offset-1 col-lg-offset-3 col-form-label']) !!}
3636

3737
<div class="col-sm-9 col-lg-7">{!! CollectiveForm::text('email_name', isset($category) && $category->email_name != "" ? $category->email_name : null, [
3838
'class' => 'form-control jquery_email',
@@ -41,9 +41,9 @@
4141
</div>
4242
</div>
4343

44-
<div class="form-group">
44+
<div class="form-group row">
4545
{!! CollectiveForm::label('email', trans('panichd::admin.category-email') . trans('panichd::admin.colon'), [
46-
'class' => 'col-sm-2 col-sm-offset-1 col-lg-offset-3 control-label']) !!}
46+
'class' => 'col-sm-2 col-sm-offset-1 col-lg-offset-3 col-form-label']) !!}
4747

4848
<div class="col-sm-9 col-lg-7">{!! CollectiveForm::text('email', isset($category) && $category->email != "" ? $category->email : null, [
4949
'class' => 'form-control jquery_email',
@@ -52,13 +52,13 @@
5252
</div>
5353
</div>
5454

55-
<div class="form-group">
55+
<div class="form-group row">
5656
<div class="col-lg-12">{{ trans('panichd::admin.category-email-reply-to-info') }}
5757
</div>
5858
</div>
5959

60-
<div class="form-group">
61-
{!! CollectiveForm::label('email_replies', trans('panichd::admin.category-email-reply-to') . trans('panichd::admin.colon'), ['class' => 'col-lg-3 control-label']) !!}
60+
<div class="form-group row">
61+
{!! CollectiveForm::label('email_replies', trans('panichd::admin.category-email-reply-to') . trans('panichd::admin.colon'), ['class' => 'col-lg-3 col-form-label']) !!}
6262

6363
<div class="col-lg-9"><label id="email_replies_0">{!! CollectiveForm::radio('email_replies',0, !isset($category) || (isset($category) && $category->email_replies != 1) ? true : false) !!} {{ trans('panichd::admin.category-email-default') . trans('panichd::admin.colon') }}</label>
6464
@if ($setting->grab('email.account.mailbox') != 'default' && $setting->grab('email.account.name') != 'default')
@@ -69,7 +69,7 @@
6969

7070
</div>
7171
</div>
72-
<div class="form-group">
72+
<div class="form-group row">
7373
<div class="col-lg-9 col-lg-offset-3">
7474
<label id="email_replies_1">{!! CollectiveForm::radio('email_replies',1, isset($category) && $category->email_replies == 1 ? true : false) !!} {{ trans('panichd::admin.category-email-this') }}</label> ({{ trans('panichd::admin.category-email-reply-this-info') }})
7575
</div>

‎src/Views/admin/category/modal-reason.blade.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
<div class="modal-body">
99

1010

11-
<form action="" class="form-horizontal">
12-
<div class="form-group">
13-
{!! CollectiveForm::label('reason', trans('panichd::admin.category-edit-reason-label') . trans('panichd::admin.colon'), ['class' => 'col-lg-2 control-label']) !!}
11+
<form action="">
12+
<div class="form-group row">
13+
{!! CollectiveForm::label('reason', trans('panichd::admin.category-edit-reason-label') . trans('panichd::admin.colon'), ['class' => 'col-lg-2 col-form-label']) !!}
1414

1515
<div class="col-lg-10">{!! CollectiveForm::text('text', null, [
1616
'id'=>'jquery_popup_reason_text',
@@ -19,8 +19,8 @@
1919
</div>
2020
</div>
2121

22-
<div class="form-group">
23-
{!! CollectiveForm::label('status', trans('panichd::admin.category-edit-reason-status') . trans('panichd::admin.colon'), ['class' => 'col-lg-2 control-label']) !!}
22+
<div class="form-group row">
23+
{!! CollectiveForm::label('status', trans('panichd::admin.category-edit-reason-status') . trans('panichd::admin.colon'), ['class' => 'col-lg-2 col-form-label']) !!}
2424

2525
<div class="col-lg-10">{!! CollectiveForm::select('status_id', $status_lists, $setting->grab('default_close_status_id'), ['id' => 'jquery_popup_select_status', 'class' => 'form-control']) !!}
2626
</div>

‎src/Views/admin/category/modal-tag.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</div>
88
<div class="modal-body">
99
<div class="col-sm-12">
10-
<div class="form-group">
10+
<div class="form-group row">
1111
{!! CollectiveForm::text('name', null, ['id'=>'jquery_popup_tag_input', 'class' => 'form-control', 'required']) !!}
1212
</div>
1313
</div>

‎src/Views/admin/configuration/create.blade.php‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,51 +20,49 @@
2020
</h3>
2121
</div>
2222
<div class="card-body">
23-
<div class="form-horizontal">
24-
{!! CollectiveForm::open(['route' => $setting->grab('admin_route').'.configuration.store']) !!}
23+
{!! CollectiveForm::open(['route' => $setting->grab('admin_route').'.configuration.store']) !!}
2524

2625
<!-- Slug Field -->
27-
<div class="form-group">
28-
{!! CollectiveForm::label('slug', trans('panichd::admin.config-edit-slug') . trans('panichd::admin.colon'), ['class' => 'col-sm-2 control-label']) !!}
26+
<div class="form-group row">
27+
{!! CollectiveForm::label('slug', trans('panichd::admin.config-edit-slug') . trans('panichd::admin.colon'), ['class' => 'col-sm-2 col-form-label']) !!}
2928
<div class="col-sm-9">
3029
{!! CollectiveForm::text('slug', null, ['class' => 'form-control']) !!}
3130
</div>
3231
</div>
3332

3433
<!-- Default Field -->
35-
<div class="form-group">
36-
{!! CollectiveForm::label('default', trans('panichd::admin.config-edit-default') . trans('panichd::admin.colon'), ['class' => 'col-sm-2 control-label']) !!}
34+
<div class="form-group row">
35+
{!! CollectiveForm::label('default', trans('panichd::admin.config-edit-default') . trans('panichd::admin.colon'), ['class' => 'col-sm-2 col-form-label']) !!}
3736
<div class="col-sm-9">
3837
{!! CollectiveForm::text('default', null, ['class' => 'form-control']) !!}
3938
</div>
4039
</div>
4140

4241
<!-- Value Field -->
43-
<div class="form-group">
44-
{!! CollectiveForm::label('value', trans('panichd::admin.config-edit-value') . trans('panichd::admin.colon'), ['class' => 'col-sm-2 control-label']) !!}
42+
<div class="form-group row">
43+
{!! CollectiveForm::label('value', trans('panichd::admin.config-edit-value') . trans('panichd::admin.colon'), ['class' => 'col-sm-2 col-form-label']) !!}
4544
<div class="col-sm-9">
4645
{!! CollectiveForm::text('value', null, ['class' => 'form-control']) !!}
4746
</div>
4847
</div>
4948

5049
<!-- Lang Field -->
51-
<div class="form-group">
52-
{!! CollectiveForm::label('lang', trans('panichd::admin.config-edit-language') . trans('panichd::admin.colon'), ['class' => 'col-sm-2 control-label']) !!}
50+
<div class="form-group row">
51+
{!! CollectiveForm::label('lang', trans('panichd::admin.config-edit-language') . trans('panichd::admin.colon'), ['class' => 'col-sm-2 col-form-label']) !!}
5352
<div class="col-sm-9">
5453
{!! CollectiveForm::text('lang', null, ['class' => 'form-control']) !!}
5554

5655
</div>
5756
</div>
5857

5958
<!-- Submit Field -->
60-
<div class="form-group">
59+
<div class="form-group row">
6160
<div class="col-sm-10 col-sm-offset-2">
6261
{!! CollectiveForm::submit(trans('panichd::admin.btn-submit'), ['class' => 'btn btn-primary']) !!}
6362
</div>
6463
</div>
6564

6665
{!! CollectiveForm::close() !!}
67-
</div>
6866
</div>
6967
<div class="card-footer">
7068
</div>

0 commit comments

Comments
 (0)