Skip to content

Commit

Permalink
More fixes for #151
Browse files Browse the repository at this point in the history
  • Loading branch information
@snipe
snipe committed Jun 9, 2014
1 parent 9401667 commit 610c405
Show file tree
Hide file tree
Showing 10 changed files with 36 additions and 15 deletions.
1 change: 1 addition & 0 deletions app/lang/en/admin/categories/general.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

return array(
'update_category' => 'Update Category',
'create_category' => 'Create Category',
'asset_categories' => 'Asset Categories',
'about_asset_categories' => 'About Asset Categories',
'category_name' => 'Category Name',
Expand Down
1 change: 1 addition & 0 deletions app/lang/en/admin/categories/message.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
),

'delete' => array(
'confirm' => 'Are you sure you wish to delete this category?',
'error' => 'There was an issue deleting the category. Please try again.',
'success' => 'The category was deleted successfully.'
)
Expand Down
12 changes: 12 additions & 0 deletions app/lang/en/admin/depreciations/general.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?php

return array(
'update_depreciation' => 'Update Depreciation',
'create_depreciation' => 'Create Depreciation',
'depreciation_name' => 'Depreciation Name',
'number_of_months' => 'Number of Months',
'asset_depreciations' => 'Asset Depreciations',
'about_asset_depreciations' => 'About Asset Depreciations',
'about_depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.',

);
1 change: 1 addition & 0 deletions app/lang/en/admin/depreciations/message.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
),

'delete' => array(
'confirm' => 'Are you sure you wish to delete this depreciation class?',
'error' => 'There was an issue deleting the depreciation class. Please try again.',
'success' => 'The depreciation class was deleted successfully.'
)
Expand Down
1 change: 1 addition & 0 deletions app/lang/en/general.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
'no' => 'No',
'currency' => '$',
'save' => 'Save',
'delete' => 'Delete',
'checkout' => 'Checkout',
'checkin' => 'Checkin',
'cancel' => 'Cancel',
Expand Down
4 changes: 2 additions & 2 deletions app/views/backend/categories/edit.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
{{-- Page title --}}
@section('title')
@if ($category->id)
Category Update ::
@lang('admin/categories/general.update_category') ::
@else
Create Category ::
@lang('admin/categories/general.create_category') ::
@endif
@parent
@stop
Expand Down
6 changes: 4 additions & 2 deletions app/views/backend/categories/index.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

{{-- Page title --}}
@section('title')
Asset Categories ::
@lang('admin/categories/general.asset_categories') ::
@parent
@stop

Expand Down Expand Up @@ -33,7 +33,9 @@
<td>{{ $category->name }}</td>
<td>
<a href="{{ route('update/category', $category->id) }}" class="btn btn-warning"><i class="icon-pencil icon-white"></i></a>
<a data-html="false" class="btn delete-asset btn-danger" data-toggle="modal" href="{{ route('delete/category', $category->id) }}" data-content="Are you sure you wish to delete this category?" data-title="Delete {{ htmlspecialchars($category->name) }}?" onClick="return false;"><i class="icon-trash icon-white"></i></a>
<a data-html="false" class="btn delete-asset btn-danger" data-toggle="modal" href="{{ route('delete/category', $category->id) }}" data-content="
@lang('admin/categories/message.delete.confirm')
" data-title="Delete {{ htmlspecialchars($category->name) }}?" onClick="return false;"><i class="icon-trash icon-white"></i></a>

</td>
</tr>
Expand Down
12 changes: 6 additions & 6 deletions app/views/backend/depreciations/edit.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
@section('title')

@if ($depreciation->id)
Update Depreciation
@lang('admin/depreciations/general.update_depreciation') ::
@else
Create Depreciation
@lang('admin/depreciations/general.update_depreciation') ::
@endif

@parent
Expand All @@ -20,9 +20,9 @@
<a href="{{ URL::previous() }}" class="btn-flat gray pull-right"><i class="icon-circle-arrow-left icon-white"></i> @lang('general.back')</a>
<h3>
@if ($depreciation->id)
Update Depreciation
@lang('admin/depreciations/general.update_depreciation')
@else
Create Depreciation
@lang('admin/depreciations/general.update_depreciation')
@endif
</h3>
</div>
Expand All @@ -35,7 +35,7 @@

<!-- Name -->
<div class="form-group {{ $errors->has('name') ? ' has-error' : '' }}">
<label for="name" class="col-md-4 control-label">Depreciation Name</label>
<label for="name" class="col-md-4 control-label">@lang('admin/depreciations/general.depreciation_name')</label>
<div class="col-md-6">
<input class="form-control" type="text" name="name" id="name" value="{{ Input::old('name', $depreciation->name) }}" />
{{ $errors->first('name', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
Expand All @@ -44,7 +44,7 @@

<!-- Name -->
<div class="form-group {{ $errors->has('months') ? ' has-error' : '' }}">
<label for="months" class="col-md-4 control-label">Number of Months</label>
<label for="months" class="col-md-4 control-label">@lang('admin/depreciations/general.number_of_months')</label>
<div class="col-md-1">
<input class="form-control" type="text" name="months" id="months" value="{{ Input::old('name', $depreciation->months) }}" />
{{ $errors->first('months', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
Expand Down
11 changes: 7 additions & 4 deletions app/views/backend/depreciations/index.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@
<td>{{ $depreciation->months }} @lang('admin/depreciations/table.months') </td>
<td>
<a href="{{ route('update/depreciations', $depreciation->id) }}" class="btn btn-warning"><i class="icon-pencil icon-white"></i></a>
<a data-html="false" class="btn delete-asset btn-danger" data-toggle="modal" href="{{ route('delete/depreciations', $depreciation->id) }}" data-content="Are you sure you wish to delete this depreciation?" data-title="Delete {{ htmlspecialchars($depreciation->name) }}?" onClick="return false;"><i class="icon-trash icon-white"></i></a>
<a data-html="false" class="btn delete-asset btn-danger" data-toggle="modal" href="{{ route('delete/depreciations', $depreciation->id) }}" data-content="
@lang('admin/depreciations/message.delete.confirm')
" data-title="
@lang('general.delete')
{{ htmlspecialchars($depreciation->name) }}?" onClick="return false;"><i class="icon-trash icon-white"></i></a>


</td>
Expand All @@ -51,9 +55,8 @@
<!-- side address column -->
<div class="col-md-3 col-xs-12 address pull-right">
<br /><br />
<h6>About Asset Depreciations</h6>
<p>You can set up asset depreciations to depreciate assets based on straight-line depreciation. </p>

<h6>@lang('admin/depreciations/general.about_asset_depreciations')</h6>
<p>@lang('admin/depreciations/general.about_depreciations') </p>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/views/backend/groups/create.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<div class="row header">
<div class="col-md-12">
<a href="{{ URL::previous() }}" class="btn btn-flat gray pull-right"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
<a href="{{ URL::previous() }}" class="btn btn-flat gray pull-right"><i class="icon-circle-arrow-left icon-white"></i> @lang('general.back')</a>
<h3>@lang('admin/groups/titles.create_group')</h3>
</div>
</div>
Expand Down

0 comments on commit 610c405

Please sign in to comment.