lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update bootstrap-datetimepicker and fix #675

Browse Source
This commit is contained in:
James Brooks
2015-06-16 14:28:26 +01:00
parent fd2401a302
commit ea56ca4cec
7 changed files with 34 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bower.json
View File

@@ -15,7 +15,7 @@
"moment": "~2.9",
"livestampjs": "~1.1.2",
"chartjs": "~1.0.1",
"eonasdan-bootstrap-datetimepicker": "~4.7.14"
"eonasdan-bootstrap-datetimepicker": "~4.14.30"
},
"resolutions": {
"jquery": "~2.1.1"

4
public/build/dist/css/all-69848ef8.css → public/build/dist/css/all-0ad729ba.css vendored
View File

File diff suppressed because one or more lines are too long

24
public/build/dist/js/all-c132bc1e.js → public/build/dist/js/all-02d2b6ec.js vendored
View File

File diff suppressed because one or more lines are too long

4
public/build/rev-manifest.json
View File

@@ -1,4 +1,4 @@
{
"dist/css/all.css": "dist/css/all-69848ef8.css",
"dist/js/all.js": "dist/js/all-c132bc1e.js"
"dist/css/all.css": "dist/css/all-0ad729ba.css",
"dist/js/all.js": "dist/js/all-02d2b6ec.js"
}

11
resources/assets/sass/plugins/bootstrap-datetimepicker/bootstrap-datetimepicker.scss vendored
View File

@@ -327,14 +327,3 @@
cursor: pointer;
}
}
.sr-only {
position: absolute;
width: 1px;
height: 1px;
margin: -1px;
padding: 0;
overflow: hidden;
clip: rect(0,0,0,0);
border: 0;
}

20
resources/views/dashboard/incidents/add.blade.php
View File

@@ -81,18 +81,16 @@
<span class='help-block'>{{ trans('forms.optional') }}</span>
</div>
@endif
<div class="form-group hidden" id='component-status'>
<div class="well">
<div class="radio-items">
@foreach(trans('cachet.components.status') as $statusID => $status)
<div class="radio-inline">
<label>
<input type="radio" name="incident[component_status]" value="{{ $statusID }}" >
{{ $status }}
</label>
</div>
@endforeach
<div class="form-group hidden" id="component-status">
<div class="radio-items">
@foreach(trans('cachet.components.status') as $statusID => $status)
<div class="radio-inline">
<label>
<input type="radio" name="incident[component_status]" value="{{ $statusID }}">
{{ $status }}
</label>
</div>
@endforeach
</div>
</div>
<div class="form-group">

20
resources/views/dashboard/incidents/edit.blade.php
View File

@@ -53,18 +53,16 @@
</div>
@if($incident->component)
<div class="form-group" id='component-status'>
<div class="well">
<strong>{{ $incident->component->name }}</strong>
<div class="radio-items">
@foreach(trans('cachet.components.status') as $statusID => $status)
<div class="radio-inline">
<label>
<input type="radio" name="incident[component_status]" value="{{ $statusID }}" {{ $incident->component->status == $statusID ? "checked='checked'" : "" }}>
{{ $status }}
</label>
</div>
@endforeach
<strong>{{ $incident->component->name }}</strong>
<div class="radio-items">
@foreach(trans('cachet.components.status') as $statusID => $status)
<div class="radio-inline">
<label>
<input type="radio" name="incident[component_status]" value="{{ $statusID }}" {{ $incident->component->status == $statusID ? "checked='checked'" : "" }}>
{{ $status }}
</label>
</div>
@endforeach
</div>
</div>
@endif