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/pireps/fields.blade.php
+7 -7
View File
@@ -99,7 +99,7 @@ flight reports that have been filed. You've been warned!
{{ Form::label('hours', trans('frontend.global.flighttime')) }}
@if(!empty($pirep) && $pirep->read_only)
<p>
{{ $pirep->hours.' '.trans_choice('frontend.global.hour', $pirep->hours) }}, {{ $pirep->minutes.' '.trans_choice('frontend.global.minute', $pirep->minutes) }}
{{ $pirep->hours.' '.trans_choice('common.hour', $pirep->hours) }}, {{ $pirep->minutes.' '.trans_choice('common.minute', $pirep->minutes) }}
{{ Form::hidden('hours') }}
{{ Form::hidden('minutes') }}
</p>
@@ -107,14 +107,14 @@ flight reports that have been filed. You've been warned!
<div class="input-group input-group-sm" style="max-width: 200px;">
{{ Form::number('hours', null, [
'class' => 'form-control',
'placeholder' => trans_choice('frontend.global.hour', 2),
'placeholder' => trans_choice('common.hour', 2),
'min' => '0',
'readonly' => (!empty($pirep) && $pirep->read_only),
]) }}
{{ Form::number('minutes', null, [
'class' => 'form-control',
'placeholder' => trans_choice('frontend.global.minute', 2),
'placeholder' => trans_choice('common.minute', 2),
'min' => 0,
'readonly' => (!empty($pirep) && $pirep->read_only),
]) }}
@@ -234,7 +234,7 @@ flight reports that have been filed. You've been warned!
<div class="form-container">
<h6><i class="far fa-comments"></i>
&nbsp;@lang('frontend.global.route')
&nbsp;@lang('common.route')
</h6>
<div class="form-container-body">
<div class="row">
@@ -250,13 +250,13 @@ flight reports that have been filed. You've been warned!
<div class="form-container">
<h6><i class="far fa-comments"></i>
&nbsp;{{ trans_choice('frontend.global.remark', 2) }}
&nbsp;{{ trans_choice('common.remark', 2) }}
</h6>
<div class="form-container-body">
<div class="row">
<div class="col">
<div class="input-group input-group-sm form-group">
{{ Form::textarea('notes', null, ['class' => 'form-control', 'placeholder' => trans_choice('frontend.global.note', 2)]) }}
{{ Form::textarea('notes', null, ['class' => 'form-control', 'placeholder' => trans_choice('common.note', 2)]) }}
<p class="text-danger">{{ $errors->first('notes') }}</p>
</div>
</div>
@@ -269,7 +269,7 @@ flight reports that have been filed. You've been warned!
<div class="form-container">
<h6><i class="fab fa-wpforms"></i>
&nbsp;{{ trans_choice('frontend.global.field', 2) }}
&nbsp;{{ trans_choice('common.field', 2) }}
</h6>
<div class="form-container-body">
resources/views/layouts/default/pireps/index.blade.php
+1 -1
View File
@@ -1,5 +1,5 @@
@extends('app')
@section('title', trans_choice('frontend.global.pirep', 2))
@section('title', trans_choice('common.pirep', 2))
@section('content')
<div class="row">
resources/views/layouts/default/pireps/pirep_card.blade.php
+2 -2
View File
@@ -5,7 +5,7 @@
<p class="float-right">
<a href="{{ route('frontend.pireps.edit', [
'id' => $pirep->id,
]) }}" class="btn btn-sm btn-info">@lang('frontend.global.edit') }}</a>
]) }}" class="btn btn-sm btn-info">@lang('common.edit') }}</a>
</p>
<h5>
<a href="{{ route('frontend.pireps.show', [$pirep->id]) }}">
@@ -45,7 +45,7 @@
<td>{{ Utils::minutesToTimeString($pirep->flight_time) }}</td>
</tr>
<tr>
<td nowrap><span class="title">@lang('frontend.global.aircraft')&nbsp;</span></td>
<td nowrap><span class="title">@lang('common.aircraft')&nbsp;</span></td>
<td>{{ $pirep->aircraft->name }}
({{ $pirep->aircraft->registration }})</td>
</tr>
resources/views/layouts/default/pireps/show.blade.php
+8 -8
View File
@@ -1,5 +1,5 @@
@extends('app')
@section('title', trans_choice('frontend.global.pirep', 1).' '.$pirep->ident)
@section('title', trans_choice('common.pirep', 1).' '.$pirep->ident)
@section('content')
<div class="row">
@@ -89,20 +89,20 @@
action="{{ route('frontend.pireps.edit', ['id' => $pirep->id]) }}"
style="display: inline">
@csrf
<button class="btn btn-info">@lang('frontend.global.edit')</button>
<button class="btn btn-info">@lang('common.edit')</button>
</form>
&nbsp;
<form method="post"
action="{{ route('frontend.pireps.submit', ['id' => $pirep->id]) }}"
style="display: inline">
@csrf
<button class="btn btn-success">@lang('frontend.global.submit')</button>
<button class="btn btn-success">@lang('common.submit')</button>
</form>
</div>
@endif
<table class="table table-striped">
<tr>
<td width="30%">@lang('frontend.global.status')</td>
<td width="30%">@lang('common.status')</td>
<td>
<div class="badge badge-info">
{{ PirepStatus::label($pirep->status) }}
@@ -128,7 +128,7 @@
</tr>
<tr>
<td>{{ trans_choice('frontend.global.note', 2) }}</td>
<td>{{ trans_choice('common.note', 2) }}</td>
<td>
{{ $pirep->notes }}
</td>
@@ -148,11 +148,11 @@
@endif
@if(count($pirep->fields) > 0)
<h5>{{ trans_choice('frontend.global.field', 2) }}</h5>
<h5>{{ trans_choice('common.field', 2) }}</h5>
<table class="table table-hover table-condensed">
<thead>
<th>@lang('frontend.global.name')</th>
<th>@lang('frontend.global.value')</th>
<th>@lang('common.name')</th>
<th>@lang('common.value')</th>
</thead>
<tbody>
@foreach($pirep->fields as $field)
resources/views/layouts/default/pireps/table.blade.php
+7 -7
View File
@@ -3,12 +3,12 @@
<table class="table table-condensed table-hover">
<thead>
<tr>
<th>{{ trans_choice('frontend.global.flight', 1) }}</th>
<th>@lang('frontend.global.departure')</th>
<th>@lang('frontend.global.arrival')</th>
<th>@lang('frontend.global.aircraft')</th>
<th class="text-center">@lang('frontend.global.flighttime')</th>
<th class="text-center">@lang('frontend.global.status')</th>
<th>{{ trans_choice('common.flight', 1) }}</th>
<th>@lang('common.departure')</th>
<th>@lang('common.arrival')</th>
<th>@lang('common.aircraft')</th>
<th class="text-center">@lang('common.flighttime')</th>
<th class="text-center">@lang('common.status')</th>
<th>@lang('frontend.pireps.submitted')</th>
<th></th>
</tr>
@@ -58,7 +58,7 @@
@if(!$pirep->read_only)
<a href="{{ route('frontend.pireps.edit', [
'id' => $pirep->id,
]) }}">@lang('frontend.global.edit')</a>
]) }}">@lang('common.edit')</a>
@endif
</td>
</tr>