Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
language: php

php:
- 5.5
- 5.6
- 7.1

before_script:
- curl -s http://getcomposer.org/installer | php
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
],
"license": "MIT",
"require": {
"php": ">=5.5.9",
"php": ">=5.6.4",
"esensi/model": "0.6.x",
"esensi/loaders": "0.6.x",
"laravelcollective/html": "~5.1",
Expand Down
56 changes: 49 additions & 7 deletions resources/lang/en/core.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
|--------------------------------------------------------------------------
|
| The following language lines contain the default error messages used by
| the Esensi\Core components package.
| the Core components package.
|
*/

Expand Down Expand Up @@ -36,7 +36,7 @@
|--------------------------------------------------------------------------
|
| The following language lines contain message lines used by the
| Esensi\Core components package models.
| Core components package models.
|
*/

Expand All @@ -59,24 +59,66 @@
],
],

/*
|--------------------------------------------------------------------------
| Button lines
|--------------------------------------------------------------------------
|
| The following language lines contain message lines used by the
| Core components package buttons.
|
*/

'buttons' => [
'cancel' => 'Cancel',
'close' => 'Close',
'delete' => 'Delete',
'edit' => 'Edit',
'filter' => 'Filter',
'new' => 'New',
'public_site' => 'Public Site',
'restore' => 'Restore',
'search' => 'Search',
'toggle_menu' => 'Toggle Menu',
'trash' => 'Trash',
'truncate' => 'Delete All',
'view' => 'View',
],

/*
|--------------------------------------------------------------------------
| Label lines
|--------------------------------------------------------------------------
|
| The following language lines contain label lines used by the
| Esensi\Core components package view.
| Core components package view.
|
*/

'labels' => [
'never_expires' => 'Never Expires',
'never_updated' => 'Never Updated',
'actions' => 'Actions',
'administration' => 'Administration',
'created' => 'Created',
'dashboard' => 'Dashboard',
'deleted' => 'Deleted',
'display_name' => 'Display Name',
'email' => 'Email Address',
'keywords' => 'Keywords',
'max_results' => 'Max Results',
'name' => 'Name',
'never_activated' => 'Never Activated',
'never_authenticated' => 'Never Logged In',
'never_created' => 'Never Created',
'never_deleted' => 'Never Deleted',
'never_authenticated' => 'Never Logged In',
'never_activated' => 'Never Activated',
'never_expires' => 'Never Expires',
'never_password_updated' => 'Never Set',
'never_updated' => 'Never Updated',
'of' => 'of',
'order_by' => 'Order By',
'showing' => 'Showing',
'sort_results' => 'Sort Results',
'to' => 'to',
'updated' => 'Last Modified',
],

];
83 changes: 0 additions & 83 deletions resources/lang/es/core.php

This file was deleted.

