diff --git a/app/Http/Controllers/StatuslabelsController.php b/app/Http/Controllers/StatuslabelsController.php index fb4cab69ef..f680ec5696 100755 --- a/app/Http/Controllers/StatuslabelsController.php +++ b/app/Http/Controllers/StatuslabelsController.php @@ -120,6 +120,7 @@ class StatuslabelsController extends Controller $statuslabel->pending = $statustype['pending']; $statuslabel->archived = $statustype['archived']; $statuslabel->color = e(Input::get('color')); + $statuslabel->show_in_nav = e(Input::get('show_in_nav'),0); // Was the asset created? @@ -208,6 +209,7 @@ class StatuslabelsController extends Controller $statuslabel->pending = $statustype['pending']; $statuslabel->archived = $statustype['archived']; $statuslabel->color = e(Input::get('color')); + $statuslabel->show_in_nav = e(Input::get('show_in_nav'),0); // Was the asset created? @@ -258,7 +260,7 @@ class StatuslabelsController extends Controller public function getDatatable() { - $statuslabels = Statuslabel::select(array('id','name','deployable','pending','archived','color')) + $statuslabels = Statuslabel::select(array('id','name','deployable','pending','archived','color','show_in_nav')) ->whereNull('deleted_at'); if (Input::has('search')) { @@ -314,6 +316,7 @@ class StatuslabelsController extends Controller 'type' => e($label_type), 'name' => e($statuslabel->name), 'color' => $color, + 'show_in_nav' => ($statuslabel->show_in_nav=='1') ? trans('general.yes') : trans('general.no'), 'actions' => $actions ); } diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php index 9b119d9374..66af2f7779 100644 --- a/resources/views/layouts/default.blade.php +++ b/resources/views/layouts/default.blade.php @@ -405,6 +405,16 @@
  • @lang('general.list_all')
  • + + get(); ?> + @if (count($status_navs) > 0) +
  •  
  • + @foreach ($status_navs as $status_nav) +
  • {{ $status_nav->name }}
  • + @endforeach + @endif + + @lang('general.deployed') @@ -489,8 +499,7 @@
  • @lang('general.asset_report')
  • @lang('general.unaccepted_asset_report')
  • @lang('general.accessory_report')
  • -
  • @lang('general.custom_report')
  • - +
  • @lang('general.custom_report')
  • @endcan diff --git a/resources/views/statuslabels/edit.blade.php b/resources/views/statuslabels/edit.blade.php index 0cec6ac2e3..efb9e5dfb8 100755 --- a/resources/views/statuslabels/edit.blade.php +++ b/resources/views/statuslabels/edit.blade.php @@ -38,9 +38,8 @@
    -
    +
    -
    {!! $errors->first('name', ' :message') !!} @@ -48,9 +47,8 @@
    -
    - +
    +
    {{ Form::select('statuslabel_types', $statuslabel_types, $statuslabel->getStatuslabelType(), array('class'=>'select2', 'style'=>'min-width:400px')) }} {!! $errors->first('statuslabel_types', ' :message') !!} @@ -65,14 +63,12 @@ {{ Form::text('color', Input::old('color', $statuslabel->color), array('class' => 'form-control', 'style' => 'width: 100px;', 'maxlength'=>'10')) }}
    - - {!! $errors->first('header_color', ':message') !!}
    -
    +
    @@ -80,6 +76,15 @@
    + +
    + + +
    + + diff --git a/resources/views/statuslabels/index.blade.php b/resources/views/statuslabels/index.blade.php index 6541bb35da..d040596b48 100755 --- a/resources/views/statuslabels/index.blade.php +++ b/resources/views/statuslabels/index.blade.php @@ -32,6 +32,7 @@ {{ trans('admin/statuslabels/table.name') }} {{ trans('admin/statuslabels/table.status_type') }} {{ trans('admin/statuslabels/table.color') }} + {{ trans('admin/statuslabels/table.show_in_nav') }} {{ trans('table.actions') }}