From ad1babaf0d13beebda2364ad1ec6590bf91325c4 Mon Sep 17 00:00:00 2001
From: Abhimanyu Sharma <abhimanyusharma003@gmail.com>
Date: Sat, 1 Oct 2016 21:34:35 +0530
Subject: [PATCH 1/5] Removed unwanted closing form

---
 resources/views/partials/modals/subscribe.blade.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/resources/views/partials/modals/subscribe.blade.php b/resources/views/partials/modals/subscribe.blade.php
index 35cef74cc25b..386684af5420 100644
--- a/resources/views/partials/modals/subscribe.blade.php
+++ b/resources/views/partials/modals/subscribe.blade.php
@@ -12,7 +12,6 @@
                         <div class="form-group">
                             <input class="form-control" type="email" name="email" placeholder="hello@alt-three.com">
                         </div>
-                    </form>
                 </div>
                 <div class="modal-footer">
                     <button type="button" class="btn btn-default" data-dismiss="modal">{{ trans("cachet.modal.close") }}</button>

From 1407871e1c3a9d4a1c1c14875ffbb70fd66fa79d Mon Sep 17 00:00:00 2001
From: Abhimanyu Sharma <abhimanyusharma003@gmail.com>
Date: Sat, 1 Oct 2016 21:35:06 +0530
Subject: [PATCH 2/5] Fixed closing span tag

---
 resources/views/dashboard/subscribers/add.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/dashboard/subscribers/add.blade.php b/resources/views/dashboard/subscribers/add.blade.php
index e3b376dd0177..3f8aa4441a79 100644
--- a/resources/views/dashboard/subscribers/add.blade.php
+++ b/resources/views/dashboard/subscribers/add.blade.php
@@ -19,7 +19,7 @@
             <div class="form-group">
                 <label>{{ trans('forms.user.email') }}</label>
                 <textarea rows="5" class="form-control" name="email" required>{{ Binput::old('email') }}</textarea>
-                <span class="help-block">{{ trans('dashboard.subscribers.add.help') }}</p>
+                <span class="help-block">{{ trans('dashboard.subscribers.add.help') }}</span>
             </div>
             </fieldset>
 

From 1438caf5cae53250478dfb6ac7408039ded7e16e Mon Sep 17 00:00:00 2001
From: Abhimanyu Sharma <abhimanyusharma003@gmail.com>
Date: Sat, 1 Oct 2016 21:37:36 +0530
Subject: [PATCH 3/5] HTML CS fix

---
 .../views/dashboard/components/edit.blade.php  |  4 ++--
 .../views/dashboard/incidents/add.blade.php    | 18 +++++++++---------
 .../views/dashboard/incidents/edit.blade.php   | 18 +++++++++---------
 resources/views/dashboard/index.blade.php      |  6 +++---
 .../views/dashboard/metrics/add.blade.php      |  6 +++---
 .../views/dashboard/metrics/edit.blade.php     |  6 +++---
 .../views/dashboard/templates/edit.blade.php   |  2 +-
 7 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/resources/views/dashboard/components/edit.blade.php b/resources/views/dashboard/components/edit.blade.php
index 1d27ffd16f26..429a35e90022 100644
--- a/resources/views/dashboard/components/edit.blade.php
+++ b/resources/views/dashboard/components/edit.blade.php
@@ -25,7 +25,7 @@
                         <label for="component-status">{{ trans('forms.components.status') }}</label>
                         <select name="component[status]" class="form-control">
                             @foreach(trans('cachet.components.status') as $statusID => $status)
-                            <option value="{{ $statusID }}" {{ $statusID === $component->status ? "selected" : "" }}>{{ $status }}</option>
+                            <option value="{{ $statusID }}" {{ $statusID === $component->status ? 'selected' : "" }}>{{ $status }}</option>
                             @endforeach
                         </select>
                     </div>
@@ -59,7 +59,7 @@
                     <div class="checkbox">
                         <label>
                             <input type="hidden" value="0" name="component[enabled]">
-                            <input type="checkbox" value="1" name="component[enabled]" {{ $component->enabled ? "checked" : null }}>
+                            <input type="checkbox" value="1" name="component[enabled]" {{ $component->enabled ? 'checked' : null }}>
                             {{ trans('forms.components.enabled') }}
                         </label>
                     </div>
