diff --git a/app/lang/en/admin/settings/general.php b/app/lang/en/admin/settings/general.php index d18182a78d..2434669cb8 100755 --- a/app/lang/en/admin/settings/general.php +++ b/app/lang/en/admin/settings/general.php @@ -3,17 +3,20 @@ return array( 'display_asset_name' => 'Display Asset Name', 'display_checkout_date' => 'Display Checkout Date', - 'display_eol' => 'Display EOL in table view', - 'display_qr' => 'Display QR Codes', - 'info' => 'These settings let you customize certain aspects of your installation.', + 'display_eol' => 'Display EOL in table view', + 'display_qr' => 'Display QR Codes', + 'info' => 'These settings let you customize certain aspects of your installation.', + 'laravel' => 'Laravel Version', 'per_page' => 'Results Per Page', - 'php_gd_info' => 'You must install php-gd to display QR codes, see install instructions.', - 'php_gd_warning' => 'PHP Image Processing and GD plugin is NOT installed.', - 'qr_help' => 'Enable QR Codes first to set this', - 'qr_text' => 'QR Code Text', - 'setting' => 'Setting', + 'php' => 'PHP Version', + 'php_gd_info' => 'You must install php-gd to display QR codes, see install instructions.', + 'php_gd_warning' => 'PHP Image Processing and GD plugin is NOT installed.', + 'qr_help' => 'Enable QR Codes first to set this', + 'qr_text' => 'QR Code Text', + 'setting' => 'Setting', 'settings' => 'Settings', 'site_name' => 'Site Name', - 'update' => 'Update Settings', - 'value' => 'Value', + 'system' => 'System Information', + 'update' => 'Update Settings', + 'value' => 'Value', ); diff --git a/app/models/Setting.php b/app/models/Setting.php index 8cf4c8f9b0..f2b6cf30f2 100755 --- a/app/models/Setting.php +++ b/app/models/Setting.php @@ -13,4 +13,10 @@ class Setting extends Elegant } + public function lar_ver() + { + $app = App::getFacadeApplication(); + return $app::VERSION; + } + } diff --git a/app/views/backend/settings/index.blade.php b/app/views/backend/settings/index.blade.php index 79ca12cfec..58e61956cb 100755 --- a/app/views/backend/settings/index.blade.php +++ b/app/views/backend/settings/index.blade.php @@ -15,89 +15,100 @@ @lang('button.edit') Settings - -
| @lang('admin/settings/general.setting') | -@lang('admin/settings/general.value') | -|
|---|---|---|
| @lang('admin/settings/general.site_name') | -{{{ $setting->site_name }}} | -|
| @lang('admin/settings/general.display_asset_name') | +||
| @lang('admin/settings/general.site_name') | +{{{ $setting->site_name }}} | +|
| @lang('admin/settings/general.display_asset_name') | - @if ($setting->display_asset_name == 1) -@lang('general.yes') | - @else -@lang('general.no') | - @endif -
| @lang('admin/settings/general.display_eol') | - - @if ($setting->display_eol == 1) -@lang('general.yes') | - @else -@lang('general.no') | - @endif -
| @lang('admin/settings/general.display_checkout_date') | - - - @if ($setting->display_checkout_date == 1) -@lang('general.yes') | - @else -@lang('general.no') | - @endif -
| @lang('admin/settings/general.per_page') | -{{{ $setting->per_page }}} | -|
| @lang('admin/settings/general.display_qr') | - @if ($setting->qr_code == 1) + @if ($setting->display_asset_name == 1)@lang('general.yes') | @else@lang('general.no') | @endif -
| @lang('admin/settings/general.qr_text') | -{{{ $setting->qr_text }}} | -
These settings let you customize certain aspects of your installation.
| @lang('admin/settings/general.php') | +{{{ phpversion() }}} | +
| @lang('admin/settings/general.laravel') | ++ {{{ $setting->lar_ver() }}} + | +