Skip to content

Commit

Permalink
Minor fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@sampoyigi
sampoyigi committed Nov 3, 2020
1 parent c1a032e commit e941c08
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 29 deletions.
20 changes: 10 additions & 10 deletions components/account/settings.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
class="form-control"
value="{{ set_value('first_name', $customer->first_name) }}"
name="first_name"
placeholder="@lang('igniter.user::default.settings.label_first_name');"
placeholder="@lang('igniter.user::default.settings.label_first_name')"
>
{!! form_error('first_name', '<span class="text-danger">', '</span>') !!}
</div>
Expand All @@ -25,7 +25,7 @@ class="form-control"
class="form-control"
value="{{ set_value('last_name', $customer->last_name) }}"
name="last_name"
placeholder="@lang('igniter.user::default.settings.label_last_name');"
placeholder="@lang('igniter.user::default.settings.label_last_name')"
>
{!! form_error('last_name', '<span class="text-danger">', '</span>') !!}
</div>
Expand All @@ -39,7 +39,7 @@ class="form-control"
class="form-control"
value="{{ set_value('telephone', $customer->telephone) }}"
name="telephone"
placeholder="@lang('igniter.user::default.settings.label_telephone');"
placeholder="@lang('igniter.user::default.settings.label_telephone')"
>
{!! form_error('telephone', '<span class="text-danger">', '</span>') !!}
</div>
Expand All @@ -51,7 +51,7 @@ class="form-control"
class="form-control"
value="{{ set_value('email', $customer->email) }}"
name="email"
placeholder="@lang('igniter.user::default.settings.label_email');"
placeholder="@lang('igniter.user::default.settings.label_email')"
disabled
>
{!! form_error('email', '<span class="text-danger">', '</span>') !!}
Expand All @@ -70,14 +70,14 @@ class="custom-control-input"
{!! set_checkbox('newsletter', '1', (bool)$customer->newsletter) !!}
>
<label for="newsletter" class="custom-control-label">
@lang('igniter.user::default.settings.label_newsletter');
@lang('igniter.user::default.settings.label_newsletter')
</label>
</div>
{!! form_error('newsletter', '<span class="text-danger">', '</span>') !!}
</div>

<div class="my-3">
<h5 class="font-weight-normal">@lang('igniter.user::default.settings.text_password_heading');</h5>
<h5 class="font-weight-normal">@lang('igniter.user::default.settings.text_password_heading')</h5>
</div>

<div class="form-group">
Expand All @@ -86,7 +86,7 @@ class="custom-control-input"
name="old_password"
class="form-control"
value=""
placeholder="@lang('igniter.user::default.settings.label_old_password');"
placeholder="@lang('igniter.user::default.settings.label_old_password')"
/>
{!! form_error('old_password', '<span class="text-danger">', '</span>') !!}
</div>
Expand All @@ -99,7 +99,7 @@ class="form-control"
class="form-control"
value=""
name="new_password"
placeholder="@lang('igniter.user::default.settings.label_password');"
placeholder="@lang('igniter.user::default.settings.label_password')"
>
{!! form_error('new_password', '<span class="text-danger">', '</span>') !!}
</div>
Expand All @@ -111,7 +111,7 @@ class="form-control"
class="form-control"
name="confirm_new_password"
value=""
placeholder="@lang('igniter.user::default.settings.label_password_confirm');"
placeholder="@lang('igniter.user::default.settings.label_password_confirm')"
>
{!! form_error('confirm_new_password', '<span class="text-danger">', '</span>') !!}
</div>
Expand All @@ -122,6 +122,6 @@ class="form-control"
<button
type="submit"
class="btn btn-primary"
>@lang('igniter.user::default.settings.button_save');</button>
>@lang('igniter.user::default.settings.button_save')</button>
</div>
</form>
22 changes: 11 additions & 11 deletions components/addressbook/form.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
value="{{ set_value('address[address_id]', $address->address_id) }}"
/>
<div class="form-group">
<label>@lang('igniter.user::default.account.label_address_1');</label>
<label>@lang('igniter.user::default.account.label_address_1')</label>
<input
type="text"
name="address[address_1]"
Expand All @@ -21,7 +21,7 @@ class="form-control"
</div>

