From eda027a88c95c6ac7704f356ae5fc9805eb8d758 Mon Sep 17 00:00:00 2001
From: Joseph Cohen <joseph.cohen@dinkbit.com>
Date: Thu, 1 Jan 2015 15:15:07 -0600
Subject: [PATCH] Removed facades lang and url from views

---
 app/views/auth/login.blade.php                | 12 ++---
 app/views/dashboard/components/add.blade.php  |  6 +--
 app/views/dashboard/components/edit.blade.php |  6 +--
 .../dashboard/components/index.blade.php      |  6 +--
 app/views/dashboard/incidents/add.blade.php   | 12 ++---
 .../incidents/incident-template.blade.php     |  2 +-
 app/views/dashboard/incidents/index.blade.php |  8 ++--
 app/views/dashboard/index.blade.php           |  4 +-
 app/views/dashboard/metrics/index.blade.php   | 18 ++++----
 .../dashboard/notifications/index.blade.php   | 16 +++----
 .../dashboard/settings/app-setup.blade.php    |  4 +-
 .../dashboard/settings/security.blade.php     |  6 +--
 .../dashboard/settings/stylesheet.blade.php   |  6 +--
 app/views/dashboard/settings/theme.blade.php  |  6 +--
 app/views/dashboard/user/index.blade.php      |  2 +-
 app/views/errors/404.blade.php                |  6 +--
 app/views/index.blade.php                     |  4 +-
 app/views/layout/master.blade.php             | 18 ++++----
 app/views/partials/dashboard/head.blade.php   | 18 ++++----
 .../partials/dashboard/sidebar.blade.php      | 44 +++++++++----------
 app/views/partials/incident.blade.php         |  2 +-
 app/views/partials/support-link.blade.php     |  4 +-
 app/views/setup.blade.php                     | 30 ++++++-------
 23 files changed, 120 insertions(+), 120 deletions(-)

diff --git a/app/views/auth/login.blade.php b/app/views/auth/login.blade.php
index 3716b4d5..a91a31ac 100644
--- a/app/views/auth/login.blade.php
+++ b/app/views/auth/login.blade.php
@@ -8,27 +8,27 @@
             </div>
             {{ Form::open() }}
             <fieldset>
-                <legend>{{ Lang::get('cachet.login_message') }}</legend>
+                <legend>{{ trans('cachet.login_message') }}</legend>
 
                 @if(Session::has('error'))
                 <span class='text-danger'>{{ Session::get('error') }}</span>
                 @endif
 
                 <div class='form-group'>
-                    <label class='sr-only'>{{ Lang::get('cachet.forms.email') }}</label>
+                    <label class='sr-only'>{{ trans('cachet.forms.email') }}</label>
                     {{ Form::email('email', Input::old('email'), [
-                        'class' => 'form-control', 'placeholder' => Lang::get('cachet.forms.email'), 'required' => 'required'
+                        'class' => 'form-control', 'placeholder' => trans('cachet.forms.email'), 'required' => 'required'
                     ]) }}
                 </div>
                 <div class='form-group'>
-                    <label class='sr-only'>{{ Lang::get('cachet.forms.password') }}</label>
+                    <label class='sr-only'>{{ trans('cachet.forms.password') }}</label>
                     {{ Form::password('password', [
-                        'class' => 'form-control', 'placeholder' => Lang::get('cachet.forms.password'), 'required' => 'required'
+                        'class' => 'form-control', 'placeholder' => trans('cachet.forms.password'), 'required' => 'required'
                     ]) }}
                 </div>
                 <hr />
                 <div class='form-group'>
-                    <button type='submit' class='btn btn-lg btn-block btn-success'>{{ Lang::get('cachet.login') }}</button>
+                    <button type='submit' class='btn btn-lg btn-block btn-success'>{{ trans('cachet.login') }}</button>
                 </div>
             </fieldset>
             {{ Form::close() }}
diff --git a/app/views/dashboard/components/add.blade.php b/app/views/dashboard/components/add.blade.php
index 513f2882..c638e1cc 100644
--- a/app/views/dashboard/components/add.blade.php
+++ b/app/views/dashboard/components/add.blade.php
@@ -3,7 +3,7 @@
 @section('content')
     <div class="header">
         <span class="uppercase">
-            <i class="icons ion-ios-keypad"></i> {{ Lang::get('cachet.dashboard.components') }}
+            <i class="icons ion-ios-keypad"></i> {{ trans('cachet.dashboard.components') }}
         </span>
         > <small>Create a component</small>
     </div>
@@ -29,7 +29,7 @@
                         <div class='form-group'>
                             <label for='component-status'>Status</label>
                             <select name='component[status]' class='form-control'>
-                                @foreach(Lang::get('cachet.component.status') as $statusID => $status)
+                                @foreach(trans('cachet.component.status') as $statusID => $status)
                                 <option value='{{ $statusID }}'>{{ $status }}</option>
                                 @endforeach
                             </select>
@@ -51,7 +51,7 @@
                     </fieldset>
 
                     <button type="submit" class="btn btn-success">Submit</button>
-                    <a class="btn btn-default" href="{{ URL::route('dashboard.components') }}">Cancel</a>
+                    <a class="btn btn-default" href="{{ route('dashboard.components') }}">Cancel</a>
                     <input type='hidden' name='component[user_id]' value='{{ Auth::user()->id }}' />
                 </form>
             </div>
