diff --git a/app/Http/Middleware/Lang.php b/app/Http/Middleware/Lang.php
index 4282cb0..5eb21fd 100644
--- a/app/Http/Middleware/Lang.php
+++ b/app/Http/Middleware/Lang.php
@@ -9,8 +9,9 @@ class Lang
/**
* Handle an incoming request.
*
- * @param \Illuminate\Http\Request $request
- * @param \Closure $next
+ * @param \Illuminate\Http\Request $request
+ * @param \Closure $next
+ *
* @return mixed
*/
public function handle($request, Closure $next)
diff --git a/resources/lang/en/project.php b/resources/lang/en/project.php
index 40980d4..7f396c0 100644
--- a/resources/lang/en/project.php
+++ b/resources/lang/en/project.php
@@ -4,11 +4,13 @@ return [
// Labels
'project' => 'Project',
'projects' => 'Project List',
+ 'index_title' => ':status Project List',
'work_duration' => 'Work Duration',
'cash_in_total' => 'Cash in Total',
'cash_out_total' => 'Cash out Total',
- 'search' => 'Search Project',
- 'found' => 'Project found.',
+ 'all' => 'All Projects',
+ 'search' => 'Search Projects',
+ 'found' => 'Projects found',
'not_found' => 'Project not found.',
'select' => 'Select Project',
'empty' => 'Project list is empty.',
diff --git a/resources/lang/id/project.php b/resources/lang/id/project.php
index 104cc9d..e447e3f 100644
--- a/resources/lang/id/project.php
+++ b/resources/lang/id/project.php
@@ -4,9 +4,11 @@ return [
// Labels
'project' => 'Project',
'projects' => 'Daftar Project',
+ 'index_title' => 'Daftar :status Project',
'work_duration' => 'Durasi',
'cash_in_total' => 'Total Pemasukan',
'cash_out_total' => 'Total Pengeluaran',
+ 'all' => 'Semua Project',
'search' => 'Cari Project',
'found' => 'Project ditemukan',
'not_found' => 'Project tidak ditemukan',
diff --git a/resources/views/projects/index.blade.php b/resources/views/projects/index.blade.php
index ebb52be..a6d84a4 100755
--- a/resources/views/projects/index.blade.php
+++ b/resources/views/projects/index.blade.php
@@ -1,55 +1,55 @@
@extends('layouts.app')
-@section('title', 'Daftar ' . $status . ' Project')
+@section('title', trans('project.index_title', ['status' => $status]))
@section('content')
{{ $projects->appends(Request::except('page'))->render() }}
- {!! Form::open(['method'=>'get','class'=>'form-inline']) !!}
- {!! FormField::select('status', ProjectStatus::toArray(), ['value' => Request::get('status'), 'placeholder'=> 'Semua Project']) !!}
- {!! Form::text('q', Request::get('q'), ['class'=>'form-control index-search-field','placeholder'=>trans('project.search'),'style' => 'width:100%;max-width:350px']) !!}
+ {!! Form::open(['method' => 'get', 'class' => 'form-inline']) !!}
+ {!! FormField::select('status', ProjectStatus::toArray(), ['value' => Request::get('status'), 'placeholder' => trans('project.all')]) !!}
+ {!! Form::text('q', Request::get('q'), ['class' => 'form-control index-search-field', 'placeholder' => trans('project.search'), 'style' => 'width:100%;max-width:350px']) !!}
{!! Form::submit(trans('project.search'), ['class' => 'btn btn-info btn-sm']) !!}
- {!! link_to_route('projects.index','Reset',[],['class' => 'btn btn-default btn-sm']) !!}
+ {!! link_to_route('projects.index', 'Reset', [], ['class' => 'btn btn-default btn-sm']) !!}
{!! Form::close() !!}
-
-
- | {{ trans('app.table_no') }} |
- {{ trans('project.name') }} |
- {{ trans('project.start_date') }} |
- {{ trans('project.work_duration') }} |
- {{ trans('project.project_value') }} |
- {{ trans('app.status') }} |
- {{ trans('project.customer') }} |
- {{ trans('app.action') }} |
-
-
- @forelse($projects as $key => $project)
-
- | {{ $projects->firstItem() + $key }} |
- {{ $project->nameLink() }} |
- {{ $project->start_date }} |
- {{ $project->present()->workDuration }} |
- {{ formatRp($project->project_value) }} |
- {{ $project->present()->status }} |
- {{ $project->customer->name }} |
-
- {!! html_link_to_route('projects.show','',[$project->id],['icon'=>'search', 'class'=>'btn btn-info btn-xs', 'title' => trans('app.show')]) !!}
- {!! html_link_to_route('projects.edit','',[$project->id],['icon'=>'edit', 'class'=>'btn btn-warning btn-xs', 'title' => trans('app.edit')]) !!}
- |
-
- @empty
-
- | {{ $status }} {{ trans('project.not_found') }} |
-
- @endforelse
-
-
+
+
+ | {{ trans('app.table_no') }} |
+ {{ trans('project.name') }} |
+ {{ trans('project.start_date') }} |
+ {{ trans('project.work_duration') }} |
+ {{ trans('project.project_value') }} |
+ {{ trans('app.status') }} |
+ {{ trans('project.customer') }} |
+ {{ trans('app.action') }} |
+
+
+ @forelse($projects as $key => $project)
+
+ | {{ $projects->firstItem() + $key }} |
+ {{ $project->nameLink() }} |
+ {{ $project->start_date }} |
+ {{ $project->present()->workDuration }} |
+ {{ formatRp($project->project_value) }} |
+ {{ $project->present()->status }} |
+ {{ $project->customer->name }} |
+
+ {!! html_link_to_route('projects.show', '', [$project->id], ['icon' => 'search', 'class' => 'btn btn-info btn-xs', 'title' => trans('app.show')]) !!}
+ {!! html_link_to_route('projects.edit', '', [$project->id], ['icon' => 'edit', 'class' => 'btn btn-warning btn-xs', 'title' => trans('app.edit')]) !!}
+ |
+
+ @empty
+
+ | {{ $status }} {{ trans('project.not_found') }} |
+
+ @endforelse
+
+
-{!! str_replace('/?', '?', $projects->appends(Request::except('page'))->render()) !!}
+{{ $projects->appends(Request::except('page'))->render() }}
@endsection