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

Merge pull request #555 from cachethq/issue-551

Browse Source 
Closes #551
This commit is contained in:
James Brooks
2015-03-30 21:12:20 +01:00
parent 64d1d73d70 5251369317
commit cdd91ce673
4 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/build/dist/css/all-b0fbcef2.css → public/build/dist/css/all-6880601e.css vendored
View File

File diff suppressed because one or more lines are too long

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

@@ -1,4 +1,4 @@
{
"dist/css/all.css": "dist/css/all-b0fbcef2.css",
"dist/css/all.css": "dist/css/all-6880601e.css",
"dist/js/all.js": "dist/js/all-8bdacd0b.js"
}

2
resources/assets/sass/_status-page.scss
View File

@@ -128,7 +128,7 @@ body.status-page {
font-size: 1.2em;
}
p {
margin: 0;
margin-top: 8px;
}
}
}

13
resources/views/partials/schedule.blade.php
View File

@@ -1,18 +1,13 @@
<h1>{{ trans('cachet.incidents.scheduled') }}</h1>
<div class="timeline">
<div class="timeline schedule">
@foreach($scheduledMaintenance as $schedule)
<div class="panel panel-message">
<div class="panel panel-default">
<div class="panel-heading">
<strong>{{ $schedule->name }}</strong>
<br>
<small class="date">
<abbr class="timeago" data-toggle="tooltip" data-placement="right" title="{{ $schedule->scheduled_at_formatted }}" data-timeago="{{ $schedule->scheduled_at_iso }}">
</abbr>
</small>
<strong>{{ $schedule->name }}</strong>, <small class="date"><abbr class="timeago" data-toggle="tooltip" data-placement="right" title="{{ $schedule->scheduled_at_formatted }}" data-timeago="{{ $schedule->scheduled_at_iso }}"></abbr></small>
</div>
<div class="panel-body">
<p>{{ $schedule->formattedMessage }}</p>
{!! $schedule->formattedMessage !!}
</div>
</div>
@endforeach