diff options
author | Evan McMahon <emcmahonzx@gmail.com> | 2018-03-29 10:14:48 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-29 10:14:48 +0300 |
commit | 8c0d012dfeaef1df3646a5042c62fea43f7e54ee (patch) | |
tree | 03df2026f71bc9f34c723fce11ba2bc9192b0cba | |
parent | eafce588251af70b6c5f2a04283a2f4fee3ec8f4 (diff) | |
parent | 13d76e94996e1ee7177644f6b399f688a1cc5d58 (diff) |
Merge pull request #385 from tdtgit/better-admin-polr
Better dashboard: Merge Delete/Disable column to Control column
-rw-r--r-- | app/Http/Controllers/AdminPaginationController.php | 9 | ||||
-rw-r--r-- | public/js/AdminCtrl.js | 13 | ||||
-rw-r--r-- | resources/views/snippets/link_table.blade.php | 3 |
3 files changed, 13 insertions, 12 deletions
diff --git a/app/Http/Controllers/AdminPaginationController.php b/app/Http/Controllers/AdminPaginationController.php index 827ed39..380653b 100644 --- a/app/Http/Controllers/AdminPaginationController.php +++ b/app/Http/Controllers/AdminPaginationController.php @@ -123,6 +123,12 @@ class AdminPaginationController extends Controller { </a>'; } + public function renderControlLinkCell($link){ + return '<div class="btn-group" role="group"> + ' . $this->renderToggleLinkActiveCell($link) . $this->renderDeleteLinkCell($link) . ' + </div>'; + } + /* DataTables bindings */ public function paginateAdminUsers(Request $request) { @@ -143,8 +149,7 @@ class AdminPaginationController extends Controller { $admin_links = Link::select(['short_url', 'long_url', 'clicks', 'created_at', 'creator', 'is_disabled']); return Datatables::of($admin_links) - ->addColumn('disable', [$this, 'renderToggleLinkActiveCell']) - ->addColumn('delete', [$this, 'renderDeleteLinkCell']) + ->addColumn('control', [$this, 'renderControlLinkCell']) ->editColumn('clicks', [$this, 'renderClicksCell']) ->editColumn('long_url', [$this, 'renderLongUrlCell']) ->escapeColumns(['short_url', 'creator']) diff --git a/public/js/AdminCtrl.js b/public/js/AdminCtrl.js index 586fb96..2fbbd2c 100644 --- a/public/js/AdminCtrl.js +++ b/public/js/AdminCtrl.js @@ -152,15 +152,12 @@ polr.controller('AdminCtrl', function($scope, $compile, $timeout) { "ajax": BASE_API_PATH + 'admin/get_admin_links', "columns": [ - {className: 'wrap-text', data: 'short_url', name: 'short_url'}, + {className: 'wrap-text', data: 'short_url', name: 'short_url', width: '10%'}, {className: 'wrap-text', data: 'long_url', name: 'long_url'}, - {data: 'clicks', name: 'clicks'}, - {data: 'created_at', name: 'created_at'}, - {data: 'creator', name: 'creator'}, - - {data: 'disable', name: 'disable', orderable: false, searchable: false}, - {data: 'delete', name: 'delete', orderable: false, searchable: false} - + {data: 'clicks', name: 'clicks', width: '10%'}, + {data: 'created_at', name: 'created_at', width: '18%'}, + {data: 'creator', name: 'creator', width: '20%'}, + {data: 'control', name: 'control', orderable: false, searchable: false, width: '15%'}, ] }, datatables_config)); } diff --git a/resources/views/snippets/link_table.blade.php b/resources/views/snippets/link_table.blade.php index 554d9a2..a8a2e5a 100644 --- a/resources/views/snippets/link_table.blade.php +++ b/resources/views/snippets/link_table.blade.php @@ -8,8 +8,7 @@ @if ($table_id == "admin_links_table") {{-- Show action buttons only if admin view --}} <th>Creator</th> - <th>Disable</th> - <th>Delete</th> + <th>Control</th> @endif </tr> </thead> |