diff --git a/app/views/dashboard/components/edit.blade.php b/app/views/dashboard/components/edit.blade.php
index 6133044e..c313e017 100644
--- a/app/views/dashboard/components/edit.blade.php
+++ b/app/views/dashboard/components/edit.blade.php
@@ -3,7 +3,7 @@
 @section('content')
     <div class="header">
         <span class="uppercase">
-            <i class="icons ion-ios-keypad"></i> {{ Lang::get('cachet.dashboard.components') }}
+            <i class="icons ion-ios-keypad"></i> {{ trans('cachet.dashboard.components') }}
         </span>
         > <small>Edit component</small>
     </div>
@@ -29,7 +29,7 @@
                         <div class='form-group'>
                             <label for='component-status'>Status</label>
                             <select name='component[status]' class='form-control'>
-                                @foreach(Lang::get('cachet.component.status') as $statusID => $status)
+                                @foreach(trans('cachet.component.status') as $statusID => $status)
                                 <option value='{{ $statusID }}' {{ $statusID === $component->status ? "selected" : "" }}>{{ $status }}</option>
                                 @endforeach
                             </select>
@@ -51,7 +51,7 @@
                     </fieldset>
 
                     <button type="submit" class="btn btn-success">Save Component</button>
-                    <a class="btn btn-default" href="{{ URL::route('dashboard.components') }}">Cancel</a>
+                    <a class="btn btn-default" href="{{ route('dashboard.components') }}">Cancel</a>
                     <input type='hidden' name='component[user_id]' value='{{ $component->agent_id || Auth::user()->id }}' />
                 </form>
             </div>
diff --git a/app/views/dashboard/components/index.blade.php b/app/views/dashboard/components/index.blade.php
index 3e764d98..37840871 100644
--- a/app/views/dashboard/components/index.blade.php
+++ b/app/views/dashboard/components/index.blade.php
@@ -3,10 +3,10 @@
 @section('content')
 	<div class="header fixed">
         <span class="uppercase">
-		    <i class="icons ion-ios-keypad"></i> {{ Lang::get('cachet.dashboard.components') }}
+		    <i class="icons ion-ios-keypad"></i> {{ trans('cachet.dashboard.components') }}
         </span>
-        <a class="btn btn-sm btn-success pull-right" href="{{ URL::route('dashboard.components.add') }}">
-            {{ Lang::get('cachet.dashboard.component-add') }}
+        <a class="btn btn-sm btn-success pull-right" href="{{ route('dashboard.components.add') }}">
+            {{ trans('cachet.dashboard.component-add') }}
         </a>
         <div class="clearfix"></div>
 	</div>
diff --git a/app/views/dashboard/incidents/add.blade.php b/app/views/dashboard/incidents/add.blade.php
index f2e353ca..cf55df69 100644
--- a/app/views/dashboard/incidents/add.blade.php
+++ b/app/views/dashboard/incidents/add.blade.php
@@ -3,7 +3,7 @@
 @section('content')
 	<div class="header">
         <span class="uppercase">
-		    <i class="icon icon ion-android-alert"></i> {{ Lang::get('cachet.dashboard.incident-add') }}
+		    <i class="icon icon ion-android-alert"></i> {{ trans('cachet.dashboard.incident-add') }}
         </span>
 		> <small>Create an Incident</small>
 	</div>
@@ -31,22 +31,22 @@
                             <label class="radio-inline">
                                 <input type="radio" name="incident[status]" value="1" />
                                 <i class="icon ion-flag"></i>
-                                {{ Lang::get('cachet.incident.status')[1] }}
+                                {{ trans('cachet.incident.status')[1] }}
                             </label>
                             <label class="radio-inline">
                                 <input type="radio" name="incident[status]" value="2" />
                                 <i class="icon ion-alert-circled"></i>
-                                {{ Lang::get('cachet.incident.status')[2] }}
+                                {{ trans('cachet.incident.status')[2] }}
                             </label>
                             <label class="radio-inline">
                                 <input type="radio" name="incident[status]" value="3" />
                                 <i class="icon ion-eye"></i>
-                                {{ Lang::get('cachet.incident.status')[3] }}
+                                {{ trans('cachet.incident.status')[3] }}
                             </label>
                             <label class="radio-inline">
                                 <input type="radio" name="incident[status]" value="4" />
                                 <i class="icon ion-checkmark"></i>
-                                {{ Lang::get('cachet.incident.status')[4] }}
+                                {{ trans('cachet.incident.status')[4] }}
                             </label>
                         </div>
                         <div class="form-group">
@@ -58,7 +58,7 @@
 
                     <input type="hidden" name="incident[user_id]" value="{{ Auth::user()->id }}" />
                     <button type="submit" class="btn btn-success">Create</button>
-                    <a class="btn btn-default" href="{{ URL::route('dashboard.incidents') }}">Cancel</a>
+                    <a class="btn btn-default" href="{{ route('dashboard.incidents') }}">Cancel</a>
                 {{ Form::close() }}
             </div>
         </div>
diff --git a/app/views/dashboard/incidents/incident-template.blade.php b/app/views/dashboard/incidents/incident-template.blade.php
index f4bcb105..4c9b52d6 100644
--- a/app/views/dashboard/incidents/incident-template.blade.php
+++ b/app/views/dashboard/incidents/incident-template.blade.php
@@ -3,7 +3,7 @@
 @section('content')
 	<div class="header">
         <span class="uppercase">
