From d15ff4ec6f0ecc2c14c64eeea94ca57a8ef8a451 Mon Sep 17 00:00:00 2001 From: Andy Heathershaw Date: Sat, 25 Mar 2017 21:21:22 +0000 Subject: [PATCH] #9: Groups now uses the new Bootstrap v4 look --- .idea/deployment.xml | 3 +- .../Controllers/Admin/GroupController.php | 7 +- .../themes/base/admin/create_group.blade.php | 51 ++++----- .../themes/base/admin/delete_group.blade.php | 41 ++++--- .../themes/base/admin/edit_group.blade.php | 100 +++++++++--------- .../themes/base/admin/list_groups.blade.php | 19 ++-- 6 files changed, 105 insertions(+), 116 deletions(-) diff --git a/.idea/deployment.xml b/.idea/deployment.xml index 981e50c..02a52c6 100644 --- a/.idea/deployment.xml +++ b/.idea/deployment.xml @@ -1,6 +1,6 @@ - + @@ -10,5 +10,6 @@ + \ No newline at end of file diff --git a/app/Http/Controllers/Admin/GroupController.php b/app/Http/Controllers/Admin/GroupController.php index 9a1048f..4415c82 100644 --- a/app/Http/Controllers/Admin/GroupController.php +++ b/app/Http/Controllers/Admin/GroupController.php @@ -85,7 +85,7 @@ class GroupController extends Controller * @param int $id * @return \Illuminate\Http\Response */ - public function edit($id) + public function edit(Request $request, $id) { $this->authorize('admin-access'); @@ -95,6 +95,11 @@ class GroupController extends Controller App::abort(404); } + if (!$request->session()->has('_old_input')) + { + $request->session()->flash('_old_input', $group->toArray()); + } + return Theme::render('admin.edit_group', ['group' => $group]); } diff --git a/resources/views/themes/base/admin/create_group.blade.php b/resources/views/themes/base/admin/create_group.blade.php index 6afbfab..0dac776 100644 --- a/resources/views/themes/base/admin/create_group.blade.php +++ b/resources/views/themes/base/admin/create_group.blade.php @@ -2,47 +2,42 @@ @section('title', trans('admin.create_group')) @section('breadcrumb') -
-
-
    -
    2. -
  2. @lang('navigation.breadcrumb.admin')
    3. -
  3. @lang('navigation.breadcrumb.groups')
    4. -
  4. @lang('navigation.breadcrumb.create_group')
    5. -
