From 6bbe55a46c3f22de359bfff2ba96ee959f27429c Mon Sep 17 00:00:00 2001
From: Devin Buhl <onedr0p@users.noreply.github.com>
Date: Tue, 28 Feb 2017 17:58:21 -0500
Subject: [PATCH] Patch/updates onedr0p (#946)

* Update inCinemas column to abide by the short date set in settings (#511)

* Set default port to 587 for Email Settings, should help with all the people with gmail

* set SSL to true by default
---
 .../Notifications/Email/EmailSettings.cs            |  3 ++-
 src/UI/Cells/InCinemasCell.js                       | 13 +++++--------
 .../Overview/SeriesOverviewItemViewTemplate.hbs     |  2 +-
 src/UI/Shared/UiSettingsModel.js                    |  4 ++++
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/NzbDrone.Core/Notifications/Email/EmailSettings.cs b/src/NzbDrone.Core/Notifications/Email/EmailSettings.cs
index 2af0ed9b8..ff5eff9fc 100644
--- a/src/NzbDrone.Core/Notifications/Email/EmailSettings.cs
+++ b/src/NzbDrone.Core/Notifications/Email/EmailSettings.cs
@@ -22,7 +22,8 @@ namespace NzbDrone.Core.Notifications.Email
 
         public EmailSettings()
         {
-            Port = 25;
+            Port = 587;
+            Ssl = true;
         }
 
         [FieldDefinition(0, Label = "Server", HelpText = "Hostname or IP of Email server")]
diff --git a/src/UI/Cells/InCinemasCell.js b/src/UI/Cells/InCinemasCell.js
index 9f1cb2d57..e9ce812eb 100644
--- a/src/UI/Cells/InCinemasCell.js
+++ b/src/UI/Cells/InCinemasCell.js
@@ -1,20 +1,17 @@
 var TemplatedCell = require('./TemplatedCell');
+var moment = require('moment');
+var FormatHelpers = require('../Shared/FormatHelpers');
+var UiSettingsModel = require('../Shared/UiSettingsModel');
 
 module.exports = TemplatedCell.extend({
     className : 'in-cinemas-cell',
 
     render : function() {
-      var monthNames = ["January", "February", "March", "April", "May", "June",
-      "July", "August", "September", "October", "November", "December"
-    ];
-
       this.$el.html("");
 
       if (this.model.get("inCinemas")) {
-        var cinemasDate = new Date(this.model.get("inCinemas"));
-        var year = cinemasDate.getFullYear();
-        var month = monthNames[cinemasDate.getMonth()];
-          this.$el.html(month + " " + year); //Hack, but somehow handlebar helper does not work.
+        var cinemasDate = this.model.get("inCinemas");
+        this.$el.html(moment(cinemasDate).format(UiSettingsModel.shortDate()));
       }
 
       return this;
diff --git a/src/UI/Movies/Index/Overview/SeriesOverviewItemViewTemplate.hbs b/src/UI/Movies/Index/Overview/SeriesOverviewItemViewTemplate.hbs
index ffc74aace..18033cc04 100644
--- a/src/UI/Movies/Index/Overview/SeriesOverviewItemViewTemplate.hbs
+++ b/src/UI/Movies/Index/Overview/SeriesOverviewItemViewTemplate.hbs
@@ -37,7 +37,7 @@
                 <div class="col-md-8 col-xs-8">
                     <span class="label label-default">{{GetStatus}}</span>
 
-                    <span class="label label-default">{{inCinemas}}</span>
+                    <span class="label label-default">{{ShortDate inCinemas}}</span>
 
                     {{profile profileId}}
 
diff --git a/src/UI/Shared/UiSettingsModel.js b/src/UI/Shared/UiSettingsModel.js
index a517b5aba..e81b08396 100644
--- a/src/UI/Shared/UiSettingsModel.js
+++ b/src/UI/Shared/UiSettingsModel.js
@@ -8,6 +8,10 @@ var UiSettings = Backbone.Model.extend({
         return this.get('shortDateFormat') + ' ' + this.time(true, includeSeconds);
     },
 
+    shortDate : function() {
+        return this.get('shortDateFormat');
+    },
+
     longDateTime : function(includeSeconds) {
         return this.get('longDateFormat') + ' ' + this.time(true, includeSeconds);
     },