-		    <i class="icon ion-plus"></i> {{ Lang::get('cachet.dashboard.incident-add') }}
+		    <i class="icon ion-plus"></i> {{ trans('cachet.dashboard.incident-add') }}
         </span>
         > <small>Create an Incident Template</small>
 	</div>
diff --git a/app/views/dashboard/incidents/index.blade.php b/app/views/dashboard/incidents/index.blade.php
index c80ac968..7a3b896f 100644
--- a/app/views/dashboard/incidents/index.blade.php
+++ b/app/views/dashboard/incidents/index.blade.php
@@ -3,17 +3,17 @@
 @section('content')
 	<div class="header fixed">
         <span class="uppercase">
-		    <i class="icon icon ion-android-alert"></i> {{ Lang::get('cachet.dashboard.incidents') }}
+		    <i class="icon icon ion-android-alert"></i> {{ trans('cachet.dashboard.incidents') }}
         </span>
-        <a class="btn btn-sm btn-success pull-right" href="{{ URL::route('dashboard.incidents.add') }}">
-            {{ Lang::get('cachet.dashboard.incident-add') }}
+        <a class="btn btn-sm btn-success pull-right" href="{{ route('dashboard.incidents.add') }}">
+            {{ trans('cachet.dashboard.incident-add') }}
         </a>
         <div class="clearfix"></div>
 	</div>
     <div class="content-wrapper">
         <div class="row">
             <div class="col-sm-12">
-                <p class='lead'>{{ Lang::choice('cachet.dashboard.logged_incidents', $incidents->count(), ['count' => $incidents->count()]) }}</p>
+                <p class='lead'>{{ trans_choice('cachet.dashboard.logged_incidents', $incidents->count(), ['count' => $incidents->count()]) }}</p>
 
                 <div class="striped-list">
                     @foreach($incidents as $incident)
diff --git a/app/views/dashboard/index.blade.php b/app/views/dashboard/index.blade.php
index 0768d265..8ef3bb97 100644
--- a/app/views/dashboard/index.blade.php
+++ b/app/views/dashboard/index.blade.php
@@ -3,7 +3,7 @@
 @section('content')
 	<div class="header">
 		<span class="uppercase">
-            <i class="icon ion-speedometer"></i> {{ Lang::get('cachet.dashboard.dashboard') }}
+            <i class="icon ion-speedometer"></i> {{ trans('cachet.dashboard.dashboard') }}
         </span>
 	</div>
     <div class="content-wrapper">
@@ -20,7 +20,7 @@
                                     <strong>{{ $component->name }}</strong>
                                 </div>
                                 <div class='col-lg-10 col-xs-12 text-right'>
-                                    @foreach(Lang::get('cachet.component.status') as $statusID => $status)
+                                    @foreach(trans('cachet.component.status') as $statusID => $status)
                                     <div class='radio-inline'>
                                         <label>
                                             <input type='radio' name='status' value='{{ $statusID }}' {{ $component->status === $statusID ? "checked" : null }} />
diff --git a/app/views/dashboard/metrics/index.blade.php b/app/views/dashboard/metrics/index.blade.php
index 02d02f89..a6a1f42e 100644
--- a/app/views/dashboard/metrics/index.blade.php
+++ b/app/views/dashboard/metrics/index.blade.php
@@ -1,13 +1,13 @@
 @extends('layout.dashboard')
 
 @section('content')
-	<div class="header">
-		<i class="ion ion-stats-bars"></i> {{ Lang::get('cachet.dashboard.metrics') }}
-	</div>
-	<div class="row">
-		<div class="col-sm-12">
-			<h3>Metrics</h3>
-			<p class='lead'>Eventually this page will show all of the graphs that make up your metrics.</p>
-		</div>
-	</div>
+    <div class="header">
+        <i class="ion ion-stats-bars"></i> {{ trans('cachet.dashboard.metrics') }}
+    </div>
+    <div class="row">
+        <div class="col-sm-12">
+            <h3>Metrics</h3>
+            <p class='lead'>Eventually this page will show all of the graphs that make up your metrics.</p>
+        </div>
+    </div>
 @stop
diff --git a/app/views/dashboard/notifications/index.blade.php b/app/views/dashboard/notifications/index.blade.php
index a873b793..f94ee5ac 100644
--- a/app/views/dashboard/notifications/index.blade.php
+++ b/app/views/dashboard/notifications/index.blade.php
@@ -1,12 +1,12 @@
 @extends('layout.dashboard')
 
 @section('content')
-	<div class="header">
-		<i class="ion ion-email"></i> {{ Lang::get('cachet.dashboard.notifications') }}
-	</div>
-	<div class="row">
-		<div class="col-sm-12">
-			<h3>Notifications</h3>
-		</div>
-	</div>
+    <div class="header">
+        <i class="ion ion-email"></i> {{ trans('cachet.dashboard.notifications') }}
+    </div>
+    <div class="row">
+        <div class="col-sm-12">
+            <h3>Notifications</h3>
+        </div>
+    </div>
 @stop
diff --git a/app/views/dashboard/settings/app-setup.blade.php b/app/views/dashboard/settings/app-setup.blade.php
index a4a53b33..f98cbe32 100644
--- a/app/views/dashboard/settings/app-setup.blade.php
+++ b/app/views/dashboard/settings/app-setup.blade.php
@@ -7,7 +7,7 @@
     <div class='content-panel'>
         <div class="header">
             <span class="uppercase">
