FGFS-4.1/phpvms
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move frontend.global.* to common.*

Browse Source
This commit is contained in:
Nabeel Shahzad
2018-05-21 09:57:40 -05:00
parent a747657642
commit 203b6496fc
25 changed files with 201 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/layouts/default/profile/fields.blade.php
+7 -7
View File
@@ -2,7 +2,7 @@
<div class="col-md-12">
<table class="table">
<tr>
<td>@lang('frontend.global.name')</td>
<td>@lang('common.name')</td>
<td>
<div class="input-group form-group-no-border{{ $errors->has('name') ? ' has-danger' : '' }}">
{{ Form::text('name', null, ['class' => 'form-control']) }}
@@ -14,7 +14,7 @@
</tr>
<tr>
<td>@lang('frontend.global.email')</td>
<td>@lang('common.email')</td>
<td>
<div class="input-group form-group-no-border{{ $errors->has('email') ? ' has-danger' : '' }}">
{{ Form::text('email', null, ['class' => 'form-control']) }}
@@ -26,7 +26,7 @@
</tr>
<tr>
<td>@lang('frontend.global.airline')</td>
<td>@lang('common.airline')</td>
<td>
<div class="input-group form-group-no-border{{ $errors->has('airline') ? ' has-danger' : '' }}">
{{ Form::select('airline_id', $airlines, null , ['class' => 'form-control select2']) }}
@@ -38,7 +38,7 @@
</tr>
<tr>
<td>@lang('frontend.global.homeairport')</td>
<td>@lang('common.homeairport')</td>
<td>
<div class="input-group form-group-no-border{{ $errors->has('home_airport_id') ? ' has-danger' : '' }}">
{{ Form::select('home_airport_id', $airports, null , ['class' => 'form-control select2']) }}
@@ -50,7 +50,7 @@
</tr>
<tr>
<td>@lang('frontend.global.country')</td>
<td>@lang('common.country')</td>
<td>
<div class="input-group form-group-no-border{{ $errors->has('country') ? ' has-danger' : '' }}">
{{ Form::select('country', $countries, null, ['class' => 'form-control select2' ]) }}
@@ -62,7 +62,7 @@
</tr>
<tr>
<td>@lang('frontend.global.timezone')</td>
<td>@lang('common.timezone')</td>
<td>
<div class="input-group form-group-no-border{{ $errors->has('timezone') ? ' has-danger' : '' }}">
{{ Form::select('timezone', $timezones, null, ['class' => 'form-control select2' ]) }}
@@ -84,7 +84,7 @@
<p class="text-danger">{{ $errors->first('password') }}</p>
@endif
<p>@lang('frontend.global.confirmpassword'):</p>
<p>@lang('common.confirmpassword'):</p>
<div class="input-group form-group-no-border{{ $errors->has('password_confirmation') ? ' has-danger' : '' }}">
{{ Form::password('password_confirmation', ['class' => 'form-control']) }}
</div>
resources/views/layouts/default/profile/index.blade.php
+6 -6
View File
@@ -23,7 +23,7 @@
<div class="content">
<div class="social-description">
<h2>{{ $user->flights}}</h2>
<p>{{ trans_choice('frontend.global.flight', $user->flights) }}</p>
<p>{{ trans_choice('common.flight', $user->flights) }}</p>
</div>
<div class="social-description">
@@ -34,14 +34,14 @@
@if($user->home_airport)
<div class="social-description">
<h2>{{ $user->home_airport->icao }}</h2>
<p>@lang('frontend.global.homeairport')</p>
<p>@lang('common.homeairport')</p>
</div>
@endif
@if($user->current_airport)
<div class="social-description">
<h2>{{ $user->current_airport->icao }}</h2>
<p>@lang('frontend.global.currentairport')</p>
<p>@lang('common.currentairport')</p>
</div>
@endif
@@ -61,13 +61,13 @@
onclick="return confirm({{ __('Are you sure? This will reset your API key.') }})">@lang('frontend.profile.newapikey')</a>
&nbsp;
<a href="{{ route('frontend.profile.edit', ['id' => $user->id]) }}"
class="btn btn-primary">@lang('frontend.global.edit')</a>
class="btn btn-primary">@lang('common.edit')</a>
</div>
<h3 class="description">@lang('frontend.profile.yourprofile')</h3>
<table class="table table-full-width">
<tr>
<td>@lang('frontend.global.email')</td>
<td>@lang('common.email')</td>
<td>{{ $user->email }}</td>
</tr>
<tr>
@@ -75,7 +75,7 @@
<td>{{ $user->api_key }}</td>
</tr>
<tr>
<td>@lang('frontend.global.timezone')</td>
<td>@lang('common.timezone')</td>
<td>{{ $user->timezone }}</td>
</tr>
</table>