Fixed project index page structure and use project lang file

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)

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.',

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',

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')
 <h1 class="page-header">
-    {!! link_to_route('projects.create', trans('project.create'), [], ['class'=>'btn btn-success pull-right']) !!}
-    Daftar {{ $status }} Project <small>{{ $projects->total() }} {{ trans('project.found') }}</small>
+    {!! link_to_route('projects.create', trans('project.create'), [], ['class' => 'btn btn-success pull-right']) !!}
+    {{ trans('project.index_title', ['status' => $status]) }} <small>{{ $projects->total() }} {{ trans('project.found') }}</small>
 </h1>
 <div class="well well-sm text-right">
     <div class="pull-left hidden-xs">{{ $projects->appends(Request::except('page'))->render() }}</div>
-    {!! 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() !!}
 </div>
 <div class="table-responsive">
-<table class="table table-condensed table-hover">
-    <thead>
-        <th>{{ trans('app.table_no') }}</th>
-        <th>{{ trans('project.name') }}</th>
-        <th class="text-center">{{ trans('project.start_date') }}</th>
-        <th class="text-center">{{ trans('project.work_duration') }}</th>
-        <th class="text-right">{{ trans('project.project_value') }}</th>
-        <th class="text-center">{{ trans('app.status') }}</th>
-        <th>{{ trans('project.customer') }}</th>
-        <th>{{ trans('app.action') }}</th>
-    </thead>
-    <tbody>
-        @forelse($projects as $key => $project)
-        <tr>
-            <td>{{ $projects->firstItem() + $key }}</td>
-            <td>{{ $project->nameLink() }}</td>
-            <td class="text-center">{{ $project->start_date }}</td>
-            <td class="text-right">{{ $project->present()->workDuration }}</td>
-            <td class="text-right">{{ formatRp($project->project_value) }}</td>
-            <td class="text-center">{{ $project->present()->status }}</td>
-            <td>{{ $project->customer->name }}</td>
-            <td>
-                {!! 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')]) !!}
-            </td>
-        </tr>
-        @empty
-        <tr>
-            <td colspan="9">{{ $status }} {{ trans('project.not_found') }}</td>
-        </tr>
-        @endforelse
-    </tbody>
-</table>
+    <table class="table table-condensed table-hover">
+        <thead>
+            <th>{{ trans('app.table_no') }}</th>
+            <th>{{ trans('project.name') }}</th>
+            <th class="text-center">{{ trans('project.start_date') }}</th>
+            <th class="text-center">{{ trans('project.work_duration') }}</th>
+            <th class="text-right">{{ trans('project.project_value') }}</th>
+            <th class="text-center">{{ trans('app.status') }}</th>
+            <th>{{ trans('project.customer') }}</th>
+            <th>{{ trans('app.action') }}</th>
+        </thead>
+        <tbody>
+            @forelse($projects as $key => $project)
+            <tr>
+                <td>{{ $projects->firstItem() + $key }}</td>
+                <td>{{ $project->nameLink() }}</td>
+                <td class="text-center">{{ $project->start_date }}</td>
+                <td class="text-right">{{ $project->present()->workDuration }}</td>
+                <td class="text-right">{{ formatRp($project->project_value) }}</td>
+                <td class="text-center">{{ $project->present()->status }}</td>
+                <td>{{ $project->customer->name }}</td>
+                <td>
+                    {!! 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')]) !!}
+                </td>
+            </tr>
+            @empty
+            <tr>
+                <td colspan="9">{{ $status }} {{ trans('project.not_found') }}</td>
+            </tr>
+            @endforelse
+        </tbody>
+    </table>
 </div>
-{!! str_replace('/?', '?', $projects->appends(Request::except('page'))->render()) !!}
+{{ $projects->appends(Request::except('page'))->render() }}
 @endsection