diff --git a/resources/views/dashboard/incidents/add.blade.php b/resources/views/dashboard/incidents/add.blade.php
index 09c8c47eb813..ce630f9af9a2 100644
--- a/resources/views/dashboard/incidents/add.blade.php
+++ b/resources/views/dashboard/incidents/add.blade.php
@@ -57,14 +57,14 @@
                     </div>
                     <div class="form-group">
                         <label for="incident-name">{{ trans('forms.incidents.visibility') }}</label>
-                        <select name='visible' class="form-control">
-                            <option value='1' selected>{{ trans('forms.incidents.public') }}</option>
-                            <option value='0'>{{ trans('forms.incidents.logged_in_only') }}</option>
+                        <select name="visible" class="form-control">
+                            <option value="1" selected>{{ trans('forms.incidents.public') }}</option>
+                            <option value="0">{{ trans('forms.incidents.logged_in_only') }}</option>
                         </select>
                     </div>
                     <div class="form-group">
                         <label for="incident-name">{{ trans('forms.incidents.stick_status') }}</label>
-                        <select name='stickied' class="form-control">
+                        <select name="stickied" class="form-control">
                             <option value='1'>{{ trans('forms.incidents.stickied') }}</option>
                             <option value='0' selected>{{ trans('forms.incidents.not_stickied') }}</option>
                         </select>
@@ -72,17 +72,17 @@
                     @if(!$components_in_groups->isEmpty() || !$components_out_groups->isEmpty())
                     <div class="form-group">
                         <label>{{ trans('forms.incidents.component') }}</label>
-                        <select name='component_id' class='form-control'>
-                            <option value='0' selected></option>
+                        <select name="component_id" class="form-control">
+                            <option value="0" selected></option>
                             @foreach($components_in_groups as $group)
                             <optgroup label="{{ $group->name }}">
                                 @foreach($group->components as $component)
-                                <option value='{{ $component->id }}'>{{ $component->name }}</option>
+                                <option value=""{{ $component->id }}">{{ $component->name }}</option>
                                 @endforeach
                             </optgroup>
                             @endforeach
                             @foreach($components_out_groups as $component)
-                            <option value='{{ $component->id }}'>{{ $component->name }}</option>
+                            <option value=""{{ $component->id }}">{{ $component->name }}</option>
                             @endforeach
                         </select>
                         <span class='help-block'>{{ trans('forms.optional') }}</span>
@@ -106,7 +106,7 @@
                     </div>
                     <div class="form-group">
                         <label>{{ trans('forms.incidents.message') }}</label>
-                        <div class='markdown-control'>
+                        <div class="markdown-control">
                             <textarea name="message" class="form-control autosize" rows="5" required>{{ Binput::old('message') }}</textarea>
                         </div>
                     </div>
diff --git a/resources/views/dashboard/incidents/edit.blade.php b/resources/views/dashboard/incidents/edit.blade.php
index f8beec8d6bb8..7009dcbc3974 100644
--- a/resources/views/dashboard/incidents/edit.blade.php
+++ b/resources/views/dashboard/incidents/edit.blade.php
@@ -24,22 +24,22 @@
                     <div class="form-group">
                         <label for="incident-name">{{ trans('forms.incidents.status') }}</label><br>
                         <label class="radio-inline">
-                            <input type="radio" name="status" value="1" {{ ($incident->status == 1) ? "checked=checked" : "" }}>
+                            <input type="radio" name="status" value="1" {{ ($incident->status == 1) ? "checked='checked'" : "" }}>
                             <i class="ion ion-flag"></i>
                             {{ trans('cachet.incidents.status')[1] }}
                         </label>
                         <label class="radio-inline">
-                            <input type="radio" name="status" value="2" {{ ($incident->status == 2) ? "checked=checked" : "" }}>
+                            <input type="radio" name="status" value="2" {{ ($incident->status == 2) ? "checked='checked'" : "" }}>
                             <i class="ion ion-alert-circled"></i>
                             {{ trans('cachet.incidents.status')[2] }}
                         </label>
                         <label class="radio-inline">
-                            <input type="radio" name="status" value="3" {{ ($incident->status == 3) ? "checked=checked" : "" }}>
+                            <input type="radio" name="status" value="3" {{ ($incident->status == 3) ? "checked='checked'" : "" }}>
                             <i class="ion ion-eye"></i>
                             {{ trans('cachet.incidents.status')[3] }}
                         </label>
                         <label class="radio-inline">
