Skip to content

Commit e7352e3

Browse files
intripintrip
committed
deleted formfield dependency
1 parent b95e3a0 commit e7352e3

File tree

6 files changed

+138
-23
lines changed

6 files changed

+138
-23
lines changed

‎src/views/admin/group/edit.blade.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,12 @@
2727
{{-- group base form --}}
2828
<h4>General data</h4>
2929
{{Form::model($group, [ 'url' => [URL::action('Jacopo\Authentication\Controllers\GroupController@postEditGroup'), $group->id], 'method' => 'post'] ) }}
30-
{{FormField::name(["label" => "Name: *"])}}
30+
<!-- {{FormField::name(["label" => "Name: *"])}}-->
31+
<!-- name text field -->
32+
<div class="form-group">
33+
{{Form::label('name','Name: *')}}
34+
{{Form::text('name', null, ['class' => 'form-control', 'placeholder' => 'group name'])}}
35+
</div>
3136
<span class="text-danger">{{$errors->first('name')}}</span>
3237
{{Form::hidden('id')}}
3338
<a href="{{URL::action('Jacopo\Authentication\Controllers\GroupController@deleteGroup',['id' => $group->id, '_token' => csrf_token()])}}" class="btn btn-danger pull-right margin-left-5 delete">Delete</a>