<div class="form-group">
<label>@lang('igniter.user::default.account.label_address_2');</label>
<label>@lang('igniter.user::default.account.label_address_2')</label>
<input
type="text"
name="address[address_2]"
Expand All @@ -34,47 +34,47 @@ class="form-control"
<div class="row">
<div class="col-xs-12 col-sm-4 col-md-4">
<div class="form-group">
<label>@lang('igniter.user::default.account.label_city');</label>
<label>@lang('igniter.user::default.account.label_city')</label>
<input
type="text"
class="form-control"
name="address[city]"
value="{{ set_value('address[city]', $address->city) }}"
placeholder="@lang('igniter.user::default.account.label_city');"
placeholder="@lang('igniter.user::default.account.label_city')"
>
{!! form_error('address.city', '<span class="text-danger">', '</span>') !!}
</div>
</div>
<div class="col-xs-12 col-sm-4 col-md-4">
<div class="form-group">
<label>@lang('igniter.user::default.account.label_state');</label>
<label>@lang('igniter.user::default.account.label_state')</label>
<input
type="text"
class="form-control"
value="{{ set_value('address[state]', $address->state) }}"
name="address[state]"
placeholder="@lang('igniter.user::default.account.label_state');"
placeholder="@lang('igniter.user::default.account.label_state')"
>
{!! form_error('address.state', '<span class="text-danger">', '</span>') !!}
</div>
</div>
<div class="col-xs-12 col-sm-4 col-md-4">
<div class="form-group">
<label>@lang('igniter.user::default.account.label_postcode');</label>
<label>@lang('igniter.user::default.account.label_postcode')</label>
<input
type="text"
class="form-control"
name="address[postcode]"
value="{{ set_value('address[postcode]', $address->postcode) }}"
placeholder="@lang('igniter.user::default.account.label_postcode');"
placeholder="@lang('igniter.user::default.account.label_postcode')"
>
{!! form_error('address.postcode', '<span class="text-danger">', '</span>') !!}
</div>
</div>
</div>

<div class="form-group">
<label>@lang('igniter.user::default.account.label_country');</label>
<label>@lang('igniter.user::default.account.label_country')</label>
<select name="address[country_id]" class="form-control">
@foreach (countries() as $key => $value)
<option
Expand All @@ -90,10 +90,10 @@ class="form-control"
<button
type="submit"
class="btn btn-primary"
>@lang('igniter.user::default.account.button_update');</button>
>@lang('igniter.user::default.account.button_update')</button>
<a
class="btn btn-light"
href="{{ site_url('account/address') }}"
>@lang('igniter.user::default.account.button_back');</a>
>@lang('igniter.user::default.account.button_back')</a>
</div>
</form>
6 changes: 3 additions & 3 deletions components/addressbook/list.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class="list-group-item {{ ($customer->address_id == $address->address_id) ? 'lis
<a
class="btn btn-outline-default"
href="{{ site_url('account/address', ['addressId' => $address->address_id]) }}"
>@lang('igniter.user::default.account.text_edit');</a>
>@lang('igniter.user::default.account.text_edit')</a>
</span>
</div>
@endforeach
Expand All @@ -19,12 +19,12 @@ class="btn btn-outline-default"
<div class="links">{!! $customerAddresses->links() !!}</div>
</div>
@else
<p>@lang('igniter.user::default.account.text_no_address');</p>
<p>@lang('igniter.user::default.account.text_no_address')</p>
@endif

<div class="buttons">
<button
class="btn btn-primary btn-lg"
data-request="{{ $addAddressEventHandler }}"
>@lang('igniter.user::default.account.button_add');</button>
>@lang('igniter.user::default.account.button_add')</button>
</div>
8 changes: 4 additions & 4 deletions components/resetpassword/forgot.blade.php
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<p>@lang('igniter.user::default.reset.text_summary');</p>
<p>@lang('igniter.user::default.reset.text_summary')</p>

{!! form_open([
'role' => 'form',
Expand All @@ -12,7 +12,7 @@
id="email"
class="form-control input-lg"
value="{{ set_value('email') }}"
placeholder="@lang('igniter.user::default.reset.label_email');"
placeholder="@lang('igniter.user::default.reset.label_email')"
/>
{!! form_error('email', '<span class="text-danger">', '</span>') !!}
</div>
Expand All @@ -21,10 +21,10 @@ class="form-control input-lg"
<a
class="btn btn-link btn-lg pull-left"
href="{{ site_url('account/login') }}"
>@lang('igniter.user::default.reset.button_login');</a>
>@lang('igniter.user::default.reset.button_login')</a>
<button
type="submit"
class="btn btn-primary btn-lg pull-right"
>@lang('igniter.user::default.reset.button_reset');</button>
>@lang('igniter.user::default.reset.button_reset')</button>
</div>
{!! form_close() !!}
2 changes: 1 addition & 1 deletion components/resetpassword/reset.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class="form-control input-lg"
<button
type="submit"
class="btn btn-primary btn-block btn-lg"
>@lang('igniter.user::default.reset.button_reset');</button>
>@lang('igniter.user::default.reset.button_reset')</button>
</div>

{!! form_close() !!}

0 comments on commit e941c08

Please sign in to comment.