-                            <input type="radio" name="status" value="4" {{ ($incident->status == 4) ? "checked=checked" : "" }}>
+                            <input type="radio" name="status" value="4" {{ ($incident->status == 4) ? "checked='checked'" : "" }}>
                             <i class="ion ion-checkmark"></i>
                             {{ trans('cachet.incidents.status')[4] }}
                         </label>
@@ -47,19 +47,19 @@
                     <div class="form-group">
                         <label for="incident-visibility">{{ trans('forms.incidents.visibility') }}</label>
                         <select name="visible" id="incident-visibility" class="form-control">
-                            <option value='1' {{ $incident->visible === 1 ? 'selected' : null }}>{{ trans('forms.incidents.public') }}</option>
-                            <option value='0' {{ $incident->visible === 0 ? 'selected' : null }}>{{ trans('forms.incidents.logged_in_only') }}</option>
+                            <option value="1" {{ $incident->visible === 1 ? 'selected' : null }}>{{ trans('forms.incidents.public') }}</option>
+                            <option value="0" {{ $incident->visible === 0 ? 'selected' : null }}>{{ trans('forms.incidents.logged_in_only') }}</option>
                         </select>
                     </div>
                     <div class="form-group">
                         <label for="incident-stick">{{ trans('forms.incidents.stick_status') }}</label>
                         <select name="stickied" id="incident-stick" class="form-control">
-                            <option value='1' {{ $incident->stickied === 1 ? 'selected' : null }}>{{ trans('forms.incidents.stickied') }}</option>
-                            <option value='0' {{ $incident->stickied === 0 ? 'selected' : null }}>{{ trans('forms.incidents.not_stickied') }}</option>
+                            <option value="1" {{ $incident->stickied === 1 ? 'selected' : null }}>{{ trans('forms.incidents.stickied') }}</option>
+                            <option value="0" {{ $incident->stickied === 0 ? 'selected' : null }}>{{ trans('forms.incidents.not_stickied') }}</option>
                         </select>
                     </div>
                     @if($incident->component)
-                    <div class="form-group" id='component-status'>
+                    <div class="form-group" id="component-status">
                         <div class="panel panel-default">
                             <div class="panel-heading"><strong>{{ $incident->component->name }}</strong></div>
                             <div class="panel-body">
diff --git a/resources/views/dashboard/index.blade.php b/resources/views/dashboard/index.blade.php
index ec25a25e1f63..333fb17d3de7 100644
--- a/resources/views/dashboard/index.blade.php
+++ b/resources/views/dashboard/index.blade.php
@@ -61,9 +61,9 @@
     <div class="row">
         <div class="col-sm-12 col-lg-6">
             <div class="stats-widget">
-                <div class='stats-top'>
-                    <span class='stats-value'>{{ trans('dashboard.widgets.support') }}</span>
-                    <span class='stats-label'>{!! trans('dashboard.widgets.support_subtitle') !!}</span>
+                <div class="stats-top">
+                    <span class="stats-value">{{ trans('dashboard.widgets.support') }}</span>
+                    <span class="stats-label">{!! trans('dashboard.widgets.support_subtitle') !!}</span>
                 </div>
             </div>
         </div>
diff --git a/resources/views/dashboard/metrics/add.blade.php b/resources/views/dashboard/metrics/add.blade.php
index 946d8515d73a..88408762ae3c 100644
--- a/resources/views/dashboard/metrics/add.blade.php
+++ b/resources/views/dashboard/metrics/add.blade.php
@@ -14,7 +14,7 @@
     <div class="row">
         <div class="col-md-12">
             @include('dashboard.partials.errors')
-            <form class='form-vertical' name='MetricsForm' role='form' method='POST'>
+            <form class="form-vertical" name="MetricsForm" role="form" method="POST">
                 <input type="hidden" name="_token" value="{{ csrf_token() }}">
                 <fieldset>
                     <div class="form-group">
@@ -67,8 +67,8 @@
                         </label>
                     </div>
                 </fieldset>
