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

Hard-coded English text strings should be moved to their language files

Browse Source
This commit is contained in:
feeva
2014-01-04 17:55:19 +00:00
parent 8806208e83
commit 40d6ad09ae
9 changed files with 176 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/admin/AssetsController.php
+2 -2
View File
@@ -148,7 +148,7 @@ class AssetsController extends AdminController {
$model_list = array('' => '') + Model::orderBy('name', 'asc')->lists('name', 'id');
// Grab the dropdown list of status
$statuslabel_list = array('' => 'Pending') + array('0' => 'Ready to Deploy') + Statuslabel::orderBy('name', 'asc')->lists('name', 'id');
$statuslabel_list = array('' => Lang::get('general.pending')) + array('0' => Lang::get('general.ready_to_deploy')) + Statuslabel::orderBy('name', 'asc')->lists('name', 'id');
return View::make('backend/hardware/edit')->with('model_list',$model_list)->with('statuslabel_list',$statuslabel_list)->with('asset',new Asset);
@@ -250,7 +250,7 @@ class AssetsController extends AdminController {
$model_list = array('' => '') + Model::orderBy('name', 'asc')->lists('name', 'id');
// Grab the dropdown list of status
$statuslabel_list = array('' => 'Pending') + array('0' => 'Ready to Deploy') + Statuslabel::orderBy('name', 'asc')->lists('name', 'id');
$statuslabel_list = array('' => Lang::get('general.pending')) + array('0' => Lang::get('general.ready_to_deploy')) + Statuslabel::orderBy('name', 'asc')->lists('name', 'id');
return View::make('backend/hardware/edit', compact('asset'))->with('model_list',$model_list)->with('statuslabel_list',$statuslabel_list);
}
app/controllers/admin/LicensesController.php
+2 -2
View File
@@ -45,7 +45,7 @@ class LicensesController extends AdminController {
// Show the page
$license_options = array('0' => 'Top Level') + License::lists('name', 'id');
// Show the page
$depreciation_list = array('0' => 'Do Not Depreciate') + Depreciation::lists('name', 'id');
$depreciation_list = array('0' => Lang::get('admin/licenses/form.no_depreciation')) + Depreciation::lists('name', 'id');
return View::make('backend/licenses/edit')->with('license_options',$license_options)->with('depreciation_list',$depreciation_list)->with('license',new License);
}
@@ -143,7 +143,7 @@ class LicensesController extends AdminController {
// Show the page
$license_options = array('' => 'Top Level') + DB::table('assets')->where('id', '!=', $licenseId)->lists('name', 'id');
$depreciation_list = array('0' => 'Do Not Depreciate') + Depreciation::lists('name', 'id');
$depreciation_list = array('0' => Lang::get('admin/licenses/form.no_depreciation')) + Depreciation::lists('name', 'id');
return View::make('backend/licenses/edit', compact('license'))->with('license_options',$license_options)->with('depreciation_list',$depreciation_list);
}
app/lang/en/admin/hardware/form.php
+19
View File
@@ -0,0 +1,19 @@
<?php
return array(
'create' => 'Create Asset',
'update' => 'Asset Update',
'tag' => 'Asset Tag',
'name' => 'Asset Name',
'serial' => 'Serial',
'order' => 'Order Number',
'model' => 'Model',
'date' => 'Purchase Date',
'cost' => 'Purchase Cost',
'warranty' => 'Warranty',
'status' => 'Status',
'notes' => 'Notes',
'months' => 'months',
)
;
app/lang/en/admin/licenses/form.php
+20
View File
@@ -0,0 +1,20 @@
<?php
return array(
'create' => 'Create License',
'update' => 'Update License',
'name' => 'Software Name',
'serial' => 'Serial',
'to_name' => 'Licensed to Name',
'to_email' => 'Licensed to Email',
'seats' => 'Seats',
'order' => 'Order No.',
'date' => 'Purchase Date',
'cost' => 'Purchase Cost',
'depreciation' => 'Depreciation',
'no_depreciation' => 'Do Not Depreciate',
'notes' => 'Notes',
)
;
app/lang/en/general.php
+39 -2
View File
@@ -8,6 +8,43 @@ return array(
'save' => 'Save',
'checkout' => 'Checkout',
'checkin' => 'Checkin',
'cancel' => 'Cancel'
'cancel' => 'Cancel',
'back' => 'Back',
);
'total_assets' => 'total assets',
'assets_available'=> 'assets available',
'total_licenses'=> 'total licenses',
'licenses_available'=> 'licenses available',
'all_assets' => 'All Assets',
'assets' => 'Assets',
'asset' => 'Asset',
'license' => 'License',
'licenses' => 'Licenses',
'user' => 'User',
'people' => 'People',
'reports' => 'Reports',
'all' => 'All',
'create' => 'Create New',
'welcome' => 'Welcome, :name',
'settings' => 'Settings',
'profile' => 'Your profile',
'logout' => 'Logout',
'admin' => 'Admin',
'groups' => 'Groups',
'status' => 'Status',
'status_labels' => 'Status Labels',
'manufacturers' => 'Manufacturers',
'categories' => 'Categories',
'locations' => 'Locations',
'depreciation' => 'Depreciation',
'sign_in' => 'Sign in',
'deployed' => 'Deployed',
'ready_to_deploy'=> 'Ready to Deploy',
'pending' => 'Pending',
'undeployable' => 'Un-deployable',
'list_all' => 'List All',
'asset_models' => 'Asset Models',
)
;
app/views/backend/hardware/edit.blade.php
+19 -19
View File
@@ -3,9 +3,9 @@
{{-- Page title --}}
@section('title')
@if ($asset->id)
Asset Update ::
@lang('admin/hardware/form.update') ::
@else
Create Asset ::
@lang('admin/hardware/form.create') ::
@endif
@parent
@stop
@@ -16,12 +16,12 @@
<div class="row header">
<div class="col-md-12">
<a href="{{ URL::previous() }}" class="btn-flat gray pull-right right"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
<a href="{{ URL::previous() }}" class="btn-flat gray pull-right right"><i class="icon-circle-arrow-left icon-white"></i> @lang('general.back')</a>
<h3>
@if ($asset->id)
Asset Update
@lang('admin/hardware/form.update')
@else
Create Asset
@lang('admin/hardware/form.create')
@endif
</h3>
</div>
@@ -37,7 +37,7 @@
<!-- Asset Tag -->
<div class="form-group {{ $errors->has('asset_tag') ? ' has-error' : '' }}">
<label for="asset_tag" class="col-md-2 control-label">Asset Tag</label>
<label for="asset_tag" class="col-md-2 control-label">@lang('admin/hardware/form.tag')</label>
<div class="col-md-7">
<input class="form-control" type="text" name="asset_tag" id="asset_tag" value="{{ Input::old('asset_tag', $asset->asset_tag) }}" />
{{ $errors->first('asset_tag', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
@@ -46,7 +46,7 @@
<!-- Asset Title -->
<div class="form-group {{ $errors->has('name') ? ' has-error' : '' }}">
<label for="name" class="col-md-2 control-label">Asset Name</label>
<label for="name" class="col-md-2 control-label">@lang('admin/hardware/form.name')</label>
<div class="col-md-7">
<input class="form-control" type="text" name="name" id="name" value="{{ Input::old('name', $asset->name) }}" />
{{ $errors->first('name', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
@@ -54,7 +54,7 @@
</div>
<!-- Serial -->
<div class="form-group {{ $errors->has('serial') ? ' has-error' : '' }}">
<label for="serial" class="col-md-2 control-label">Serial</label>
<label for="serial" class="col-md-2 control-label">@lang('admin/hardware/form.serial')</label>
<div class="col-md-7">
<input class="form-control" type="text" name="serial" id="serial" value="{{ Input::old('serial', $asset->serial) }}" />
{{ $errors->first('serial', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
@@ -63,7 +63,7 @@
<!-- Order Number -->
<div class="form-group {{ $errors->has('order_number') ? ' has-error' : '' }}">
<label for="order_number" class="col-md-2 control-label">Order Number</label>
<label for="order_number" class="col-md-2 control-label">@lang('admin/hardware/form.order')</label>
<div class="col-md-7">
<input class="form-control" type="text" name="order_number" id="order_number" value="{{ Input::old('order_number', $asset->order_number) }}" />
{{ $errors->first('order_number', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
@@ -72,7 +72,7 @@
<!-- Model -->
<div class="form-group {{ $errors->has('model_id') ? ' has-error' : '' }}">
<label for="parent" class="col-md-2 control-label">Model</label>
<label for="parent" class="col-md-2 control-label">@lang('admin/hardware/form.model')</label>
<div class="col-md-7">
{{ Form::select('model_id', $model_list , Input::old('model_id', $asset->model_id), array('class'=>'select2', 'style'=>'min-width:350px')) }}
{{ $errors->first('model_id', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
@@ -81,7 +81,7 @@
<!-- Purchase Date -->
<div class="form-group {{ $errors->has('purchase_date') ? ' has-error' : '' }}">
<label for="purchase_date" class="col-md-2 control-label">Purchase Date</label>
<label for="purchase_date" class="col-md-2 control-label">@lang('admin/hardware/form.date')</label>
<div class="input-group col-md-2">
<input type="date" class="datepicker form-control" data-date-format="yyyy-mm-dd" placeholder="Select Date" name="purchase_date" id="purchase_date" value="{{ Input::old('purchase_date', $asset->purchase_date) }}">
<span class="input-group-addon"><i class="icon-calendar"></i></span>
@@ -91,10 +91,10 @@
<!-- Purchase Cost -->
<div class="form-group {{ $errors->has('purchase_cost') ? ' has-error' : '' }}">
<label for="purchase_cost" class="col-md-2 control-label">Purchase Cost</label>
<label for="purchase_cost" class="col-md-2 control-label">@lang('admin/hardware/form.cost')</label>
<div class="col-md-2">
<div class="input-group">
<span class="input-group-addon">$</span>
<span class="input-group-addon">@lang('general.currency')</span>
<input class="col-md-2 form-control" type="text" name="purchase_cost" id="purchase_cost" value="{{ Input::old('purchase_cost', $asset->purchase_cost) }}" />
{{ $errors->first('purchase_cost', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
</div>
@@ -103,10 +103,10 @@
<!-- Warrantee -->
<div class="form-group {{ $errors->has('warranty_months') ? ' has-error' : '' }}">
<label for="warranty_months" class="col-md-2 control-label">Warranty</label>
<label for="warranty_months" class="col-md-2 control-label">@lang('admin/hardware/form.warranty')</label>
<div class="col-md-2">
<div class="input-group">
<input class="col-md-2 form-control" type="text" name="warranty_months" id="warranty_months" value="{{ Input::old('warranty_months', $asset->warranty_months) }}" /> <span class="input-group-addon">months</span>
<input class="col-md-2 form-control" type="text" name="warranty_months" id="warranty_months" value="{{ Input::old('warranty_months', $asset->warranty_months) }}" /> <span class="input-group-addon">@lang('admin/hardware/form.months')</span>
{{ $errors->first('warranty_months', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
</div>
</div>
@@ -114,7 +114,7 @@
<!-- Status -->
<div class="form-group {{ $errors->has('status_id') ? ' has-error' : '' }}">
<label for="status_id" class="col-md-2 control-label">Status</label>
<label for="status_id" class="col-md-2 control-label">@lang('admin/hardware/form.status')</label>
<div class="col-md-7">
{{ Form::select('status_id', $statuslabel_list , Input::old('status_id', $asset->status_id), array('class'=>'select2', 'style'=>'width:350px')) }}
{{ $errors->first('status_id', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
@@ -123,7 +123,7 @@
<!-- Notes -->
<div class="form-group {{ $errors->has('notes') ? ' has-error' : '' }}">
<label for="notes" class="col-md-2 control-label">Notes</label>
<label for="notes" class="col-md-2 control-label">@lang('admin/hardware/form.notes')</label>
<div class="col-md-7">
<input class="col-md-6 form-control" type="text" name="notes" id="notes" value="{{ Input::old('notes', $asset->notes) }}" />
{{ $errors->first('notes', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
@@ -134,8 +134,8 @@
<div class="form-group">
<label class="col-md-2 control-label"></label>
<div class="col-md-7">
<a class="btn btn-link" href="{{ URL::previous() }}">Cancel</a>
<button type="submit" class="btn btn-success"><i class="icon-ok icon-white"></i> Save</button>
<a class="btn btn-link" href="{{ URL::previous() }}">@lang('general.cancel')</a>
<button type="submit" class="btn btn-success"><i class="icon-ok icon-white"></i> @lang('general.save')</button>
</div>
</div>
app/views/backend/hardware/index.blade.php
+27 -40
View File
@@ -1,23 +1,26 @@
@extends('backend/layouts/default')
@section('title0')
@if (Input::get('Pending') || Input::get('Undeployable') || Input::get('RTD') || Input::get('Deployed'))
@if (Input::get('Pending'))
@lang('general.pending')
@elseif (Input::get('RTD'))
@lang('general.ready_to_deploy')
@elseif (Input::get('Undeployable'))
@lang('general.undeployable')
@elseif (Input::get('Deployed'))
@lang('general.deployed')
@endif
@else
@lang('general.all')
@endif
@lang('general.assets')
@stop
{{-- Page title --}}
@section('title')
@if (Input::get('Pending') || Input::get('Undeployable') || Input::get('RTD') || Input::get('Deployed'))
@if (Input::get('Pending'))
Pending
@elseif (Input::get('RTD'))
Ready to Deploy
@elseif (Input::get('Undeployable'))
Un-deployable
@elseif (Input::get('Deployed'))
Deployed
@endif
@else
All
@endif
Assets ::
@parent
@yield('title0') :: @parent
@stop
{{-- Page content --}}
@@ -26,23 +29,8 @@ Assets ::
<div class="row header">
<div class="col-md-12">
<a href="{{ route('create/hardware') }}" class="btn btn-success pull-right"><i class="icon-plus-sign icon-white"></i> Create New</a>
<h3>
@if (Input::get('Pending') || Input::get('Undeployable') || Input::get('RTD') || Input::get('Deployed'))
@if (Input::get('Pending'))
Pending
@elseif (Input::get('RTD'))
Ready to Deploy
@elseif (Input::get('Undeployable'))
Un-deployable
@elseif (Input::get('Deployed'))
Deployed
@endif
@else
All
@endif
Assets
</h3>
<a href="{{ route('create/hardware') }}" class="btn btn-success pull-right"><i class="icon-plus-sign icon-white"></i> @lang('general.create')</a>
<h3>@yield('title0')</h3>
</div>
</div>
@@ -58,7 +46,7 @@ Assets ::
<th class="col-md-3" bSortable="true">@lang('admin/hardware/table.title')</th>
<th class="col-md-2" bSortable="true">@lang('admin/hardware/table.serial')</th>
@if (Input::get('Pending') || Input::get('Undeployable') || Input::get('RTD'))
<th class="col-md-2" bSortable="true">Status</th>
<th class="col-md-2" bSortable="true">@lang('general.status')</th>
@else
<th class="col-md-2" bSortable="true">@lang('admin/hardware/table.checkoutto')</th>
<th class="col-md-2" bSortable="true">@lang('admin/hardware/table.location')</th>
@@ -78,15 +66,14 @@ Assets ::
@if (Input::get('Pending') || Input::get('Undeployable') || Input::get('RTD'))
<td>
@if (Input::get('Pending'))
Pending
@lang('general.pending')
@elseif (Input::get('RTD'))
Ready to Deploy
@lang('general.ready_to_deploy')
@elseif (Input::get('Undeployable'))
@if ($asset->assetstatus)
{{ $asset->assetstatus->name }}
@endif
@endif
@endif
</td>
@else
<td>
@@ -117,9 +104,9 @@ Assets ::
<td>
@if ($asset->status_id < 1 )
@if ($asset->assigned_to != 0)
<a href="{{ route('checkin/hardware', $asset->id) }}" class="btn btn-primary">Checkin</a>
<a href="{{ route('checkin/hardware', $asset->id) }}" class="btn btn-primary">@lang('general.checkin')</a>
@else
<a href="{{ route('checkout/hardware', $asset->id) }}" class="btn btn-info">Checkout</a>
<a href="{{ route('checkout/hardware', $asset->id) }}" class="btn btn-info">@lang('general.checkout')</a>
@endif
@endif
</td>
app/views/backend/layouts/default.blade.php
+30 -30
View File
@@ -86,95 +86,95 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle hidden-xs hidden-sm" data-toggle="dropdown">
<i class="icon-plus"></i> Create New
<i class="icon-plus"></i> @lang('general.create')
<b class="caret"></b>
</a>
<ul class="dropdown-menu">
<li {{ (Request::is('hardware/create') ? 'class="active"' : '') }}>
<a href="{{ route('create/hardware') }}">
<i class="icon-plus"></i>
Asset</a>
@lang('general.asset')</a>
</li>
<li {{ (Request::is('admin/licenses/create') ? 'class="active"' : '') }}>
<a href="{{ route('create/licenses') }}">
<i class="icon-plus"></i>
License</a>
@lang('general.license')</a>
</li>
<li {{ (Request::is('admin/users/create') ? 'class="active"' : '') }}>
<a href="{{ route('create/user') }}">
<i class="icon-plus"></i>
User</a>
@lang('general.user')</a>
</li>
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle hidden-xs hidden-sm" data-toggle="dropdown">
Welcome, {{ Sentry::getUser()->first_name }}
{{ Lang::get('general.welcome', array('name' => Sentry::getUser()->first_name)) }}
<b class="caret"></b>
</a>
<ul class="dropdown-menu">
@if(Sentry::getUser()->hasAccess('admin'))
<li>
<a href="{{ route('app') }}">
<i class="icon-cog"></i> Settings
<i class="icon-cog"></i> @lang('general.settings')
</a>
</li>
@endif
<li{{ (Request::is('account/profile') ? ' class="active"' : '') }}>
<a href="{{ route('profile') }}">
<i class="icon-user"></i> Your profile
<i class="icon-user"></i> @lang('general.profile')
</a>
</li>
<li class="divider"></li>
<li>
<a href="{{ route('logout') }}">
<i class="icon-off"></i>
Logout
@lang('general.logout')
</a>
</li>
</ul>
</li>
<li class="dropdown{{ (Request::is('admin/users*|admin/groups*') ? ' active' : '') }} hidden-phone">
<a class="dropdown-toggle" data-toggle="dropdown" href="{{ URL::to('admin/users') }}">
<i class="icon-wrench icon-white"></i> Admin <span class="caret"></span>
<i class="icon-wrench icon-white"></i> @lang('general.admin') <span class="caret"></span>
</a>
<ul class="dropdown-menu">
<li{{ (Request::is('admin/groups*') ? ' class="active"' : '') }}>
<a href="{{ URL::to('admin/groups') }}">
<i class="icon-group"></i> Groups
<i class="icon-group"></i> @lang('general.groups')
</a>
</li>
<li{{ (Request::is('admin/settings/statuslabels*') ? ' class="active"' : '') }}>
<a href="{{ URL::to('admin/settings/statuslabels') }}">
<i class="icon-list"></i> Status Labels
<i class="icon-list"></i> @lang('general.status_labels')
</a>
</li>
<li{{ (Request::is('admin/settings/manufacturers*') ? ' class="active"' : '') }}>
<a href="{{ URL::to('admin/settings/manufacturers') }}">
<i class="icon-briefcase"></i> Manufacturers
<i class="icon-briefcase"></i> @lang('general.manufacturers')
</a>
</li>
<li{{ (Request::is('admin/settings/categories*') ? ' class="active"' : '') }}>
<a href="{{ URL::to('admin/settings/categories') }}">
<i class="icon-th"></i> Categories
<i class="icon-th"></i> @lang('general.categories')
</a>
</li>
<li{{ (Request::is('admin/settings/locations*') ? ' class="active"' : '') }}>
<a href="{{ URL::to('admin/settings/locations') }}">
<i class="icon-globe"></i> Locations
<i class="icon-globe"></i> @lang('general.locations')
</a>
</li>
<li{{ (Request::is('admin/settings/depreciations*') ? ' class="active"' : '') }}>
<a href="{{ URL::to('admin/settings/depreciations') }}">
<i class="icon-arrow-down"></i> Depreciation
<i class="icon-arrow-down"></i> @lang('general.depreciation')
</a>
</li>
</ul>
</li>
@else
<li {{ (Request::is('auth/signin') ? 'class="active"' : '') }}><a href="{{ route('signin') }}">Sign in</a></li>
<li {{ (Request::is('auth/signin') ? 'class="active"' : '') }}><a href="{{ route('signin') }}">@lang('general.sign_in')</a></li>
@endif
</ul>
</div>
@@ -190,17 +190,17 @@
<li{{ (Request::is('hardware*') ? ' class="active"><div class="pointer"><div class="arrow"></div><div class="arrow_border"></div></div>' : '>') }}
<a href="#" class="dropdown-toggle">
<i class="icon-barcode"></i>
<span>Assets</span>
<span>@lang('general.assets')</span>
<i class="icon-chevron-down"></i>
</a>
<ul class="submenu{{ (Request::is('hardware*') ? ' active' : '') }}">
<li><a href="{{ URL::to('hardware?Deployed=true') }}" {{ (Request::query('Deployed') ? ' class="active"' : '') }} >Deployed</a></li>
<li><a href="{{ URL::to('hardware?RTD=true') }}" {{ (Request::query('RTD') ? ' class="active"' : '') }} >Ready to Deploy</a></li>
<li><a href="{{ URL::to('hardware?Pending=true') }}" {{ (Request::query('Pending') ? ' class="active"' : '') }} >Pending</a></li>
<li><a href="{{ URL::to('hardware?Undeployable=true') }}" {{ (Request::query('Undeployable') ? ' class="active"' : '') }} >Un-Deployable</a></li>
<li><a href="{{ URL::to('hardware') }}">List All</a></li>
<li><a href="{{ URL::to('hardware/models') }}" {{ (Request::is('hardware/models*') ? ' class="active"' : '') }} >Asset Models</a></li>
<li><a href="{{ URL::to('hardware?Deployed=true') }}" {{ (Request::query('Deployed') ? ' class="active"' : '') }} >@lang('general.deployed')</a></li>
<li><a href="{{ URL::to('hardware?RTD=true') }}" {{ (Request::query('RTD') ? ' class="active"' : '') }} >@lang('general.ready_to_deploy')</a></li>
<li><a href="{{ URL::to('hardware?Pending=true') }}" {{ (Request::query('Pending') ? ' class="active"' : '') }} >@lang('general.pending')</a></li>
<li><a href="{{ URL::to('hardware?Undeployable=true') }}" {{ (Request::query('Undeployable') ? ' class="active"' : '') }} >@lang('general.undeployable')</a></li>
<li><a href="{{ URL::to('hardware') }}">@lang('general.list_all')</a></li>
<li><a href="{{ URL::to('hardware/models') }}" {{ (Request::is('hardware/models*') ? ' class="active"' : '') }} >@lang('general.asset_models')</a></li>
</ul>
</li>
@@ -208,19 +208,19 @@
<li{{ (Request::is('admin/licenses*') ? ' class="active"><div class="pointer"><div class="arrow"></div><div class="arrow_border"></div></div>' : '>') }}
<a href="{{ URL::to('admin/licenses') }}">
<i class="icon-certificate"></i>
<span>Licenses</span>
<span>@lang('general.licenses')</span>
</a>
</li>
<li{{ (Request::is('admin/users*') ? ' class="active"><div class="pointer"><div class="arrow"></div><div class="arrow_border"></div></div>' : '>') }}
<a href="{{ URL::to('admin/users') }}">
<i class="icon-group"></i>
<span>People</span>
<span>@lang('general.people')</span>
</a>
</li>
<li{{ (Request::is('reports*') ? ' class="active"><div class="pointer"><div class="arrow"></div><div class="arrow_border"></div></div>' : '>') }}
<a href="{{ URL::to('reports') }}">
<i class="icon-signal"></i>
<span>Reports</span>
<span>@lang('general.reports')</span>
</a>
</li>
</ul>
@@ -240,7 +240,7 @@
<div class="data">
<a href="{{ URL::to('hardware') }}">
<span class="number">{{ number_format(Asset::assetcount()) }}</span>
<span style="color:black">total assets</span>
<span style="color:black">@lang('general.total_assets')</span>
</a>
</div>
</div>
@@ -248,7 +248,7 @@
<div class="data">
<a href="{{ URL::to('hardware?RTD=true') }}">
<span class="number">{{ number_format(Asset::availassetcount()) }}</span>
<span style="color:black">assets available</span>
<span style="color:black">@lang('general.assets_available')</span>
</a>
</div>
</div>
@@ -256,7 +256,7 @@
<div class="data">
<a href="{{ URL::to('admin/licenses') }}">
<span class="number">{{ number_format(License::assetcount()) }}</span>
<span style="color:black">total licenses</span>
<span style="color:black">@lang('general.total_licenses')</span>
</a>
</div>
</div>
@@ -264,7 +264,7 @@
<div class="data">
<a href="{{ URL::to('admin/licenses') }}">
<span class="number">{{ number_format(License::availassetcount()) }}</span>
<span style="color:black">licenses available</span>
<span style="color:black">@lang('general.licenses_available')</span>
</a>
</div>
</div>
app/views/backend/licenses/edit.blade.php
+18 -18
View File
@@ -3,9 +3,9 @@
{{-- Page title --}}
@section('title')
@if ($license->id)
License Update ::
@lang('admin/licenses/form.update') ::
@else
Create License ::
@lang('admin/licenses/form.create') ::
@endif
@parent
@stop
@@ -15,12 +15,12 @@
<div class="row header">
<div class="col-md-12">
<a href="{{ URL::previous() }}" class="btn-flat gray pull-right right"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
<a href="{{ URL::previous() }}" class="btn-flat gray pull-right right"><i class="icon-circle-arrow-left icon-white"></i> @lang('general.back')</a>
<h3>
@if ($license->id)
Update License
@lang('admin/licenses/form.update')
@else
Create License
@lang('admin/licenses/form.create')
@endif
</h3>
</div>
@@ -34,7 +34,7 @@
<!-- Asset Tag -->
<div class="form-group {{ $errors->has('name') ? ' has-error' : '' }}">
<label for="name" class="col-md-3 control-label">Software Name</label>
<label for="name" class="col-md-3 control-label">@lang('admin/licenses/form.name')</label>
<div class="col-md-7">
<input class="form-control" type="text" name="name" id="name" value="{{ Input::old('name', $license->name) }}" />
{{ $errors->first('name', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
@@ -42,7 +42,7 @@
</div>
<div class="form-group {{ $errors->has('serial') ? ' has-error' : '' }}">
<label for="serial" class="col-md-3 control-label">Serial</label>
<label for="serial" class="col-md-3 control-label">@lang('admin/licenses/form.serial')</label>
<div class="col-md-7">
<input class="form-control" type="text" name="serial" id="serial" value="{{ Input::old('serial', $license->serial) }}" />
{{ $errors->first('serial', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
@@ -50,7 +50,7 @@
</div>
<div class="form-group {{ $errors->has('license_name') ? ' has-error' : '' }}">
<label for="license_name" class="col-md-3 control-label">Licensed to Name</label>
<label for="license_name" class="col-md-3 control-label">@lang('admin/licenses/form.to_name')</label>
<div class="col-md-7">
<input class="form-control" type="text" name="license_name" id="license_name" value="{{ Input::old('license_name', $license->license_name) }}" />
{{ $errors->first('license_name', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
@@ -58,7 +58,7 @@
</div>
<div class="form-group {{ $errors->has('license_email') ? ' has-error' : '' }}">
<label for="license_email" class="col-md-3 control-label">Licensed to Email</label>
<label for="license_email" class="col-md-3 control-label">@lang('admin/licenses/form.to_email')</label>
<div class="col-md-7">
<input class="form-control" type="text" name="license_email" id="license_email" value="{{ Input::old('license_email', $license->license_email) }}" />
{{ $errors->first('license_email', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
@@ -66,7 +66,7 @@
</div>
<div class="form-group {{ $errors->has('seats') ? ' has-error' : '' }}">
<label for="seats" class="col-md-3 control-label">Seats</label>
<label for="seats" class="col-md-3 control-label">@lang('admin/licenses/form.seats')</label>
<div class="col-md-3">
<input class="form-control" type="text" name="seats" id="seats" value="{{ Input::old('seats', $license->seats) }}" />
{{ $errors->first('seats', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
@@ -74,7 +74,7 @@
</div>
<div class="form-group {{ $errors->has('order_number') ? ' has-error' : '' }}">
<label for="order_number" class="col-md-3 control-label">Order No.</label>
<label for="order_number" class="col-md-3 control-label">@lang('admin/licenses/form.order')</label>
<div class="col-md-7">
<input class="form-control" type="text" name="order_number" id="order_number" value="{{ Input::old('order_number', $license->order_number) }}" />
{{ $errors->first('order_number', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
@@ -83,7 +83,7 @@
<!-- Purchase Date -->
<div class="form-group {{ $errors->has('purchase_date') ? ' has-error' : '' }}">
<label for="purchase_date" class="col-md-3 control-label">Purchase Date</label>
<label for="purchase_date" class="col-md-3 control-label">@lang('admin/licenses/form.date')</label>
<div class="input-group col-md-2">
<input type="date" class="datepicker form-control" data-date-format="yyyy-mm-dd" placeholder="Select Date" name="purchase_date" id="purchase_date" value="{{ Input::old('purchase_date', $license->purchase_date) }}">
<span class="input-group-addon"><i class="icon-calendar"></i></span>
@@ -93,10 +93,10 @@
<!-- Purchase Cost -->
<div class="form-group {{ $errors->has('purchase_cost') ? ' has-error' : '' }}">
<label for="purchase_cost" class="col-md-3 control-label">Purchase Cost</label>
<label for="purchase_cost" class="col-md-3 control-label">@lang('admin/licenses/form.cost')</label>
<div class="col-md-2">
<div class="input-group">
<span class="input-group-addon">$</span>
<span class="input-group-addon">@lang('general.currency')</span>
<input class="col-md-2 form-control" type="text" name="purchase_cost" id="purchase_cost" value="{{ Input::old('purchase_cost', $license->purchase_cost) }}" />
{{ $errors->first('purchase_cost', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
</div>
@@ -105,7 +105,7 @@
<!-- Depreciation -->
<div class="form-group {{ $errors->has('depreciation_id') ? ' has-error' : '' }}">
<label for="parent" class="col-md-3 control-label">Depreciation</label>
<label for="parent" class="col-md-3 control-label">@lang('admin/licenses/form.depreciation')</label>
<div class="col-md-7">
{{ Form::select('depreciation_id', $depreciation_list , Input::old('depreciation_id', $license->depreciation_id), array('class'=>'select2', 'style'=>'width:350px')) }}
{{ $errors->first('depreciation_id', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
@@ -114,7 +114,7 @@
<!-- Notes -->
<div class="form-group {{ $errors->has('notes') ? ' has-error' : '' }}">
<label for="notes" class="col-md-3 control-label">Notes</label>
<label for="notes" class="col-md-3 control-label">@lang('admin/licenses/form.notes')</label>
<div class="col-md-7">
<input class="col-md-6 form-control" type="text" name="notes" id="notes" value="{{ Input::old('notes', $license->notes) }}" />
{{ $errors->first('notes', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
@@ -126,8 +126,8 @@
<label class="col-md-3 control-label"></label>
<div class="col-md-7">
<a class="btn btn-link" href="{{ URL::previous() }}">Cancel</a>
<button type="submit" class="btn btn-success"><i class="icon-ok icon-white"></i> Save</button>
<a class="btn btn-link" href="{{ URL::previous() }}">@lang('general.cancel')</a>
<button type="submit" class="btn btn-success"><i class="icon-ok icon-white"></i> @lang('general.save')</button>
</div>
</div>