-                <i class="icon ion-gear-a"></i> {{ Lang::get('cachet.dashboard.settings') }}
+                <i class="icon ion-gear-a"></i> {{ trans('cachet.dashboard.settings') }}
             </span>
         </div>
         <div class="content-wrapper">
@@ -17,7 +17,7 @@
                         <h4 class="sub-header" id='application-setup'>Application Setup</h4>
 
                         @if(($saved = Session::get('saved')))
-                        <div class='alert alert-success'><strong>{{ Lang::get('cachet.dashboard.settings_saved') }}</strong></div>
+                        <div class='alert alert-success'><strong>{{ trans('cachet.dashboard.settings_saved') }}</strong></div>
                         @elseif(Session::has('error_message'))
                         <div class='alert alert-danger'><strong>{{ Session::get('error_message') }}</strong></div>
                         @endif
diff --git a/app/views/dashboard/settings/security.blade.php b/app/views/dashboard/settings/security.blade.php
index 21a5483d..ffba91a0 100644
--- a/app/views/dashboard/settings/security.blade.php
+++ b/app/views/dashboard/settings/security.blade.php
@@ -7,7 +7,7 @@
     <div class='content-panel'>
         <div class="header">
             <span class="uppercase">
-                <i class="icon ion-gear-a"></i> {{ Lang::get('cachet.dashboard.settings') }}
+                <i class="icon ion-gear-a"></i> {{ trans('cachet.dashboard.settings') }}
             </span>
         </div>
         <div class="content-wrapper">
@@ -17,9 +17,9 @@
                         <h4 class="sub-header" id='security'>Security</h4>
 
                         @if($saved = Session::get('saved'))
-                        <div class='alert alert-success'><strong>{{ Lang::get('cachet.dashboard.settings_saved') }}</strong></div>
+                        <div class='alert alert-success'><strong>{{ trans('cachet.dashboard.settings_saved') }}</strong></div>
                         @elseif(Session::has('saved'))
-                        <div class='alert alert-danger'><strong>{{ Lang::get('cachet.dashboard.settings_not_saved') }}</strong></div>
+                        <div class='alert alert-danger'><strong>{{ trans('cachet.dashboard.settings_not_saved') }}</strong></div>
                         @endif
 
                         <fieldset>
diff --git a/app/views/dashboard/settings/stylesheet.blade.php b/app/views/dashboard/settings/stylesheet.blade.php
index d4ecd7ea..49b42bac 100644
--- a/app/views/dashboard/settings/stylesheet.blade.php
+++ b/app/views/dashboard/settings/stylesheet.blade.php
@@ -7,7 +7,7 @@
     <div class='content-panel'>
         <div class="header">
             <span class="uppercase">
-                <i class="icon ion-gear-a"></i> {{ Lang::get('cachet.dashboard.settings') }}
+                <i class="icon ion-gear-a"></i> {{ trans('cachet.dashboard.settings') }}
             </span>
         </div>
         <div class="content-wrapper">
@@ -17,9 +17,9 @@
                         <h4 class="sub-header" id='stylesheet'>Stylesheet</h4>
 
                         @if($saved = Session::get('saved'))
-                        <div class='alert alert-success'><strong>{{ Lang::get('cachet.dashboard.settings_saved') }}</strong></div>
+                        <div class='alert alert-success'><strong>{{ trans('cachet.dashboard.settings_saved') }}</strong></div>
                         @elseif(Session::has('saved'))
-                        <div class='alert alert-danger'><strong>{{ Lang::get('cachet.dashboard.settings_not_saved') }}</strong></div>
+                        <div class='alert alert-danger'><strong>{{ trans('cachet.dashboard.settings_not_saved') }}</strong></div>
                         @endif
 
                         <fieldset>
diff --git a/app/views/dashboard/settings/theme.blade.php b/app/views/dashboard/settings/theme.blade.php
index 96471559..1e1e5249 100644
--- a/app/views/dashboard/settings/theme.blade.php
+++ b/app/views/dashboard/settings/theme.blade.php
@@ -7,7 +7,7 @@
     <div class='content-panel'>
         <div class="header">
             <span class="uppercase">
-                <i class="icon ion-gear-a"></i> {{ Lang::get('cachet.dashboard.settings') }}
+                <i class="icon ion-gear-a"></i> {{ trans('cachet.dashboard.settings') }}
             </span>
         </div>
         <div class="content-wrapper">
@@ -17,9 +17,9 @@
                         <h4 class="sub-header" id='theme'>Theme</h4>
 
                         @if($saved = Session::get('saved'))
-                        <div class='alert alert-success'><strong>{{ Lang::get('cachet.dashboard.settings_saved') }}</strong></div>
+                        <div class='alert alert-success'><strong>{{ trans('cachet.dashboard.settings_saved') }}</strong></div>
                         @elseif(Session::has('saved'))
-                        <div class='alert alert-danger'><strong>{{ Lang::get('cachet.dashboard.settings_not_saved') }}</strong></div>
+                        <div class='alert alert-danger'><strong>{{ trans('cachet.dashboard.settings_not_saved') }}</strong></div>
                         @endif
 
                         <fieldset>
