mirror_php/Cachet
1
0
Fork 0
mirror of https://github.com/CachetHQ/Cachet.git synced 2025-04-20 23:41:52 +02:00
Code Issues Projects Releases Wiki Activity

Fixes issue with $pageTitle

Browse Source
This commit is contained in:
James Brooks 2015-05-28 08:59:56 +01:00
parent fb8990dff2
commit ea94f6dd9e
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Composers/IndexComposer.php
View File

@ -29,7 +29,6 @@ class IndexComposer
$withData = [
'systemStatus' => 'danger',
'systemMessage' => trans('cachet.service.bad'),
'pageTitle' => Setting::get('app_name'),
];
if (Component::notStatus(1)->count() === 0) {

1
app/Http/Controllers/HomeController.php
View File

@ -109,6 +109,7 @@ class HomeController extends AbstractController
'canPageBackward' => $canPageBackward,
'previousDate' => $startDate->copy()->subDays($daysToShow)->toDateString(),
'nextDate' => $startDate->copy()->addDays($daysToShow)->toDateString(),
'pageTitle' => Setting::get('app_name').' Status',
]);
}
}

6
resources/views/layout/master.blade.php
View File

@ -7,8 +7,8 @@
<meta name="env" content="{{ app('env') }}">
<meta name="token" content="{{ csrf_token() }}">
<link rel="alternate" type="application/atom+xml" href="/atom" title="{{ $pageTitle ?: Setting::get('app_name') }} Status - Atom Feed">
<link rel="alternate" type="application/rss+xml" href="/rss" title="{{ $pageTitle ?: Setting::get('app_name') }} Status - RSS Feed">
<link rel="alternate" type="application/atom+xml" href="/atom" title="{{ $pageTitle }} - Atom Feed">
<link rel="alternate" type="application/rss+xml" href="/rss" title="{{ $pageTitle }} - RSS Feed">
<!-- Mobile friendliness -->
<meta name="HandheldFriendly" content="True">
@ -30,7 +30,7 @@
<link rel="apple-touch-icon" sizes="144x144" href="/img/apple-touch-icon-144x144.png">
<link rel="apple-touch-icon" sizes="152x152" href="/img/apple-touch-icon-152x152.png">
<title>{{ $pageTitle ?: Setting::get('app_name') }} Status</title>
<title>{{ $pageTitle }}</title>
<link href="//fonts.googleapis.com/css?family=Open+Sans:300,400,700" rel="stylesheet" type="text/css">
<link rel="stylesheet" href="{{ elixir('dist/css/all.css') }}">