Merge branch '2.4' into add-schedule-id

This commit is contained in:
Shuichiro MAKIGAKI
2018-02-19 17:59:21 +09:00
committed by GitHub
6 changed files with 21 additions and 4 deletions

View File

@@ -15,12 +15,12 @@
<meta name="MobileOptimized" content="320">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="description" content="{{ trans('cachet.description', ['app' => $app_name]) }}">
<meta name="description" content="@yield('description', trans('cachet.meta.description.overview', ['app' => $app_name]))">
<meta property="og:type" content="website">
<meta property="og:title" content="{{ $site_title }}">
<meta property="og:image" content="/img/favicon.png">
<meta property="og:description" content="{{ trans('cachet.description', ['app' => $app_name]) }}">
<meta property="og:description" content="@yield('description', trans('cachet.meta.description.overview', ['app' => $app_name]))">
<!-- Mobile IE allows us to activate ClearType technology for smoothing fonts for easy reading -->
<meta http-equiv="cleartype" content="on">

View File

@@ -2,6 +2,8 @@
@section('title', $incident->name.' | '.$site_title)
@section('description', trans('cachet.meta.description.incident', ['name' => $incident->name, 'date' => $incident->occurred_at_formatted]))
@section('bodyClass', 'no-padding')
@section('outer-content')

View File

@@ -2,6 +2,8 @@
@section('title', $schedule->name.' | '.$site_title)
@section('description', trans('cachet.meta.description.schedule', ['name' => $schedule->name, 'startDate' => $schedule->scheduled_at_formatted]))
@section('bodyClass', 'no-padding')
@section('outer-content')

View File

@@ -1,5 +1,9 @@
@extends('layout.master')
@section('title', trans('cachet.subscriber.subscribe'). " | ". $site_title))
@section('description', trans('cachet.meta.description.subscribe', ['app' => $site_title]))
@section('content')
<div class="pull-right">
<p><a class="btn btn-success btn-outline" href="{{ cachet_route('status-page') }}"><i class="ion ion-home"></i></a></p>