-
-
+
    • +
  • @lang('navigation.breadcrumb.admin')
    • +
  • @lang('navigation.breadcrumb.groups')
    • +
  • @lang('navigation.breadcrumb.create_group')
    • @endsection @section('content')
    -
    +

    @yield('title')

    @lang('admin.create_group_intro')

    - {!! Form::open(['route' => 'groups.store', 'method' => 'POST']) !!} -
    -
    -
    - {!! Form::label('name', trans('forms.name_label'), ['class' => 'control-label']) !!} - {!! Form::text('name', old('name'), ['class' => 'form-control']) !!} +
    + {{ csrf_field() }} +
    +
    +
    + + - @if ($errors->has('name')) - - {{ $errors->first('name') }} - - @endif -
    + @if ($errors->has('name')) + + @endif +
    -
    - @lang('forms.cancel_action') - +
    + @lang('forms.cancel_action') + +
    -
    - {!! Form::close() !!} +
    diff --git a/resources/views/themes/base/admin/delete_group.blade.php b/resources/views/themes/base/admin/delete_group.blade.php index f93d78e..6cb12b8 100644 --- a/resources/views/themes/base/admin/delete_group.blade.php +++ b/resources/views/themes/base/admin/delete_group.blade.php @@ -2,32 +2,31 @@ @section('title', trans('admin.delete_group', ['name' => $group->name])) @section('breadcrumb') -
    -
    -
      -
      2. -
    2. @lang('navigation.breadcrumb.admin')
      3. -
    3. @lang('navigation.breadcrumb.groups')
      4. -
    4. @lang('navigation.breadcrumb.delete_group')
      5. -
    -
    -
    +
    • +
  • @lang('navigation.breadcrumb.admin')
    • +
  • @lang('navigation.breadcrumb.groups')
    • +
  • @lang('navigation.breadcrumb.delete_group')
    • @endsection @section('content')
    -
    -

    @yield('title')

    -

    @lang('admin.delete_group_confirm', ['name' => $group->name])

    -
    - @lang('admin.delete_group_warning') -
    -
    - {!! Form::open(['route' => ['groups.destroy', $group->id], 'method' => 'DELETE']) !!} - @lang('forms.cancel_action') - - {!! Form::close() !!} +
    +
    +
    @yield('title')
    +
    +

    @lang('admin.delete_group_confirm', ['name' => $group->name])

    +

    @lang('admin.delete_group_warning')

    + +
    +
    + {{ csrf_field() }} + {{ method_field('DELETE') }} + @lang('forms.cancel_action') + +
    +
    +
    diff --git a/resources/views/themes/base/admin/edit_group.blade.php b/resources/views/themes/base/admin/edit_group.blade.php index c5dd9a1..9306324 100644 --- a/resources/views/themes/base/admin/edit_group.blade.php +++ b/resources/views/themes/base/admin/edit_group.blade.php @@ -2,76 +2,72 @@ @section('title', trans('admin.edit_group_title', ['group_name' => $group->name])) @section('breadcrumb') -
    -
    -
      -
      2. -
    2. @lang('navigation.breadcrumb.admin')
      3. -
    3. @lang('navigation.breadcrumb.groups')
      4. -
    4. @lang('navigation.breadcrumb.edit_group')
      5. -
    -
    -
    +
    • +
  • @lang('navigation.breadcrumb.admin')
    • +
  • @lang('navigation.breadcrumb.groups')
    • +
  • @lang('navigation.breadcrumb.edit_group')
    • @endsection @section('content')
    -
    +

    @yield('title')

    @lang('admin.edit_group_intro')

    - {!! Form::model($group, ['route' => ['groups.update', $group->id], 'method' => 'PUT']) !!} -
    - {{-- Nav tabs --}} - +
    + {{ csrf_field() }} + {{ method_field('PUT') }} +
    + {{-- Nav tabs --}} +
      + @include(Theme::viewName('partials.tab'), ['active_tab' => 'details', 'tab_name' => 'details', 'tab_icon' => 'info-circle', 'tab_text' => trans('admin.group_details_tab')]) + @include(Theme::viewName('partials.tab'), ['active_tab' => 'details', 'tab_name' => 'users', 'tab_icon' => 'users', 'tab_text' => trans('admin.group_users_tab')]) +
    - {{-- Tab panes --}} -
    - {{-- Details --}} -
    -
    -
    -
    - {!! Form::label('name', trans('forms.name_label'), ['class' => 'control-label']) !!} - {!! Form::text('name', old('name'), ['class' => 'form-control']) !!} + {{-- Tab panes --}} +
    + {{-- Details --}} +
    +
    +
    +
    + + - @if ($errors->has('name')) - - {{ $errors->first('name') }} - - @endif -
    + @if ($errors->has('name')) + + @endif +
    -
    - @lang('forms.cancel_action') - +
    + @lang('forms.cancel_action') + +
    -
    - {{-- Users --}} -
    - @if ($group->users()->count() > 0) -

    @lang('admin.group_users_message', ['group_name' => $group->name])

    - - @else -

    @lang('admin.group_no_users_message')

    -

    @lang('admin.users_title')

    - @endif + {{-- Users --}} +
    + @if ($group->users()->count() > 0) +

    @lang('admin.group_users_message', ['group_name' => $group->name])

    + + @else +

    @lang('admin.group_no_users_message')

    + + @endif +
    -
    - {!! Form::close() !!} +
    diff --git a/resources/views/themes/base/admin/list_groups.blade.php b/resources/views/themes/base/admin/list_groups.blade.php index 506e384..c8a5375 100644 --- a/resources/views/themes/base/admin/list_groups.blade.php +++ b/resources/views/themes/base/admin/list_groups.blade.php @@ -2,21 +2,15 @@ @section('title', trans('admin.list_groups_title')) @section('breadcrumb') -
    -
    -
      -
      2. -
    2. @lang('navigation.breadcrumb.admin')
      3. -
    3. @lang('navigation.breadcrumb.groups')
      4. -
    -
    -
    +
    • +
  • @lang('navigation.breadcrumb.admin')
    • +
  • @lang('navigation.breadcrumb.groups')
    • @endsection @section('content')
    -
    +

    @yield('title')

    @lang('admin.list_groups_intro')

    @@ -36,11 +30,10 @@ @foreach ($groups as $group) - {{ $group->name }}
    + {{ $group->name }}
    {{ trans_choice('admin.group_number_users', $group->users()->count()) }} - @lang('forms.edit_action') @lang('forms.delete_action') @@ -53,7 +46,7 @@
    - @lang('admin.list_users_title') + @lang('admin.list_users_title') @lang('admin.create_group')
    @endif