diff --git a/app/views/dashboard/user/index.blade.php b/app/views/dashboard/user/index.blade.php
index b4e109f6..87101e5b 100644
--- a/app/views/dashboard/user/index.blade.php
+++ b/app/views/dashboard/user/index.blade.php
@@ -3,7 +3,7 @@
 @section('content')
     <div class="header">
         <span class='uppercase'>
-            <i class="ion ion-person"></i> {{ Lang::get('cachet.dashboard.user') }}
+            <i class="ion ion-person"></i> {{ trans('cachet.dashboard.user') }}
         </span>
     </div>
     <div class='content-wrapper'>
diff --git a/app/views/errors/404.blade.php b/app/views/errors/404.blade.php
index e4df17ca..7af5ff78 100644
--- a/app/views/errors/404.blade.php
+++ b/app/views/errors/404.blade.php
@@ -6,13 +6,13 @@
             <img class="logo" height="65" src="{{ url('img/cachet-logo.svg') }}" alt="Cachet"/>
         </div>
         <h1>404</h1>
-        <h3>{{ Lang::get('cachet.dashboard.not_found') }}</h3>
+        <h3>{{ trans('cachet.dashboard.not_found') }}</h3>
 
         <div class="error-desc">
-            <p>{{ Lang::get('cachet.dashboard.not_found_message') }}</p>
+            <p>{{ trans('cachet.dashboard.not_found_message') }}</p>
             <br/>
             <p>
-                <a href='/' class='btn btn-default btn-lg'>{{ Lang::get('cachet.dashboard.not_found_link') }}</a>
+                <a href='/' class='btn btn-default btn-lg'>{{ trans('cachet.dashboard.not_found_link') }}</a>
             </p>
         </div>
     </div>
diff --git a/app/views/index.blade.php b/app/views/index.blade.php
index 56a39890..1ebb2ef6 100644
--- a/app/views/index.blade.php
+++ b/app/views/index.blade.php
@@ -14,7 +14,7 @@
 
     @if($aboutApp)
     <div class='about-app'>
-        <h1>{{ Lang::get('cachet.about_this_site') }}</h1>
+        <h1>{{ trans('cachet.about_this_site') }}</h1>
         <p>{{ $aboutApp }}</p>
     </div>
     @endif
@@ -25,7 +25,7 @@
     @include('partials.graphs')
     @endif --}}
 
-    <h1>{{ Lang::get('cachet.past_incidents') }}</h1>
+    <h1>{{ trans('cachet.past_incidents') }}</h1>
     @foreach(range(0, 7) as $i => $v)
     @include('partials.incident', array('i', $i))
     @endforeach
diff --git a/app/views/layout/master.blade.php b/app/views/layout/master.blade.php
index e27ceaea..c5d4eb50 100644
--- a/app/views/layout/master.blade.php
+++ b/app/views/layout/master.blade.php
@@ -22,16 +22,16 @@
     <!-- Mobile IE allows us to activate ClearType technology for smoothing fonts for easy reading -->
     <meta http-equiv="cleartype" content="on">
 
-    <link rel="icon" type="image/png" href="{{ URL::to('img/favicon.ico') }}">
-    <link rel="shortcut icon" href="{{ URL::to('img/favicon.png') }}" type="image/x-icon" />
+    <link rel="icon" type="image/png" href="{{ url('img/favicon.ico') }}">
+    <link rel="shortcut icon" href="{{ url('img/favicon.png') }}" type="image/x-icon" />
 
-    <link rel="apple-touch-icon" href="{{ URL::to('img/apple-touch-icon.png') }}" />
-    <link rel="apple-touch-icon" sizes="57x57" href="{{ URL::to('img/apple-touch-icon-57x57.png') }}" />
-    <link rel="apple-touch-icon" sizes="72x72" href="{{ URL::to('img/apple-touch-icon-72x72.png') }}" />
-    <link rel="apple-touch-icon" sizes="114x114" href="{{ URL::to('img/apple-touch-icon-114x114.png') }}" />
-    <link rel="apple-touch-icon" sizes="120x120" href="{{ URL::to('img/apple-touch-icon-120x120.png') }}" />
-    <link rel="apple-touch-icon" sizes="144x144" href="{{ URL::to('img/apple-touch-icon-144x144.png') }}" />
-    <link rel="apple-touch-icon" sizes="152x152" href="{{ URL::to('img/apple-touch-icon-152x152.png') }}" />
+    <link rel="apple-touch-icon" href="{{ url('img/apple-touch-icon.png') }}" />
+    <link rel="apple-touch-icon" sizes="57x57" href="{{ url('img/apple-touch-icon-57x57.png') }}" />
+    <link rel="apple-touch-icon" sizes="72x72" href="{{ url('img/apple-touch-icon-72x72.png') }}" />
+    <link rel="apple-touch-icon" sizes="114x114" href="{{ url('img/apple-touch-icon-114x114.png') }}" />
+    <link rel="apple-touch-icon" sizes="120x120" href="{{ url('img/apple-touch-icon-120x120.png') }}" />
+    <link rel="apple-touch-icon" sizes="144x144" href="{{ url('img/apple-touch-icon-144x144.png') }}" />
+    <link rel="apple-touch-icon" sizes="152x152" href="{{ url('img/apple-touch-icon-152x152.png') }}" />
 
     <title>{{ $pageTitle ?: Setting::get('app_name') }} Status</title>
 