4 changes: 3 additions & 1 deletion resources/views/core/admin/modal.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
<h4 class="modal-title" id="esensiModalTitle">@yield('modal-title')</h4>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
<span class="sr-only">Close</span>
<span class="sr-only">
@lang('esensi/core::core.buttons.close')
</span>
</button>
</div>
<div class="modal-body">
Expand Down
11 changes: 9 additions & 2 deletions resources/views/core/admin/partials/account.blade.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
<div class="account-menu-dropdown">
<a class="account-menu-profile dropdown-item" href="{{ route('admin.users.account.edit') }}">Edit My Profile</a>
<a class="account-menu-logout dropdown-item" href="{{ route('users.logout') }}">Logout</a>
<a class="account-menu-profile-view dropdown-item" href="{{ route('admin.users.account') }}">
@lang('esensi/user::user.buttons.view_profile')
</a>
<a class="account-menu-profile-edit dropdown-item" href="{{ route('admin.users.account.edit') }}">
@lang('esensi/user::user.buttons.edit_profile')
</a>
<a class="account-menu-logout dropdown-item" href="{{ route('users.logout') }}">
@lang('esensi/user::user.buttons.logout')
</a>
</div>
8 changes: 4 additions & 4 deletions resources/views/core/admin/partials/bulk-actions.blade.php
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<div class="bulk-actions btn-group" data-toggle="bulk">
@if( Route::currentRouteName() == 'admin.'. $package .'.dumpster' )
<a data-bulk-url="{{ route('admin.'. $package .'.restore.bulk.confirm', ':ids') }}" class="bulk-action btn btn-restore" data-toggle="modal" data-target="#esensiModal">
<span>Restore</span>
<span>@lang('esensi/core::core.buttons.restore')</span>
</a>
<a data-bulk-url="{{ route('admin.'. $package .'.delete.bulk.confirm', ':ids') }}" class="bulk-action btn btn-delete" data-toggle="modal" data-target="#esensiModal">
<span>Delete</span>
<span>@lang('esensi/core::core.buttons.delete')</span>
</a>
@else
@if( Route::has('admin.'. $package . '.dumpster') )
<a data-bulk-url="{{ route('admin.'. $package .'.trash.bulk.confirm', ':ids') }}" class="bulk-action btn btn-trash" data-toggle="modal" data-target="#esensiModal">
<span>Trash</span>
<span>@lang('esensi/core::core.buttons.trash')</span>
</a>
@else
<a data-bulk-url="{{ route('admin.'. $package .'.delete.bulk.confirm', ':ids') }}" class="bulk-action btn btn-delete" data-toggle="modal" data-target="#esensiModal">
<span>Delete</span>
<span>@lang('esensi/core::core.buttons.delete')</span>
</a>
@endif
@endif
Expand Down
16 changes: 12 additions & 4 deletions resources/views/core/admin/partials/drawer-last-row.blade.php
Original file line number Diff line number Diff line change
@@ -1,18 +1,26 @@
<div class="drawer-row">
<div class="drawer-col drawer-col-order">
<label>Order By</label>
<label>
@lang('esensi/core::core.labels.order_by')
</label>
{!! Form::select('order', $orderOptions, $order, ['class' => 'form-control']) !!}
</div>
<div class="drawer-col drawer-col-sort">
<label>Sort Results</label>
<label>
@lang('esensi/core::core.labels.sort_results')
</label>
{!! Form::select('sort', $sortOptions, $sort, ['class' => 'form-control']) !!}
</div>
<div class="drawer-col drawer-col-max">
<label>Max Results</label>
<label>
@lang('esensi/core::core.labels.max_results')
</label>
{!! Form::select('max', $maxOptions, $max, ['class' => 'form-control']) !!}
</div>
<div class="drawer-col drawer-col-search">
<label>&nbsp;</label>
<button type="submit" class="btn btn-search">Search</button>
<button type="submit" class="btn btn-search">
@lang('esensi/core::core.buttons.search')
</button>
</div>
</div>
4 changes: 3 additions & 1 deletion resources/views/core/admin/partials/drawer.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
{!! Form::open([ 'route' => isset($route) ? $route : Route::currentRouteName() , 'method' => 'GET']) !!}
<div class="drawer-row">
<div class="drawer-col drawer-col-keywords">
<label>Keyword Search</label>
<label>
@lang('esensi/core::core.labels.keywords')
</label>
{!! Form::text('keywords', $keywords, ['class' => 'form-control esensi-tags']) !!}
</div>
</div>
Expand Down
12 changes: 8 additions & 4 deletions resources/views/core/admin/partials/errors.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,19 @@
<div class="alert alert-{{ Session::get('code', 200) }} alert-dismissible fade show" role="alert">
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
<span aria-hidden="true">&times;</span>
<span class="sr-only">Close</span>
<span class="sr-only">
@lang('esensi/core::core.buttons.close')
</span>
</button>
@if ($errors->any())
@if ($errors->first() != Session::get('message'))
{!! Session::get('message') !!}
@endif
@foreach($errors->all(':message ') as $error)
{!! $error !!}
@endforeach
<ul>
@foreach($errors->all(':message ') as $error)
<li>{!! $error !!}</li>
@endforeach
</ul>
@else
{!! Session::get('message') !!}
@endif
Expand Down
10 changes: 7 additions & 3 deletions resources/views/core/admin/partials/header.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<meta name="csrf-token" content="{{ csrf_token() }}">
<meta name="msapplication-config" content="{{ asset('browserconfig.xml') }}" />
<link rel="shortcut icon" href="{{ asset('favicon.ico') }}">
<title>{{ config('esensi/core::core.metadata.author', 'Esensi') }} – Administration</title>
<title>{{ config('esensi/core::core.metadata.author', 'Esensi') }} – @lang('esensi/core::core.labels.administration')</title>

@styles('admin')

Expand Down Expand Up @@ -40,7 +40,9 @@
<ul id="sidebarMenu" class="sidebar-menu nav nav-stacked nav-pills">
@if(config('esensi/core::core.dashboard', true))
<li class="dashboard-menu nav-item @if(starts_with(Route::currentRouteName(), ['index', 'admin.dashboard'])) active @endif">
<a href="{{ route('admin.dashboard') }}" class="nav-link">Dashboard</a>
<a href="{{ route('admin.dashboard') }}" class="nav-link">
@lang('esensi/core::core.labels.dashboard')
</a>
</li>
@endif

Expand All @@ -65,7 +67,9 @@

<div class="header">
<button type="button" class="sidebar-toggle" data-toggle="offcanvas" data-target=".sidebar" data-canvas="body">
<span class="sr-only">Toggle Menu</span>
<span class="sr-only">
@lang('esensi/core::core.buttons.toggle_menu')
</span>
</button>

<ul class="header-menu nav nav-pills">
Expand Down
8 changes: 6 additions & 2 deletions resources/views/core/admin/partials/logout.blade.php
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
@if(config('esensi/core::core.logout', false))
<li class="logout-menu nav-item">
<a href="{{ route('users.logout') }}" class="nav-link">
<span class="sr-only">Log Out</span>
<span class="sr-only">
@lang('esensi/user::user.buttons.logout')
</span>
</a>
</li>
@else
<li class="redirect-menu nav-item">
<a href="{{ route('index') }}" class="nav-link">
<span class="sr-only">Public Site</span>
<span class="sr-only">
@lang('esensi/core::core.buttons.public_site')
</span>
</a>
</li>
@endif
2 changes: 1 addition & 1 deletion src/Exceptions/Handler.php
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ public function render($request, Exception $e)
}

// Use esensi/core namespaced whoops error view when not in debug mode.
if( $e instanceof Exception)
if ($e instanceof Exception)
{
return $this->renderErrorException($request, $e);
}
Expand Down