diff --git a/package.json b/package.json
index c6878348f9d45873f7d91b7e71571967a9f1fdb0..ee56a6406de70b56cd3aa8660c71d2fd8a1251d4 100644
--- a/package.json
+++ b/package.json
@@ -27,6 +27,7 @@
"bootstrap-less": "^3.3.8",
"ekko-lightbox": "^5.1.1",
"font-awesome": "^4.7.0",
+ "icheck": "^1.0.2",
"jquery-slimscroll": "^1.3.8",
"jquery-ui": "^1.12.1",
"jquery-ui-bundle": "^1.12.1",
diff --git a/public/css/AdminLTE.css b/public/css/AdminLTE.css
index dd3eb5e0163167ba9efab59e40326f09bd11f57d..9219746bcf1a20a817da994fc556888c09a44782 100755
Binary files a/public/css/AdminLTE.css and b/public/css/AdminLTE.css differ
diff --git a/public/css/app.css b/public/css/app.css
index 89a60fedb21079ee5a000a65eb6b4cce7291e95d..77b31b0671d6b285c57c6369d61566bfbfe05402 100644
Binary files a/public/css/app.css and b/public/css/app.css differ
diff --git a/public/css/build/all.css b/public/css/build/all.css
index b2c93cb85969d370101e8d6a7b083e8fdff628e3..d8b0975bc0cd900fe41ca291c111000df32d66b4 100644
Binary files a/public/css/build/all.css and b/public/css/build/all.css differ
diff --git a/public/css/dist/all.css b/public/css/dist/all.css
index b2c93cb85969d370101e8d6a7b083e8fdff628e3..d8b0975bc0cd900fe41ca291c111000df32d66b4 100644
Binary files a/public/css/dist/all.css and b/public/css/dist/all.css differ
diff --git a/public/css/overrides.css b/public/css/overrides.css
index 4db8c5ee3bc3bb30d9d0335022a73bd4b6e6fe44..a5294436d3aac835d2a6455c0050ac97bb7732fe 100644
Binary files a/public/css/overrides.css and b/public/css/overrides.css differ
diff --git a/public/js/build/all.js b/public/js/build/all.js
index e33831514c16af2c0f0cd0b228c86f94d539bb38..35225fda10eb4048cfce0b39d09edbb3e3fcf12d 100644
Binary files a/public/js/build/all.js and b/public/js/build/all.js differ
diff --git a/public/js/build/vue.js b/public/js/build/vue.js
index 0ea1a765e03ab71a95b5f1102e2f3e3cb0bf04da..1bc38465da4e7753fc44114bfe6df7cc30f564dd 100644
Binary files a/public/js/build/vue.js and b/public/js/build/vue.js differ
diff --git a/public/js/dist/all.js b/public/js/dist/all.js
index e33831514c16af2c0f0cd0b228c86f94d539bb38..35225fda10eb4048cfce0b39d09edbb3e3fcf12d 100644
Binary files a/public/js/dist/all.js and b/public/js/dist/all.js differ
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 0ae079e6c991f5fe5f8b2e3bc675a69a05c71c09..a7d2ddcfc1b613e2dcc08dfb68b17356566ea34a 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -1,14 +1,10 @@
{
- "/js/build/vue.js": "/js/build/vue.js?id=e6804371942215bd1d7d",
- "/css/AdminLTE.css": "/css/AdminLTE.css?id=b8be19a285eaf44eec37",
- "/css/app.css": "/css/app.css?id=407edb63cc6b6dc62405",
- "/css/overrides.css": "/css/overrides.css?id=9ae1a3c861441320c5a1",
- "/js/build/vue.js.map": "/js/build/vue.js.map?id=3b3d417664a61dcce3e9",
- "/css/AdminLTE.css.map": "/css/AdminLTE.css.map?id=99f5a5a03c4155cf69f6",
- "/css/app.css.map": "/css/app.css.map?id=bdbe05e6ecd70ccfac72",
- "/css/overrides.css.map": "/css/overrides.css.map?id=898c91d4a425b01b589b",
- "/css/dist/all.css": "/css/dist/all.css?id=7c3842d2639193ac7e88",
- "/js/dist/all.js": "/js/dist/all.js?id=991cd06c975979f6f067",
- "/css/build/all.css": "/css/build/all.css?id=7c3842d2639193ac7e88",
- "/js/build/all.js": "/js/build/all.js?id=991cd06c975979f6f067"
+ "/js/build/vue.js": "/js/build/vue.js?id=e9504cad01a748f9b0fa",
+ "/css/AdminLTE.css": "/css/AdminLTE.css?id=889dc040f2ddfca6efde",
+ "/css/app.css": "/css/app.css?id=3a1e8c168fa8714043a6",
+ "/css/overrides.css": "/css/overrides.css?id=3911514a8a64a4247483",
+ "/css/dist/all.css": "/css/dist/all.css?id=f2d4896e67e878a47434",
+ "/js/dist/all.js": "/js/dist/all.js?id=0d558c3ed637f4c81a77",
+ "/css/build/all.css": "/css/build/all.css?id=f2d4896e67e878a47434",
+ "/js/build/all.js": "/js/build/all.js?id=0d558c3ed637f4c81a77"
}
\ No newline at end of file
diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index f353eef0b49d13be0204866d59b26384e0bf135b..2c26dff728ca62eb56ec44a73c282ce9d26cc533 100755
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -474,30 +474,29 @@
<td class="col-md-5 tooltip-base permissions-item"
data-toggle="tooltip"
data-placement="right"
- title="{{ $localPermission['note'] }}"
- >
+ title="{{ $localPermission['note'] }}">
<h4>{{ $area . ': ' . $localPermission['label'] }}</h4>
</td>
<td class="col-md-1 permissions-item">
@if (($localPermission['permission'] == 'superuser') && (!Auth::user()->isSuperUser()))
- {{ Form::radio('permission['.$localPermission['permission'].']', '1',$userPermissions[$localPermission['permission'] ] == '1',['disabled'=>"disabled"]) }}
+ {{ Form::radio('permission['.$localPermission['permission'].']', '1',$userPermissions[$localPermission['permission'] ] == '1',['disabled'=>"disabled", 'class'=>'minimal']) }}
@else
- {{ Form::radio('permission['.$localPermission['permission'].']', '1',$userPermissions[$localPermission['permission'] ] == '1',['value'=>"grant"]) }}
+ {{ Form::radio('permission['.$localPermission['permission'].']', '1',$userPermissions[$localPermission['permission'] ] == '1',['value'=>"grant", 'class'=>'minimal']) }}
@endif
</td>
<td class="col-md-1 permissions-item">
@if (($localPermission['permission'] == 'superuser') && (!Auth::user()->isSuperUser()))
- {{ Form::radio('permission['.$localPermission['permission'].']', '-1',$userPermissions[$localPermission['permission'] ] == '-1',['disabled'=>"disabled"]) }}
+ {{ Form::radio('permission['.$localPermission['permission'].']', '-1',$userPermissions[$localPermission['permission'] ] == '-1',['disabled'=>"disabled", 'class'=>'minimal']) }}
@else
- {{ Form::radio('permission['.$localPermission['permission'].']', '-1',$userPermissions[$localPermission['permission'] ] == '-1',['value'=>"deny"]) }}
+ {{ Form::radio('permission['.$localPermission['permission'].']', '-1',$userPermissions[$localPermission['permission'] ] == '-1',['value'=>"deny", 'class'=>'minimal']) }}
@endif
</td>
<td class="col-md-1 permissions-item">
@if (($localPermission['permission'] == 'superuser') && (!Auth::user()->isSuperUser()))
- {{ Form::radio('permission['.$localPermission['permission'].']','0',$userPermissions[$localPermission['permission'] ] == '0',['disabled'=>"disabled"] ) }}
+ {{ Form::radio('permission['.$localPermission['permission'].']','0',$userPermissions[$localPermission['permission'] ] == '0',['disabled'=>"disabled",'class'=>'minimal'] ) }}
@else
- {{ Form::radio('permission['.$localPermission['permission'].']','0',$userPermissions[$localPermission['permission'] ] == '0',['value'=>"inherit"] ) }}
+ {{ Form::radio('permission['.$localPermission['permission'].']','0',$userPermissions[$localPermission['permission'] ] == '0',['value'=>"inherit", 'class'=>'minimal'] ) }}
@endif
</td>
</tr>
@@ -509,13 +508,13 @@
<h3>{{ $area }}</h3>
</td>
<td class="col-md-1 permissions-item">
- {{ Form::radio("$area", '1',false,['value'=>"grant"]) }}
+ {{ Form::radio("$area", '1',false,['value'=>"grant", 'class'=>'minimal']) }}
</td>
<td class="col-md-1 permissions-item">
- {{ Form::radio("$area", '-1',false,['value'=>"deny"]) }}
+ {{ Form::radio("$area", '-1',false,['value'=>"deny", 'class'=>'minimal']) }}
</td>
<td class="col-md-1 permissions-item">
- {{ Form::radio("$area", '0',false,['value'=>"inherit"] ) }}
+ {{ Form::radio("$area", '0',false,['value'=>"inherit", 'class'=>'minimal'] ) }}
</td>
</tr>
@@ -526,29 +525,28 @@
class="col-md-5 tooltip-base permissions-item"
data-toggle="tooltip"
data-placement="right"
- title="{{ $permission['note'] }}"
- >
+ title="{{ $permission['note'] }}">
{{ $permission['label'] }}
</td>
<td class="col-md-1 permissions-item">
@if (($permission['permission'] == 'superuser') && (!Auth::user()->isSuperUser()))
- {{ Form::radio('permission['.$permission['permission'].']', '1', $userPermissions[$permission['permission'] ] == '1', ["value"=>"grant", 'disabled'=>'disabled']) }}
+ {{ Form::radio('permission['.$permission['permission'].']', '1', $userPermissions[$permission['permission'] ] == '1', ["value"=>"grant", 'disabled'=>'disabled', 'class'=>'minimal']) }}
@else
- {{ Form::radio('permission['.$permission['permission'].']', '1', $userPermissions[ $permission['permission'] ] == '1', ["value"=>"grant"]) }}
+ {{ Form::radio('permission['.$permission['permission'].']', '1', $userPermissions[ $permission['permission'] ] == '1', ["value"=>"grant",'class'=>'minimal']) }}
@endif
</td>
<td class="col-md-1 permissions-item">
@if (($permission['permission'] == 'superuser') && (!Auth::user()->isSuperUser()))
- {{ Form::radio('permission['.$permission['permission'].']', '-1', $userPermissions[$permission['permission'] ] == '-1', ["value"=>"deny", 'disabled'=>'disabled']) }}
+ {{ Form::radio('permission['.$permission['permission'].']', '-1', $userPermissions[$permission['permission'] ] == '-1', ["value"=>"deny", 'disabled'=>'disabled', 'class'=>'minimal']) }}
@else
- {{ Form::radio('permission['.$permission['permission'].']', '-1', $userPermissions[$permission['permission'] ] == '-1', ["value"=>"deny"]) }}
+ {{ Form::radio('permission['.$permission['permission'].']', '-1', $userPermissions[$permission['permission'] ] == '-1', ["value"=>"deny",'class'=>'minimal']) }}
@endif
</td>
<td class="col-md-1 permissions-item">
@if (($permission['permission'] == 'superuser') && (!Auth::user()->isSuperUser()))
- {{ Form::radio('permission['.$permission['permission'].']', '0', $userPermissions[$permission['permission']] =='0', ["value"=>"inherit", 'disabled'=>'disabled']) }}
+ {{ Form::radio('permission['.$permission['permission'].']', '0', $userPermissions[$permission['permission']] =='0', ["value"=>"inherit", 'disabled'=>'disabled', 'class'=>'minimal']) }}
@else
- {{ Form::radio('permission['.$permission['permission'].']', '0', $userPermissions[$permission['permission']] =='0', ["value"=>"inherit"]) }}
+ {{ Form::radio('permission['.$permission['permission'].']', '0', $userPermissions[$permission['permission']] =='0', ["value"=>"inherit", 'class'=>'minimal']) }}
@endif
</td>
@endif
@@ -588,11 +586,11 @@ $(document).ready(function() {
</script>
<script nonce="{{ csrf_token() }}">
-$('tr.header-row input:radio').click(function() {
- value = $(this).attr('value');
- $(this).parent().parent().siblings().each(function() {
- $(this).find('td input:radio[value='+value+']').prop("checked", true);
- })
+$('tr.header-row input:radio').on('ifClicked', function () {
+ value = $(this).attr('value');
+ $(this).parent().parent().parent().siblings().each(function(idx,elem) {
+ $(this).find('td input:radio[value='+value+']').iCheck('check');
+ })
});
$('.header-name').click(function() {
diff --git a/webpack.mix.js b/webpack.mix.js
index 00e504e2d39f5a1c6c3d82d78e1a6d481c8ae736..bdf91c831959602da6b1f8c49be8bce182ade710 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -18,7 +18,7 @@ mix
'./resources/assets/css/app.css',
'public/css/AdminLTE.css',
'resources/assets/css/font-awesome/font-awesome.min.css',
- './bower_components/iCheck/skins/minimal/minimal.css',
+ './node_modules/icheck/skins/minimal/minimal.css',
'./node_modules/bootstrap-datepicker/dist/css/bootstrap-datepicker.standalone.css',
'public/css/bootstrap-tables-sticky-header.css',
'public/css/overrides.css'
@@ -40,10 +40,9 @@ mix
'./node_modules/jquery-slimscroll/jquery.slimscroll.js',
'./node_modules/jquery.iframe-transport/jquery.iframe-transport.js',
'./node_modules/blueimp-file-upload/js/jquery.fileupload.js',
- // './node_modules/fastclick/lib/fastclick.js',
'./node_modules/bootstrap-colorpicker/dist/js/bootstrap-colorpicker.js',
'./node_modules/bootstrap-datepicker/dist/js/bootstrap-datepicker.js',
- './bower_components/iCheck/icheck.js',
+ './node_modules/icheck/icheck.js',
'./node_modules/ekko-lightbox/dist/ekko-lightbox.js',
'./resources/assets/js/app.js', //this is part of AdminLTE
'./resources/assets/js/snipeit.js', //this is the actual Snipe-IT JS