diff --git a/app/views/partials/dashboard/head.blade.php b/app/views/partials/dashboard/head.blade.php
index 2e491a4d..0ee975bc 100644
--- a/app/views/partials/dashboard/head.blade.php
+++ b/app/views/partials/dashboard/head.blade.php
@@ -7,16 +7,16 @@
     <meta name="env" content="{{ app('env') }}">
     <meta name="token" content="{{ csrf_token() }}">
 
-    <link rel="icon" type="image/png" href="{{ URL::to('img/favicon.ico') }}">
-    <link rel="shortcut icon" href="{{ URL::to('img/favicon.png') }}" type="image/x-icon" />
+    <link rel="icon" type="image/png" href="{{ url('img/favicon.ico') }}">
+    <link rel="shortcut icon" href="{{ url('img/favicon.png') }}" type="image/x-icon" />
 
-    <link rel="apple-touch-icon" href="{{ URL::to('img/apple-touch-icon.png') }}" />
-    <link rel="apple-touch-icon" sizes="57x57" href="{{ URL::to('img/apple-touch-icon-57x57.png') }}" />
-    <link rel="apple-touch-icon" sizes="72x72" href="{{ URL::to('img/apple-touch-icon-72x72.png') }}" />
-    <link rel="apple-touch-icon" sizes="114x114" href="{{ URL::to('img/apple-touch-icon-114x114.png') }}" />
-    <link rel="apple-touch-icon" sizes="120x120" href="{{ URL::to('img/apple-touch-icon-120x120.png') }}" />
-    <link rel="apple-touch-icon" sizes="144x144" href="{{ URL::to('img/apple-touch-icon-144x144.png') }}" />
-    <link rel="apple-touch-icon" sizes="152x152" href="{{ URL::to('img/apple-touch-icon-152x152.png') }}" />
+    <link rel="apple-touch-icon" href="{{ url('img/apple-touch-icon.png') }}" />
+    <link rel="apple-touch-icon" sizes="57x57" href="{{ url('img/apple-touch-icon-57x57.png') }}" />
+    <link rel="apple-touch-icon" sizes="72x72" href="{{ url('img/apple-touch-icon-72x72.png') }}" />
+    <link rel="apple-touch-icon" sizes="114x114" href="{{ url('img/apple-touch-icon-114x114.png') }}" />
+    <link rel="apple-touch-icon" sizes="120x120" href="{{ url('img/apple-touch-icon-120x120.png') }}" />
+    <link rel="apple-touch-icon" sizes="144x144" href="{{ url('img/apple-touch-icon-144x144.png') }}" />
+    <link rel="apple-touch-icon" sizes="152x152" href="{{ url('img/apple-touch-icon-152x152.png') }}" />
 
     <title>{{ isset($pageTitle) ? $pageTitle : Setting::get('app_name') }} | Cachet</title>
 
diff --git a/app/views/partials/dashboard/sidebar.blade.php b/app/views/partials/dashboard/sidebar.blade.php
index 80ad52e7..8551e1bd 100644
--- a/app/views/partials/dashboard/sidebar.blade.php
+++ b/app/views/partials/dashboard/sidebar.blade.php
@@ -5,7 +5,7 @@
             <div class='row'>
                 <div class='col-xs-3'>
                     <div class="avatar">
-                        <a href="{{ URL::to('dashboard/user') }}">
+                        <a href="{{ url('dashboard/user') }}">
                             <img src="{{ Auth::user()->gravatar }}" alt="">
                         </a>
                     </div>
@@ -19,44 +19,44 @@
         </div>
         <div class="clearfix"></div>
         <div class="quick-add-incident">
-            <a class="btn btn-block btn-default uppercase" href="{{ URL::route('dashboard.incidents.add') }}">
-                {{ Lang::get('cachet.dashboard.incident-add') }}
+            <a class="btn btn-block btn-default uppercase" href="{{ route('dashboard.incidents.add') }}">
+                {{ trans('cachet.dashboard.incident-add') }}
             </a>
         </div>
         <ul>
             <li {{ set_active('dashboard') }}>
-                <a href="{{ URL::route('dashboard') }}">
-                    <i class="icon ion-speedometer"></i> {{ Lang::get('cachet.dashboard.dashboard') }}
+                <a href="{{ route('dashboard') }}">
+                    <i class="icon ion-speedometer"></i> {{ trans('cachet.dashboard.dashboard') }}
                 </a>
             </li>
             <li  {{ set_active('dashboard/incidents*') }}>
-                <a href="{{ URL::route('dashboard.incidents') }}">
-                    <i class="icon ion-android-alert"></i> {{ Lang::get('cachet.dashboard.incidents') }}
+                <a href="{{ route('dashboard.incidents') }}">
+                    <i class="icon ion-android-alert"></i> {{ trans('cachet.dashboard.incidents') }}
                 </a>
             </li>
             {{-- <li {{ set_active('dashboard/incidents/templates') }}>
-                <a href="{{ URL::route('dashboard.incidents.template') }}">
-                    <i class="fa fa-plus"></i> {{ Lang::get('cachet.dashboard.incident-create-template') }}
+                <a href="{{ route('dashboard.incidents.template') }}">
+                    <i class="fa fa-plus"></i> {{ trans('cachet.dashboard.incident-create-template') }}
                 </a>
             </li> --}}
             <li  {{ set_active('dashboard/components*') }}>
