From 305f258a1d2a77a12fe1d4b7b95a197646c92156 Mon Sep 17 00:00:00 2001 From: Nafies Luthfi Date: Sat, 10 Nov 2018 12:36:20 +0800 Subject: [PATCH] Update lang feature on parent-spouse view --- .../views/users/partials/parent-spouse.blade.php | 132 ++++++++++----------- 1 file changed, 64 insertions(+), 68 deletions(-) diff --git a/resources/views/users/partials/parent-spouse.blade.php b/resources/views/users/partials/parent-spouse.blade.php index afc9e49..25d8f9b 100644 --- a/resources/views/users/partials/parent-spouse.blade.php +++ b/resources/views/users/partials/parent-spouse.blade.php @@ -1,27 +1,27 @@
-

{{ trans('user.family') }}

+

{{ __('user.family') }}

- + - + - + @if ($user->gender_id == 1) - + @else - +
{{ trans('user.father') }}{{ __('user.father') }} @can ('edit', $user) @if (request('action') == 'set_father') {{ Form::open(['route' => ['family-actions.set-father', $user->id]]) }} - {!! FormField::select('set_father_id', $malePersonList, ['label' => false, 'value' => $user->father_id, 'placeholder' => trans('app.select_from_existing_males')]) !!} + {!! FormField::select('set_father_id', $malePersonList, ['label' => false, 'value' => $user->father_id, 'placeholder' => __('app.select_from_existing_males')]) !!}
- {{ Form::text('set_father', null, ['class' => 'form-control input-sm', 'placeholder' => trans('app.enter_new_name')]) }} + {{ Form::text('set_father', null, ['class' => 'form-control input-sm', 'placeholder' => __('app.enter_new_name')]) }} - {{ Form::submit('update', ['class' => 'btn btn-info btn-sm', 'id' => 'set_father_button']) }} - {{ link_to_route('users.show', trans('app.cancel'), [$user->id], ['class' => 'btn btn-default btn-sm']) }} + {{ Form::submit(__('app.update'), ['class' => 'btn btn-info btn-sm', 'id' => 'set_father_button']) }} + {{ link_to_route('users.show', __('app.cancel'), [$user->id], ['class' => 'btn btn-default btn-sm']) }}
{{ Form::close() }} @else {{ $user->fatherLink() }}
- {{ link_to_route('users.show', trans('user.set_father'), [$user->id, 'action' => 'set_father'], ['class' => 'btn btn-link btn-xs']) }} + {{ link_to_route('users.show', __('user.set_father'), [$user->id, 'action' => 'set_father'], ['class' => 'btn btn-link btn-xs']) }}
@endif @else @@ -30,24 +30,24 @@
{{ trans('user.mother') }}{{ __('user.mother') }} @can ('edit', $user) @if (request('action') == 'set_mother') {{ Form::open(['route' => ['family-actions.set-mother', $user->id]]) }} - {!! FormField::select('set_mother_id', $femalePersonList, ['label' => false, 'value' => $user->mother_id, 'placeholder' => trans('app.select_from_existing_females')]) !!} + {!! FormField::select('set_mother_id', $femalePersonList, ['label' => false, 'value' => $user->mother_id, 'placeholder' => __('app.select_from_existing_females')]) !!}
- {{ Form::text('set_mother', null, ['class' => 'form-control input-sm', 'placeholder' => trans('app.enter_new_name')]) }} + {{ Form::text('set_mother', null, ['class' => 'form-control input-sm', 'placeholder' => __('app.enter_new_name')]) }} - {{ Form::submit('update', ['class' => 'btn btn-info btn-sm', 'id' => 'set_mother_button']) }} - {{ link_to_route('users.show', trans('app.cancel'), [$user->id], ['class' => 'btn btn-default btn-sm']) }} + {{ Form::submit(__('app.update'), ['class' => 'btn btn-info btn-sm', 'id' => 'set_mother_button']) }} + {{ link_to_route('users.show', __('app.cancel'), [$user->id], ['class' => 'btn btn-default btn-sm']) }}
{{ Form::close() }} @else {{ $user->motherLink() }}
- {{ link_to_route('users.show', trans('user.set_mother'), [$user->id, 'action' => 'set_mother'], ['class' => 'btn btn-link btn-xs']) }} + {{ link_to_route('users.show', __('user.set_mother'), [$user->id, 'action' => 'set_mother'], ['class' => 'btn btn-link btn-xs']) }}
@endif @else @@ -56,16 +56,13 @@
{{ trans('user.parent') }}{{ __('user.parent') }} - @can ('edit', $user)
- @if (request('action') == 'set_parent') - {{ link_to_route('users.show', trans('app.cancel'), [$user->id], ['class' => 'btn btn-default btn-xs']) }} - @else - {{ link_to_route('users.show', trans('user.set_parent'), [$user->id, 'action' => 'set_parent'], ['class' => 'btn btn-link btn-xs']) }} - @endif + @unless (request('action') == 'set_parent') + {{ link_to_route('users.show', __('user.set_parent'), [$user->id, 'action' => 'set_parent'], ['class' => 'btn btn-link btn-xs']) }} + @endunless
@endcan @@ -74,26 +71,25 @@ @endif @can('edit', $user) - @if (request('action') == 'set_parent') - {{ Form::open(['route' => ['family-actions.set-parent', $user->id]]) }} - {!! FormField::select('set_parent_id', $allMariageList, ['label' => false, 'value' => $user->parent_id, 'placeholder' => trans('app.select_from_existing_couples')]) !!} - {{ Form::submit('update', ['class' => 'btn btn-info btn-sm', 'id' => 'set_parent_button']) }} - {{ Form::close() }} - @endif + @if (request('action') == 'set_parent') + {{ Form::open(['route' => ['family-actions.set-parent', $user->id]]) }} + {!! FormField::select('set_parent_id', $allMariageList, ['label' => false, 'value' => $user->parent_id, 'placeholder' => __('app.select_from_existing_couples')]) !!} + {{ Form::submit(__('app.update'), ['class' => 'btn btn-info btn-sm', 'id' => 'set_parent_button']) }} + {{ link_to_route('users.show', __('app.cancel'), $user, ['class' => 'btn btn-default btn-sm']) }} + {{ Form::close() }} + @endif @endcan
{{ trans('user.wife') }}{{ __('user.wife') }} @can ('edit', $user)
- @if (request('action') == 'add_spouse') - {{ link_to_route('users.show', trans('app.cancel'), [$user->id], ['class' => 'btn btn-default btn-xs']) }} - @else - {{ link_to_route('users.show', trans('user.add_wife'), [$user->id, 'action' => 'add_spouse'], ['class' => 'btn btn-link btn-xs']) }} - @endif + @unless (request('action') == 'add_spouse') + {{ link_to_route('users.show', __('user.add_wife'), [$user->id, 'action' => 'add_spouse'], ['class' => 'btn btn-link btn-xs']) }} + @endunless
@endcan @@ -105,38 +101,37 @@ @endif @can('edit', $user) - @if (request('action') == 'add_spouse') -
- {{ Form::open(['route' => ['family-actions.add-wife', $user->id]]) }} - {!! FormField::select('set_wife_id', $femalePersonList, ['label' => false, 'placeholder' => trans('app.select_from_existing_females')]) !!} -
-
-
- {{ Form::text('set_wife', null, ['class' => 'form-control input-sm', 'placeholder' => trans('app.enter_new_name')]) }} -
-
- {{ Form::text('marriage_date', null, ['class' => 'form-control input-sm', 'placeholder' => trans('couple.marriage_date')]) }} + @if (request('action') == 'add_spouse') +
+ {{ Form::open(['route' => ['family-actions.add-wife', $user->id]]) }} + {!! FormField::select('set_wife_id', $femalePersonList, ['label' => false, 'placeholder' => __('app.select_from_existing_females')]) !!} +
+
+
+ {{ Form::text('set_wife', null, ['class' => 'form-control input-sm', 'placeholder' => __('app.enter_new_name')]) }} +
+
+ {{ Form::text('marriage_date', null, ['class' => 'form-control input-sm', 'placeholder' => __('couple.marriage_date')]) }} +
+ {{ Form::submit(__('app.update'), ['class' => 'btn btn-info btn-sm', 'id' => 'set_wife_button']) }} + {{ link_to_route('users.show', __('app.cancel'), $user, ['class' => 'btn btn-default btn-sm']) }} + {{ Form::close() }}
- {{ Form::submit('update', ['class' => 'btn btn-info btn-sm', 'id' => 'set_wife_button']) }} - {{ Form::close() }} -
- @endif + @endif @endcan
{{ trans('user.husband') }}{{ __('user.husband') }} @can ('edit', $user)
- @if (request('action') == 'add_spouse') - {{ link_to_route('users.show', trans('app.cancel'), [$user->id], ['class' => 'btn btn-default btn-xs']) }} - @else - {{ link_to_route('users.show', trans('user.add_husband'), [$user->id, 'action' => 'add_spouse'], ['class' => 'btn btn-link btn-xs']) }} - @endif + @unless (request('action') == 'add_spouse') + {{ link_to_route('users.show', __('user.add_husband'), [$user->id, 'action' => 'add_spouse'], ['class' => 'btn btn-link btn-xs']) }} + @endunless
@endcan @if ($user->husbands->isEmpty() == false) @@ -147,24 +142,25 @@ @endif @can('edit', $user) - @if (request('action') == 'add_spouse') -
- {{ Form::open(['route' => ['family-actions.add-husband', $user->id]]) }} - {!! FormField::select('set_husband_id', $malePersonList, ['label' => false, 'placeholder' => trans('app.select_from_existing_males')]) !!} -
-
-
- {{ Form::text('set_husband', null, ['class' => 'form-control input-sm', 'placeholder' => trans('app.enter_new_name')]) }} -
-
- {{ Form::text('marriage_date', null, ['class' => 'form-control input-sm', 'placeholder' => trans('couple.marriage_date')]) }} + @if (request('action') == 'add_spouse') +
+ {{ Form::open(['route' => ['family-actions.add-husband', $user->id]]) }} + {!! FormField::select('set_husband_id', $malePersonList, ['label' => false, 'placeholder' => __('app.select_from_existing_males')]) !!} +
+
+
+ {{ Form::text('set_husband', null, ['class' => 'form-control input-sm', 'placeholder' => __('app.enter_new_name')]) }} +
+
+ {{ Form::text('marriage_date', null, ['class' => 'form-control input-sm', 'placeholder' => __('couple.marriage_date')]) }} +
+ {{ Form::submit(__('app.update'), ['class' => 'btn btn-info btn-sm', 'id' => 'set_husband_button']) }} + {{ link_to_route('users.show', __('app.cancel'), [$user->id], ['class' => 'btn btn-default btn-sm']) }} + {{ Form::close() }}
- {{ Form::submit('update', ['class' => 'btn btn-info btn-sm', 'id' => 'set_husband_button']) }} - {{ Form::close() }} -
- @endif + @endif @endcan