Downgrade bootstrap-datetimepicker

This commit is contained in:
James Brooks
2015-06-16 15:09:49 +01:00
parent ea56ca4cec
commit 7cd7e595f2
6 changed files with 42 additions and 37 deletions

View File

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

File diff suppressed because one or more lines are too long

15
public/build/dist/js/all-864bf75b.js vendored Normal file

File diff suppressed because one or more lines are too long

View File

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

View File

@@ -82,15 +82,19 @@
</div> </div>
@endif @endif
<div class="form-group hidden" id="component-status"> <div class="form-group hidden" id="component-status">
<div class="radio-items"> <div class="panel panel-default">
@foreach(trans('cachet.components.status') as $statusID => $status) <div class="panel-body">
<div class="radio-inline"> <div class="radio-items">
<label> @foreach(trans('cachet.components.status') as $statusID => $status)
<input type="radio" name="incident[component_status]" value="{{ $statusID }}"> <div class="radio-inline">
{{ $status }} <label>
</label> <input type="radio" name="incident[component_status]" value="{{ $statusID }}">
{{ $status }}
</label>
</div>
@endforeach
</div>
</div> </div>
@endforeach
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">

View File

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