-                <a href="{{ URL::route('dashboard.components') }}">
-                    <i class="icons ion-ios-keypad"></i> {{ Lang::get('cachet.dashboard.components') }}
+                <a href="{{ route('dashboard.components') }}">
+                    <i class="icons ion-ios-keypad"></i> {{ trans('cachet.dashboard.components') }}
                 </a>
             </li>
             {{-- <li {{ set_active('dashboard/metrics') }}>
-                <a href="{{ URL::route('dashboard.metrics') }}">
-                    <i class="ion ion-stats-bats"></i> {{ Lang::get('cachet.dashboard.metrics') }}
+                <a href="{{ route('dashboard.metrics') }}">
+                    <i class="ion ion-stats-bats"></i> {{ trans('cachet.dashboard.metrics') }}
                 </a>
             </li>
             <li {{ set_active('dashboard/notifications') }}>
-                <a href="{{ URL::route('dashboard.notifications') }}">
-                    <i class="ion ion-email"></i> {{ Lang::get('cachet.dashboard.notifications') }}
+                <a href="{{ route('dashboard.notifications') }}">
+                    <i class="ion ion-email"></i> {{ trans('cachet.dashboard.notifications') }}
                 </a>
             </li> --}}
             <li {{ set_active('dashboard/settings*') }}>
-                <a href="{{ URL::route('dashboard.settings.setup') }}">
-                    <i class="icon ion-gear-a"></i> {{ Lang::get('cachet.dashboard.settings') }}
+                <a href="{{ route('dashboard.settings.setup') }}">
+                    <i class="icon ion-gear-a"></i> {{ trans('cachet.dashboard.settings') }}
                 </a>
             </li>
         </ul>
@@ -66,14 +66,14 @@
             </div>
             <br/>
             <ul>
-                <li data-toggle="tooltip" data-placement="top" title="{{ Lang::get('cachet.dashboard.help') }}">
+                <li data-toggle="tooltip" data-placement="top" title="{{ trans('cachet.dashboard.help') }}">
                     <a href="https://cachethq.github.io" target="_blank"><i class="icon ion-help"></i></a>
                 </li>
-                <li data-toggle="tooltip" data-placement="top" title="{{ Lang::get('cachet.dashboard.status_page') }}">
-                    <a href="{{ URL::route('status-page') }}"><i class="icon ion-monitor"></i></a>
+                <li data-toggle="tooltip" data-placement="top" title="{{ trans('cachet.dashboard.status_page') }}">
+                    <a href="{{ route('status-page') }}"><i class="icon ion-monitor"></i></a>
                 </li>
-                <li data-toggle="tooltip" data-placement="top" title="{{ Lang::get('cachet.logout') }}">
-                    <a href="{{ URL::route('logout') }}"><i class="icon ion-log-out"></i></a>
+                <li data-toggle="tooltip" data-placement="top" title="{{ trans('cachet.logout') }}">
+                    <a href="{{ route('logout') }}"><i class="icon ion-log-out"></i></a>
                 </li>
             </ul>
         </div>
diff --git a/app/views/partials/incident.blade.php b/app/views/partials/incident.blade.php
index 597d980a..2f53c12a 100644
--- a/app/views/partials/incident.blade.php
+++ b/app/views/partials/incident.blade.php
@@ -35,7 +35,7 @@
         @empty
         <div class='panel panel-message'>
             <div class='panel-body'>
-                <p>{{ Lang::get('cachet.incident.none') }}</p>
+                <p>{{ trans('cachet.incident.none') }}</p>
             </div>
         </div>
         @endforelse
diff --git a/app/views/partials/support-link.blade.php b/app/views/partials/support-link.blade.php
index dca1f182..19b2a1df 100644
--- a/app/views/partials/support-link.blade.php
+++ b/app/views/partials/support-link.blade.php
@@ -1,10 +1,10 @@
 @if(Setting::get('show_support'))
 <footer class='footer'>
-    <p>{{ Lang::get('cachet.powered_by', array('app' => Setting::get('app_name'))) }}</p>
+    <p>{{ trans('cachet.powered_by', array('app' => Setting::get('app_name'))) }}</p>
     <p><a href='/rss'><i class='ion-social-rss'></i> RSS Feed</a></p>
     @if(Auth::check())
     <p>
-	    <a href="{{ URL::route('dashboard') }}">{{ Lang::get('cachet.dashboard.dashboard') }}</a> &ndash; <a href="{{ URL::route('logout') }}">{{ Lang::get('cachet.logout') }}</a>
+        <a href="{{ route('dashboard') }}">{{ trans('cachet.dashboard.dashboard') }}</a> &ndash; <a href="{{ route('logout') }}">{{ trans('cachet.logout') }}</a>
     </p>
     @endif
 </footer>
diff --git a/app/views/setup.blade.php b/app/views/setup.blade.php
index f1f52b50..49c4e984 100644
--- a/app/views/setup.blade.php
+++ b/app/views/setup.blade.php
@@ -3,28 +3,28 @@
 @section('content')
     <div class="header">
         <span class="uppercase">
-            <i class='ion-gear-a'></i> {{ Lang::get('cachet.setup') }}
+            <i class='ion-gear-a'></i> {{ trans('cachet.setup') }}
         </span>
     </div>
     <div class="content-wrapper">
         <div class='row'>
             <div class='col-sm-12'>
                 <div class='panel panel-default'>
