Skip to content

Commit

Permalink
Merge branch 'release/v0.5.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
frdteknikelektro committed May 23, 2018
2 parents 97aaf80 + 4a3ad34 commit 0dc66c0
Show file tree
Hide file tree
Showing 9 changed files with 40 additions and 9 deletions.
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -13,7 +13,7 @@
"admin-lte": "^2.4.3",
"axios": "^0.16.2",
"bootstrap-sass": "^3.3.7",
"cross-env": "^5.1.5",
"cross-env": "^5.1.6",
"fastclick": "^1.0.6",
"font-awesome": "^4.7.0",
"icheck": "^1.0.2",
Expand Down
4 changes: 4 additions & 0 deletions public/css/admin-lte.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/js/admin-lte.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/js/auth.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions public/mix-manifest.json
@@ -1,8 +1,8 @@
{
"/js/vendor.js": "/js/vendor.js?id=08a303b1ccc6c57381ad",
"/js/admin-lte.js": "/js/admin-lte.js?id=23451a72c02d19820f0c",
"/css/admin-lte.css": "/css/admin-lte.css?id=a5dcd3d1c64ba9b221e4",
"/js/admin-lte.js": "/js/admin-lte.js?id=733ce4f97bc87c4f05bd",
"/css/admin-lte.css": "/css/admin-lte.css?id=c78094f0e9a096de3634",
"/css/auth.css": "/css/auth.css?id=8e53beb45d912d17ad02",
"/js/auth.js": "/js/auth.js?id=fb9567b86d6851f372ea",
"/js/auth.js": "/js/auth.js?id=6033172192be27cc5489",
"/js/manifest.js": "/js/manifest.js?id=0225916a5d4fbc86a881"
}
12 changes: 10 additions & 2 deletions resources/assets/js/admin-lte.js
Expand Up @@ -17,6 +17,9 @@ try {

require('icheck');

// bootstrap-datepicker
require('bootstrap-datepicker');

require('admin-lte');
} catch (e) {}

Expand Down Expand Up @@ -61,7 +64,12 @@ if (token) {

$(document).ready(function() {
$('.i-checks').iCheck({
checkboxClass: 'icheckbox_square-green',
radioClass: 'iradio_square-green'
checkboxClass: 'icheckbox_square-blue',
radioClass: 'iradio_square-blue'
});

$('.js-datepicker').datepicker({
autoclose: true,
todayHighlight: true
})
});
2 changes: 1 addition & 1 deletion resources/assets/js/auth.js
Expand Up @@ -3,7 +3,7 @@
require('./admin-lte');

$(document).ready(function() {
$('input').iCheck({
$('icheck').iCheck({
checkboxClass: 'icheckbox_square-blue',
radioClass: 'iradio_square-blue',
increaseArea: '20%' // optional
Expand Down
3 changes: 3 additions & 0 deletions resources/assets/sass/admin-lte.scss
Expand Up @@ -10,6 +10,9 @@
// iCheck
@import "~icheck/skins/square/blue.css";

// Bootstrap Datepicker
@import "~bootstrap-datepicker/dist/css/bootstrap-datepicker3.css";

// AdminLTE
@import "~admin-lte/dist/css/AdminLTE";
@import "~admin-lte/dist/css/skins/_all-skins";
16 changes: 16 additions & 0 deletions resources/views/components/fields/datepicker.blade.php
@@ -0,0 +1,16 @@
<div class="form-group{{ $errors->has($field['name']) ? ' has-error' : '' }}">
<label class="control-label">{{ !empty($field['label']) ? $field['label'] : title_case(str_replace('_', ' ', snake_case($field['name']))) }}{{ !empty($field['required']) ? '*' : '' }}</label>
<div class="input-group">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
<input type="text"
class="form-control js-datepicker"
name="{{ $field['name'] }}"
value="{{ old($field['name'], isset($model) ? $model->{$field['name']} : null) }}" {{ !empty($field['required']) ? 'required' : '' }}
data-date-format="yyyy-mm-dd"
data-date-z-index-offset="1001"
>
</div>
@if ($errors->has($field['name']))
<span class="help-block">{{ $errors->first($field['name']) }}</span>
@endif
</div>

0 comments on commit 0dc66c0

Please sign in to comment.