From ff29ab915027589ad5e18da33afc93f908ad7ef4 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Sun, 26 May 2013 22:27:33 -0700 Subject: [PATCH] Purdy Add Notifications --- NzbDrone.Core/Notifications/Smtp/Smtp.cs | 2 +- UI/Index.html | 1 + .../Notifications/AddItemTemplate.html | 8 ++++++- UI/Settings/Notifications/AddTemplate.html | 4 ++-- UI/Settings/Notifications/AddView.js | 6 ++--- UI/Settings/Notifications/notifications.less | 24 +++++++++++++++++++ 6 files changed, 38 insertions(+), 7 deletions(-) create mode 100644 UI/Settings/Notifications/notifications.less diff --git a/NzbDrone.Core/Notifications/Smtp/Smtp.cs b/NzbDrone.Core/Notifications/Smtp/Smtp.cs index 104c9bc21..04ba117a4 100644 --- a/NzbDrone.Core/Notifications/Smtp/Smtp.cs +++ b/NzbDrone.Core/Notifications/Smtp/Smtp.cs @@ -16,7 +16,7 @@ namespace NzbDrone.Core.Notifications.Smtp public override string Name { - get { return "SMTP"; } + get { return "Email"; } } public override void OnGrab(string message) diff --git a/UI/Index.html b/UI/Index.html index fdd5f8923..0e2a5ab8e 100644 --- a/UI/Index.html +++ b/UI/Index.html @@ -19,6 +19,7 @@ +
diff --git a/UI/Settings/Notifications/AddItemTemplate.html b/UI/Settings/Notifications/AddItemTemplate.html index 2097e9a9b..057f17b6a 100644 --- a/UI/Settings/Notifications/AddItemTemplate.html +++ b/UI/Settings/Notifications/AddItemTemplate.html @@ -1 +1,7 @@ -{{name}} \ No newline at end of file +
+
+
+ {{name}} +
+
+
\ No newline at end of file diff --git a/UI/Settings/Notifications/AddTemplate.html b/UI/Settings/Notifications/AddTemplate.html index 058598b78..621e83d85 100644 --- a/UI/Settings/Notifications/AddTemplate.html +++ b/UI/Settings/Notifications/AddTemplate.html @@ -3,8 +3,8 @@

Add Notification

-
-
+
+
    diff --git a/UI/Settings/Notifications/AddView.js b/UI/Settings/Notifications/AddView.js index 71968bad0..6b418ade6 100644 --- a/UI/Settings/Notifications/AddView.js +++ b/UI/Settings/Notifications/AddView.js @@ -8,8 +8,7 @@ define([ NzbDrone.Settings.Notifications.AddItemView = Backbone.Marionette.ItemView.extend({ template : 'Settings/Notifications/AddItemTemplate', - tagName : 'button', - className: 'btn', + tagName : 'li', events: { 'click': 'addNotification' @@ -17,6 +16,7 @@ define([ addNotification: function () { this.model.set('id', undefined); + this.model.set('name', ''); var view = new NzbDrone.Settings.Notifications.EditView({ model: this.model}); NzbDrone.modalRegion.show(view); } @@ -24,7 +24,7 @@ define([ NzbDrone.Settings.Notifications.AddView = Backbone.Marionette.CompositeView.extend({ itemView : NzbDrone.Settings.Notifications.AddItemView, - itemViewContainer : '#notifications-to-add', + itemViewContainer : '.notifications .items', template : 'Settings/Notifications/AddTemplate' }); }); diff --git a/UI/Settings/Notifications/notifications.less b/UI/Settings/Notifications/notifications.less new file mode 100644 index 000000000..8eb103d77 --- /dev/null +++ b/UI/Settings/Notifications/notifications.less @@ -0,0 +1,24 @@ +@import "../../shared/Styles/card.less"; + +.add-notification-item { + .card; + cursor: pointer; + font-size: 24px; + font-weight: lighter; + text-align: center; +} + +.notifications { + text-align: center; + + .items { + list-style-type: none; + margin: 0px; + + li { + display: inline-block; + vertical-align: top; + } + } +} +