From 4c793590b208648c2b96c65406bd92d2967956ac Mon Sep 17 00:00:00 2001
From: James Brooks <jbrooksuk@me.com>
Date: Sat, 21 Nov 2015 22:30:35 +0000
Subject: [PATCH] Use the right variable name for page titles

---
 resources/views/dashboard/partials/head.blade.php | 2 +-
 resources/views/layout/master.blade.php           | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/views/dashboard/partials/head.blade.php b/resources/views/dashboard/partials/head.blade.php
index f7d1188a..d230e7a7 100644
--- a/resources/views/dashboard/partials/head.blade.php
+++ b/resources/views/dashboard/partials/head.blade.php
@@ -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>@yield('pageTitle', isset($page_title) ? $page_title.' | Cachet' : 'Cachet')</title>
+    <title>@yield('pageTitle', isset($app_name) ? $app_name.' | Cachet' : 'Cachet')</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') }}">
diff --git a/resources/views/layout/master.blade.php b/resources/views/layout/master.blade.php
index 2f99abd3..e5f28134 100644
--- a/resources/views/layout/master.blade.php
+++ b/resources/views/layout/master.blade.php
@@ -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="{{ $page_title }} - Atom Feed">
-    <link rel="alternate" type="application/rss+xml" href="/rss" title="{{ $page_title }} - RSS Feed">
+    <link rel="alternate" type="application/atom+xml" href="/atom" title="{{ isset($app_name) ? $app_name.' | Cachet' : 'Cachet' }} - Atom Feed">
+    <link rel="alternate" type="application/rss+xml" href="/rss" title="{{ isset($app_name) ? $app_name.' | Cachet' : 'Cachet' }} - 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>{{ $page_title }}</title>
+    <title>{{ isset($app_name) ? $app_name.' | Cachet' : 'Cachet' }}</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') }}">