mirror_php/Cachet
1
0
Fork 0
mirror of https://github.com/CachetHQ/Cachet.git synced 2025-01-17 21:49:01 +01:00
Code Issues Projects Releases Wiki Activity

Site title shows Cachet is we're showing support. Closes #1394

Browse Source
This commit is contained in:
James Brooks 2016-01-25 09:34:42 +00:00
parent bc50e86948
commit 0466da8fe9
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Composers/AppComposer.php
View File

@ -27,6 +27,7 @@ class AppComposer
*/
public function compose(View $view)
{
$support = Setting::get('show_support');
$view->withAboutApp(Markdown::convertToHtml(Setting::get('app_about')));
$view->withAppAnalytics(Setting::get('app_analytics'));
$view->withAppAnalyticsGoSquared(Setting::get('app_analytics_go_squared'));
@ -39,8 +40,13 @@ class AppComposer
$view->withAppGraphs(Setting::get('display_graphs'));
$view->withAppLocale(Setting::get('app_locale'));
$view->withAppName(Setting::get('app_name'));
if ($support) {
$view->withSiteTitle(Setting::get('app_name').' | Cachet');
} else {
$view->withSiteTitle(Setting::get('app_name'));
}
$view->withAppStylesheet(Setting::get('stylesheet'));
$view->withAppUrl(Config::get('app.url'));
$view->withShowSupport(Setting::get('show_support'));
$view->withShowSupport($support);
}
}

2
resources/views/dashboard/partials/head.blade.php
View File

@ -18,7 +18,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>{{ $page_title or $app_name.' | Cachet' }}</title>
<title>{{ $page_title or $site_title }}</title>
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,700" rel="stylesheet" type="text/css">
<link rel="stylesheet" href="{{ elixir('dist/css/all.css') }}">

9
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="{{ $app_name.' | Cachet' }} - Atom Feed">
<link rel="alternate" type="application/rss+xml" href="/rss" title="{{ $app_name.' | Cachet' }} - RSS Feed">
<link rel="alternate" type="application/atom+xml" href="/atom" title="{{ $site_title }} - Atom Feed">
<link rel="alternate" type="application/rss+xml" href="/rss" title="{{ $site_title }} - RSS Feed">
<!-- Mobile friendliness -->
<meta name="HandheldFriendly" content="True">
@ -35,7 +35,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>{{ $app_name.' | Cachet' }}</title>
<title>{{ $site_title }}</title>
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,700" rel="stylesheet" type="text/css">
<link rel="stylesheet" href="{{ elixir('dist/css/all.css') }}">
@ -57,11 +57,10 @@
<script src="{{ elixir('dist/js/all.js') }}"></script>
</head>
<body class="status-page">
@include('partials.banner')
<div class="container">
@yield('content')
@yield('content')
</div>
@include('partials.footer')