-                <div class='form-group'>
-                    <div class='btn-group'>
+                <div class="form-group">
+                    <div class="btn-group">
                         <button type="submit" class="btn btn-success">{{ trans('forms.add') }}</button>
                         <a class="btn btn-default" href="{{ route('dashboard.metrics.index') }}">{{ trans('forms.cancel') }}</a>
                     </div>
diff --git a/resources/views/dashboard/metrics/edit.blade.php b/resources/views/dashboard/metrics/edit.blade.php
index 869e0cc0ec27..4889f719cd34 100644
--- a/resources/views/dashboard/metrics/edit.blade.php
+++ b/resources/views/dashboard/metrics/edit.blade.php
@@ -14,7 +14,7 @@
     <div class="row">
         <div class="col-md-12">
             @include('dashboard.partials.errors')
-            <form class='form-vertical' name='MetricsForm' role='form' method='POST'>
+            <form class="form-vertical" name="MetricsForm" role="form" method="POST">
                 <input type="hidden" name="_token" value="{{ csrf_token() }}">
                 <fieldset>
                     <div class="form-group">
@@ -70,8 +70,8 @@
 
                 <input type="hidden" name="id" value={{$metric->id}}>
 
-                <div class='form-group'>
-                    <div class='btn-group'>
+                <div class="form-group">
+                    <div class="btn-group">
                         <button type="submit" class="btn btn-success">{{ trans('forms.update') }}</button>
                         <a class="btn btn-default" href="{{ route('dashboard.metrics.index') }}">{{ trans('forms.cancel') }}</a>
                     </div>
diff --git a/resources/views/dashboard/templates/edit.blade.php b/resources/views/dashboard/templates/edit.blade.php
index b44b5eb84602..148622cc93a2 100644
--- a/resources/views/dashboard/templates/edit.blade.php
+++ b/resources/views/dashboard/templates/edit.blade.php
@@ -42,7 +42,7 @@
                 </div>
                 @endif
 
-                <form class='form-vertical' name='IncidentTemplateForm' role='form' method='POST'>
+                <form class="form-vertical" name="IncidentTemplateForm" role="form" method="POST">
                     <input type="hidden" name="_token" value="{{ csrf_token() }}">
                     <fieldset>
                         <div class="form-group">

From cf216077c33c058f981d911c30ac6b9547e7887e Mon Sep 17 00:00:00 2001
From: Abhimanyu Sharma <abhimanyusharma003@gmail.com>
Date: Sat, 1 Oct 2016 21:39:29 +0530
Subject: [PATCH 4/5] Typo

---
 resources/views/dashboard/incidents/add.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/dashboard/incidents/add.blade.php b/resources/views/dashboard/incidents/add.blade.php
index ce630f9af9a2..4bf09009d7ce 100644
--- a/resources/views/dashboard/incidents/add.blade.php
+++ b/resources/views/dashboard/incidents/add.blade.php
@@ -77,12 +77,12 @@
                             @foreach($components_in_groups as $group)
                             <optgroup label="{{ $group->name }}">
                                 @foreach($group->components as $component)
-                                <option value=""{{ $component->id }}">{{ $component->name }}</option>
+                                <option value="{{ $component->id }}">{{ $component->name }}</option>
                                 @endforeach
                             </optgroup>
                             @endforeach
                             @foreach($components_out_groups as $component)
-                            <option value=""{{ $component->id }}">{{ $component->name }}</option>
+                            <option value="{{ $component->id }}">{{ $component->name }}</option>
                             @endforeach
                         </select>
                         <span class='help-block'>{{ trans('forms.optional') }}</span>

From 0f4c14ac0820562a3155d6f60ea4a7770d19084b Mon Sep 17 00:00:00 2001
From: Abhimanyu Sharma <abhimanyusharma003@gmail.com>
Date: Sun, 2 Oct 2016 01:07:16 +0530
Subject: [PATCH 5/5] Lowercase email for gravatar

---
 app/Models/User.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Models/User.php b/app/Models/User.php
index 89d88321cd0b..ebb838a11068 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -172,7 +172,7 @@ public function setPasswordAttribute($password)
      */
     public function getGravatarAttribute($size = 200)
     {
-        return sprintf('https://www.gravatar.com/avatar/%s?size=%d', md5($this->email), $size);
+        return sprintf('https://www.gravatar.com/avatar/%s?size=%d', md5(strtolower($this->email)), $size);
     }
 
     /**