-                    <div class='panel-heading'>{{ Lang::get('cachet.forms.setup.service_details') }}</div>
+                    <div class='panel-heading'>{{ trans('cachet.forms.setup.service_details') }}</div>
                     <div class='panel-body'>
                         {{ Form::open(['name' => 'SetupForm', 'class' => 'form-vertical', 'role' => 'form']) }}
                             <fieldset>
-                                <legend>{{ Lang::get('cachet.forms.setup.status_page_setup') }}</legend>
+                                <legend>{{ trans('cachet.forms.setup.status_page_setup') }}</legend>
                                 <div class='form-group'>
-                                    <label class='sr-only'>{{ Lang::get('cachet.forms.setup.site_name') }}</label>
-                                    <input type='text' name='settings[app_name]' class='form-control' placeholder='{{ Lang::get("cachet.forms.setup.site_name") }}' value='{{ Input::old("settings.app_name", "") }}' required />
+                                    <label class='sr-only'>{{ trans('cachet.forms.setup.site_name') }}</label>
+                                    <input type='text' name='settings[app_name]' class='form-control' placeholder='{{ trans("cachet.forms.setup.site_name") }}' value='{{ Input::old("settings.app_name", "") }}' required />
                                     @if($errors->has('settings.app_name'))
                                     <span class='text-danger'>{{ $errors->first('settings.app_name') }}</span>
                                     @endif
                                 </div>
                                 <div class='form-group'>
-                                    <label class='sr-only'>{{ Lang::get('cachet.forms.setup.site_domain') }}</label>
-                                    <input type='text' name='settings[app_domain]' class='form-control' placeholder='{{ Lang::get("cachet.forms.setup.site_domain") }}' value='{{ Input::old("settings.app_domain", "") }}' required />
+                                    <label class='sr-only'>{{ trans('cachet.forms.setup.site_domain') }}</label>
+                                    <input type='text' name='settings[app_domain]' class='form-control' placeholder='{{ trans("cachet.forms.setup.site_domain") }}' value='{{ Input::old("settings.app_domain", "") }}' required />
                                     @if($errors->has('settings.app_domain'))
                                     <span class='text-danger'>{{ $errors->first('settings.app_domain') }}</span>
                                     @endif
@@ -32,7 +32,7 @@
                                 <div class='form-group'>
                                     <label>
                                         <input type='checkbox' name='settings[show_support]' value='1' checked />
-                                        {{ Lang::get("cachet.forms.setup.show_support") }}
+                                        {{ trans("cachet.forms.setup.show_support") }}
                                     </label>
                                 </div>
                             </fieldset>
@@ -40,22 +40,22 @@
                             <fieldset>
                                 <legend>Administrator Account</legend>
                                 <div class='form-group'>
-                                    <label class='sr-only'>{{ Lang::get("cachet.forms.setup.admin_username") }}</label>
-                                    <input type='text' name='user[username]' class='form-control' placeholder='{{ Lang::get("cachet.forms.setup.admin_username") }}' value='{{ Input::old("user.username", "") }}' required />
+                                    <label class='sr-only'>{{ trans("cachet.forms.setup.admin_username") }}</label>
+                                    <input type='text' name='user[username]' class='form-control' placeholder='{{ trans("cachet.forms.setup.admin_username") }}' value='{{ Input::old("user.username", "") }}' required />
                                     @if($errors->has('user.username'))
                                     <span class='text-danger'>{{ $errors->first('user.username') }}</span>
                                     @endif
                                 </div>
                                 <div class='form-group'>
-                                    <label class='sr-only'>{{ Lang::get("cachet.forms.email") }}</label>
-                                    <input type='email' name='user[email]' class='form-control' placeholder='{{ Lang::get("cachet.forms.email") }}' value='{{ Input::old("user.email", "") }}' required />
+                                    <label class='sr-only'>{{ trans("cachet.forms.email") }}</label>
+                                    <input type='email' name='user[email]' class='form-control' placeholder='{{ trans("cachet.forms.email") }}' value='{{ Input::old("user.email", "") }}' required />
                                     @if($errors->has('user.email'))
                                     <span class='text-danger'>{{ $errors->first('user.email') }}</span>
                                     @endif
                                 </div>
                                 <div class='form-group'>
-                                    <label class='sr-only'>{{ Lang::get("cachet.forms.password") }}</label>
-                                    <input type='password' name='user[password]' class='form-control' placeholder='{{ Lang::get("cachet.forms.password") }}' value='{{ Input::old("user.password", "") }}' required />
+                                    <label class='sr-only'>{{ trans("cachet.forms.password") }}</label>
+                                    <input type='password' name='user[password]' class='form-control' placeholder='{{ trans("cachet.forms.password") }}' value='{{ Input::old("user.password", "") }}' required />
                                     @if($errors->has('user.password'))
                                     <span class='text-danger'>{{ $errors->first('user.password') }}</span>
                                     @endif
@@ -64,7 +64,7 @@
 
                             <hr />
                             <div class='form-group'>
-                                <button type='submit' class='btn btn-success'>{{ Lang::get("cachet.forms.setup.finish_setup") }}</button>
+                                <button type='submit' class='btn btn-success'>{{ trans("cachet.forms.setup.finish_setup") }}</button>
                             </div>
                         {{ Form::close() }}
                     </div>