From 3654ad7729c000e8785f60818397ef523e70d89a Mon Sep 17 00:00:00 2001
From: delphiactual <delphi.actual@gmail.com>
Date: Fri, 2 May 2014 00:27:29 -0600
Subject: [PATCH] Pushbullet Changes

Remove "." from test button
Replace nickname into dropdown menu instead of model...
---
 gui/slick/interfaces/default/config_notifications.tmpl | 2 +-
 gui/slick/js/configNotifications.js                    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gui/slick/interfaces/default/config_notifications.tmpl b/gui/slick/interfaces/default/config_notifications.tmpl
index 6379a953..7354b420 100644
--- a/gui/slick/interfaces/default/config_notifications.tmpl
+++ b/gui/slick/interfaces/default/config_notifications.tmpl
@@ -983,7 +983,7 @@
                                 </label>
                             </div>
                             <div class="testNotification" id="testPushbullet-result">Click below to test.</div>
-                            <input type="button" class="btn" value="Test Pushbullet." id="testPushbullet" />
+                            <input type="button" class="btn" value="Test Pushbullet" id="testPushbullet" />
                             <input type="submit" class="btn config_submitter" value="Save Changes" />
                         </div><!-- /content_use_pushbullet //-->
 
diff --git a/gui/slick/js/configNotifications.js b/gui/slick/js/configNotifications.js
index 3f3290c8..e828bd76 100644
--- a/gui/slick/js/configNotifications.js
+++ b/gui/slick/js/configNotifications.js
@@ -261,9 +261,9 @@ $(document).ready(function(){
                 $("#pushbullet_device_list").html('');
                 for (var i = 0; i < devices.length; i++) {
                     if(current_pushbullet_device == devices[i].iden) {
-                        $("#pushbullet_device_list").append('<option value="'+devices[i].iden+'" selected>' + devices[i].extras.model + '</option>')
+                        $("#pushbullet_device_list").append('<option value="'+devices[i].iden+'" selected>' + devices[i].extras.nickname + '</option>')
                     } else {
-                        $("#pushbullet_device_list").append('<option value="'+devices[i].iden+'">' + devices[i].extras.model + '</option>')
+                        $("#pushbullet_device_list").append('<option value="'+devices[i].iden+'">' + devices[i].extras.nickname + '</option>')
                     }
                 }
                 if(msg) {