ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #336 from madd15/feature-updated-setting-view

Browse Source 
Update Settings to contain PHP & Laravel versions
This commit is contained in:
snipe
2014-11-05 21:03:27 -05:00
parent 5f6f3de25e 0eda46da0c
commit cdf5ecc084
3 changed files with 93 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/lang/en/admin/settings/general.php
+13 -10
View File
@@ -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',
);
app/models/Setting.php
+6
View File
@@ -13,4 +13,10 @@ class Setting extends Elegant
}
public function lar_ver()
{
$app = App::getFacadeApplication();
return $app::VERSION;
}
}
app/views/backend/settings/index.blade.php
+74 -63
View File
@@ -15,89 +15,100 @@
<a href="{{ route('edit/settings') }}" class="btn btn-warning"> @lang('button.edit') Settings</a>
</div>
<h3 class="name">@lang('admin/settings/general.settings')</h3>
<div class="row-fluid profile">
<!-- bio, new note & orders column -->
<div class="col-md-9 bio">
<h3 class="name">@lang('admin/settings/general.settings')</h3>
<div class="profile-box">
<br>
<!-- checked out assets table -->
<table class="table table-hover">
<thead>
<tr>
<th class="col-md-3">@lang('admin/settings/general.setting')</th>
<th class="col-md-3"><span class="line"></span>@lang('admin/settings/general.value')</th>
</tr>
</thead>
<tbody>
@foreach ($settings as $setting)
<tr>
<td>@lang('admin/settings/general.site_name')</td>
<td>{{{ $setting->site_name }}} </td>
</tr>
<tr>
<td>@lang('admin/settings/general.display_asset_name')</td>
<tbody>
@foreach ($settings as $setting)
<tr>
<td>@lang('admin/settings/general.site_name')</td>
<td>{{{ $setting->site_name }}} </td>
</tr>
<tr>
<td>@lang('admin/settings/general.display_asset_name')</td>
@if ($setting->display_asset_name == 1)
<td>@lang('general.yes')</td>
@else
<td>@lang('general.no')</td>
@endif
</tr>
<tr>
<td>@lang('admin/settings/general.display_eol')</td>
@if ($setting->display_eol == 1)
<td>@lang('general.yes')</td>
@else
<td>@lang('general.no')</td>
@endif
</tr>
<tr>
<td>@lang('admin/settings/general.display_checkout_date')</td>
@if ($setting->display_checkout_date == 1)
<td>@lang('general.yes')</td>
@else
<td>@lang('general.no')</td>
@endif
</tr>
<tr>
<td>@lang('admin/settings/general.per_page')</td>
<td>{{{ $setting->per_page }}} </td>
</tr>
<tr>
<td>@lang('admin/settings/general.display_qr')</td>
@if ($setting->qr_code == 1)
@if ($setting->display_asset_name == 1)
<td>@lang('general.yes')</td>
@else
<td>@lang('general.no')</td>
@endif
</tr>
<tr>
<td>@lang('admin/settings/general.qr_text')</td>
<td>{{{ $setting->qr_text }}}</td>
</tr>
@endforeach
</tbody>
</table>
</tr>
<tr>
<td>@lang('admin/settings/general.display_eol')</td>
@if ($setting->display_eol == 1)
<td>@lang('general.yes')</td>
@else
<td>@lang('general.no')</td>
@endif
</tr>
<tr>
<td>@lang('admin/settings/general.display_checkout_date')</td>
@if ($setting->display_checkout_date == 1)
<td>@lang('general.yes')</td>
@else
<td>@lang('general.no')</td>
@endif
</tr>
<tr>
<td>@lang('admin/settings/general.per_page')</td>
<td>{{{ $setting->per_page }}} </td>
</tr>
<tr>
<td>@lang('admin/settings/general.display_qr')</td>
@if ($setting->qr_code == 1)
<td>@lang('general.yes')</td>
@else
<td>@lang('general.no')</td>
@endif
</tr>
<tr>
<td>@lang('admin/settings/general.qr_text')</td>
<td>{{{ $setting->qr_text }}}</td>
</tr>
@endforeach
</tbody>
</table>
</div>
</div>
<!-- side address column -->
<!-- side address column -->
<div class="col-md-3 address pull-right">
<br /><br />
<p>These settings let you customize certain aspects of your installation. </p>
</div>
@stop
<div class="col-md-9 bio">
<h3 class="name">@lang('admin/settings/general.system')</h3>
<div class="profile-box">
<br>
<table class="table table-hover">
<tbody>
<tr>
<td>@lang('admin/settings/general.php')</td>
<td> {{{ phpversion() }}}</td>
</tr>
<tr>
<td>@lang('admin/settings/general.laravel')</td>
<td>
{{{ $setting->lar_ver() }}}
</td>
</tr>
</tbody>
</table>
</div>
</div>
@stop