‎src/views/admin/group/search.blade.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,13 @@
44
</div>
55
<div class="panel-body">
66
{{Form::open(['action' => 'Jacopo\Authentication\Controllers\GroupController@getList','method' => 'get'])}}
7-
{{FormField::name(['label' => 'Name:'])}}
7+
<!-- {{FormField::name(['label' => 'Name:'])}}-->
8+
<!-- name text field -->
9+
<div class="form-group">
10+
{{Form::label('name','Name:')}}
11+
{{Form::text('name', null, ['class' => 'form-control', 'placeholder' => 'group name'])}}
12+
</div>
13+
<span class="text-danger">{{$errors->first('name')}}</span>
814
{{Form::submit('Search', ["class" => "btn btn-info pull-right
915
"])}}
1016
{{Form::close()}}

‎src/views/admin/permission/edit.blade.php

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,19 @@
2424
</div>
2525
<div class="panel-body">
2626
{{Form::model($permission, [ 'url' => [URL::action('Jacopo\Authentication\Controllers\PermissionController@editPermission'), $permission->id], 'method' => 'post'] ) }}
27-
{{FormField::description(["label" => "Description: *", 'id' => 'slugme', "type" => "text"])}}
27+
<!-- {{FormField::description(["label" => "Description: *", 'id' => 'slugme', "type" => "text"])}}-->
28+
<!-- description text field -->
29+
<div class="form-group">
30+
{{Form::label('description','Description: *')}}
31+
{{Form::text('description', null, ['class' => 'form-control', 'placeholder' => 'permission description', 'id' => 'slugme'])}}
32+
</div>
2833
<span class="text-danger">{{$errors->first('description')}}</span>
29-
{{FormField::permission(["label" => "Permission: *", 'id' => 'slug'])}}
34+
<!-- {{FormField::permission(["label" => "Permission: *", 'id' => 'slug'])}}-->
35+
<!-- permission text field -->
36+
<div class="form-group">
37+
{{Form::label('permission','Permission: *')}}
38+
{{Form::text('permission', null, ['class' => 'form-control', 'placeholder' => 'permission description', 'id' => 'slug'])}}
39+
</div>
3040
<span class="text-danger">{{$errors->first('permission')}}</span>
3141
{{Form::hidden('id')}}
3242
<a href="{{URL::action('Jacopo\Authentication\Controllers\PermissionController@deletePermission',['id' => $permission->id, '_token' => csrf_token()])}}" class="btn btn-danger pull-right margin-left-5 delete">Delete</a>

‎src/views/admin/user/edit.blade.php

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,26 @@
3535
{{Form::model($user, [ 'url' => URL::action('Jacopo\Authentication\Controllers\UserController@postEditUser')] ) }}
3636
{{-- Field hidden to fix chrome and safari autocomplete bug --}}
3737
{{Form::password('__to_hide_password_autocomplete', ['class' => 'hidden'])}}
38-
{{FormField::email(["autocomplete" => "off", "label" => "Email: *"])}}
38+
<!-- {{FormField::email(["autocomplete" => "off", "label" => "Email: *"])}}-->
39+
<!-- email text field -->
40+
<div class="form-group">
41+
{{Form::label('email','Email: *')}}
42+
{{Form::text('email', null, ['class' => 'form-control', 'placeholder' => 'user email', 'autocomplete' => 'off'])}}
43+
</div>
3944
<span class="text-danger">{{$errors->first('email')}}</span>
40-
{{FormField::password(["autocomplete" => "off", "label" => isset($user->id) ? "Change password: " : "Password: "])}}
45+
<!-- {{FormField::password(["autocomplete" => "off", "label" => isset($user->id) ? "Change password: " : "Password: "])}}-->
46+
<!-- password text field -->
47+
<div class="form-group">
48+
{{Form::label('password',isset($user->id) ? "Change password: " : "Password: ")}}
49+
{{Form::password('password', null, ['class' => 'form-control', 'autocomplete' => 'off'])}}
50+
</div>
4151
<span class="text-danger">{{$errors->first('password')}}</span>
42-
{{FormField::password_confirmation(["autocomplete" => "off", "label" => isset($user->id) ? "Confirm change password: " : "Confirm password: "])}}
52+
<!-- {{FormField::password_confirmation(["autocomplete" => "off", "label" => isset($user->id) ? "Confirm change password: " : "Confirm password: "])}}-->
53+
<!-- password_confirmation text field -->
54+
<div class="form-group">
55+
{{Form::label('password_confirmation',"label" => isset($user->id) ? "Confirm change password: " : "Confirm password: ")}}
56+
{{Form::password('password_confirmation', null, ['class' => 'form-control', 'placeholder' => 'write again your password','autocomplete' => 'off'])}}
57+
</div>
4358
<span class="text-danger">{{$errors->first('password_confirmation')}}</span>
4459
<div class="form-group">
4560
{{Form::label("activated","User active: ")}}

‎src/views/admin/user/profile.blade.php

Lines changed: 60 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -56,27 +56,76 @@
5656
</div>
5757
<h4><i class="fa fa-cubes"></i> User data</h4>
5858
{{Form::model($user_profile,['route'=>'users.profile.edit', 'method' => 'post'])}}
59-
{{FormField::code(["label" => "User code:"])}}
59+
<!-- {{FormField::code(["label" => "User code:"])}}-->
60+
<!-- code text field -->
61+
<div class="form-group">
62+
{{Form::label('code','User code:')}}
63+
{{Form::text('code', null, ['class' => 'form-control', 'placeholder' => ''])}}
64+
</div>
6065
<span class="text-danger">{{$errors->first('code')}}</span>
61-
{{FormField::first_name(["label" => "First name:"])}}
66+
<!-- {{FormField::first_name(["label" => "First name:"])}}-->
67+
<!-- first_name text field -->
68+
<div class="form-group">
69+
{{Form::label('first_name','First name:')}}
70+
{{Form::text('first_name', null, ['class' => 'form-control', 'placeholder' => ''])}}
71+
</div>
6272
<span class="text-danger">{{$errors->first('first_name')}}</span>
63-
{{FormField::last_name(["label" => "Last name:"])}}
73+
<!-- {{FormField::last_name(["label" => "Last name:"])}}-->
74+
<!-- last_name text field -->
75+
<div class="form-group">
76+
{{Form::label('last_name','Last name: ')}}
77+
{{Form::text('last_name', null, ['class' => 'form-control', 'placeholder' => ''])}}
78+
</div>
6479
<span class="text-danger">{{$errors->first('last_name')}}</span>
65-
{{FormField::phone(["label" => "Phone:"])}}
80+
<!-- {{FormField::phone(["label" => "Phone:"])}}-->
81+
<!-- phone text field -->
82+
<div class="form-group">
83+
{{Form::label('phone','Phone: ')}}
84+
{{Form::text('phone', null, ['class' => 'form-control', 'placeholder' => ''])}}
85+
</div>
6686
<span class="text-danger">{{$errors->first('phone')}}</span>
67-
{{FormField::state(["label" => "State: "])}}
87+
<!-- {{FormField::state(["label" => "State: "])}}-->
88+
<!-- state text field -->
89+
<div class="form-group">
90+
{{Form::label('state','State: ')}}
91+
{{Form::text('state', null, ['class' => 'form-control', 'placeholder' => ''])}}
92+
</div>
6893
<span class="text-danger">{{$errors->first('state')}}</span>
69-
{{FormField::vat(["label" => "Vat: "])}}
94+
<!-- {{FormField::vat(["label" => "Vat: "])}}-->
95+
<!-- var text field -->
96+
<div class="form-group">
97+
{{Form::label('var','Vat: ')}}
98+
{{Form::text('var', null, ['class' => 'form-control', 'placeholder' => ''])}}
99+
</div>
70100
<span class="text-danger">{{$errors->first('vat')}}</span>
71-
{{FormField::city(["label" => "City: "])}}
101+
<!-- {{FormField::city(["label" => "City: "])}}-->
102+
<!-- city text field -->
103+
<div class="form-group">
104+
{{Form::label('city','City: ')}}
105+
{{Form::text('city', null, ['class' => 'form-control', 'placeholder' => ''])}}
106+
</div>
72107
<span class="text-danger">{{$errors->first('city')}}</span>
73-
{{FormField::country(["label" => "Country: "])}}
108+
<!-- {{FormField::country(["label" => "Country: "])}}-->
109+
<!-- country text field -->
110+
<div class="form-group">
111+
{{Form::label('country','Country: ')}}
112+
{{Form::text('country', null, ['class' => 'form-control', 'placeholder' => ''])}}
113+
</div>
74114
<span class="text-danger">{{$errors->first('country')}}</span>
75-
{{FormField::zip(["label" => "Zip: "])}}
115+
<!-- {{FormField::zip(["label" => "Zip: "])}}-->
116+
<!-- zip text field -->
117+
<div class="form-group">
118+
{{Form::label('zip','Zip: ')}}
119+
{{Form::text('zip', null, ['class' => 'form-control', 'placeholder' => ''])}}
120+
</div>
76121
<span class="text-danger">{{$errors->first('zip')}}</span>
77-
{{FormField::address(["label" => "Address: "])}}
122+
<!-- {{FormField::address(["label" => "Address: "])}}-->
123+
<!-- address text field -->
124+
<div class="form-group">
125+
{{Form::label('address','Address: ')}}
126+
{{Form::text('address', null, ['class' => 'form-control', 'placeholder' => ''])}}
127+
</div>
78128
<span class="text-danger">{{$errors->first('address')}}</span>
79-
80129
{{-- custom profile fields --}}
81130
@foreach($custom_profile->getAllTypesWithValues() as $profile_data)
82131
<div class="form-group">

‎src/views/admin/user/search.blade.php

Lines changed: 35 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,41 @@
44
</div>
55
<div class="panel-body">
66
{{Form::open(['action' => 'Jacopo\Authentication\Controllers\UserController@getList','method' => 'get'])}}
7-
{{FormField::email()}}
8-
{{FormField::first_name(['label' => 'First name:'])}}
9-
{{FormField::last_name(['label' => 'Last name:'])}}
10-
{{FormField::zip(['label' => 'Zip:'])}}
11-
{{FormField::code(['label' => 'User code:'])}}
7+
<!-- {{FormField::email()}}-->
8+
<!-- email text field -->
9+
<div class="form-group">
10+
{{Form::label('email','Email: ')}}
11+
{{Form::text('email', null, ['class' => 'form-control', 'placeholder' => 'user email'])}}
12+
</div>
13+
<span class="text-danger">{{$errors->first('email')}}</span>
14+
<!-- {{FormField::first_name(['label' => 'First name:'])}}-->
15+
<!-- first_name text field -->
16+
<div class="form-group">
17+
{{Form::label('first_name','First name: ')}}
18+
{{Form::text('first_name', null, ['class' => 'form-control', 'placeholder' => 'first name'])}}
19+
</div>
20+
<span class="text-danger">{{$errors->first('first_name')}}</span>
21+
<!-- {{FormField::last_name(['label' => 'Last name:'])}}-->
22+
<!-- last_name text field -->
23+
<div class="form-group">
24+
{{Form::label('last_name','Last name:')}}
25+
{{Form::text('last_name', null, ['class' => 'form-control', 'placeholder' => 'last name'])}}
26+
</div>
27+
<span class="text-danger">{{$errors->first('last_name')}}</span>
28+
<!-- {{FormField::zip(['label' => 'Zip:'])}}-->
29+
<!-- zip text field -->
30+
<div class="form-group">
31+
{{Form::label('zip','Zip:')}}
32+
{{Form::text('zip', null, ['class' => 'form-control', 'placeholder' => 'zip'])}}
33+
</div>
34+
<span class="text-danger">{{$errors->first('zip')}}</span>
35+
<!-- {{FormField::code(['label' => 'User code:'])}}-->
36+
<!-- code text field -->
37+
<div class="form-group">
38+
{{Form::label('code','User code:')}}
39+
{{Form::text('code', null, ['class' => 'form-control', 'placeholder' => 'user code'])}}
40+
</div>
41+
<span class="text-danger">{{$errors->first('code')}}</span>
1242
<div class="form-group">
1343
{{Form::label('activated', 'Active: ')}}
1444
{{Form::select('activated', ['' => 'Any', 1 => 'Yes', 0 => 'No'], Input::get('activated',''), ["class" => "form-control"])}}

0 commit comments

Comments
 (0)