From a946879fc1e8e768a09fd4c33f9911ae40ff0928 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <JonnyWong16@users.noreply.github.com>
Date: Sun, 18 Mar 2018 17:22:44 -0700
Subject: [PATCH] Better OSX register button

---
 data/interfaces/default/notifier_config.html |  5 +----
 data/interfaces/default/notifiers_table.html |  2 +-
 data/interfaces/default/settings.html        |  2 +-
 plexpy/notifiers.py                          | 10 ++++++++--
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/data/interfaces/default/notifier_config.html b/data/interfaces/default/notifier_config.html
index e6d68bc6..c77b6822 100644
--- a/data/interfaces/default/notifier_config.html
+++ b/data/interfaces/default/notifier_config.html
@@ -45,9 +45,6 @@
                                         <div class="row">
                                             <div class="col-md-12">
                                                 <input type="${item['input_type']}" class="form-control" id="${item['name']}" name="${item['name']}" value="${item['value']}" size="30" ${'readonly' if item.get('readonly') else ''}>
-                                                % if item['name'] == 'osx_notify_app':
-                                                <a href="javascript:void(0)" id="osxnotifyregister">Register</a>
-                                                % endif
                                             </div>
                                         </div>
                                         <p class="help-block">${item['description'] | n}</p>
@@ -522,7 +519,7 @@
     });
 
     % elif notifier['agent_name'] == 'osx':
-    $('#osxnotifyregister').click(function () {
+    $('#osx_notify_register').click(function () {
         var osx_notify_app = $('#osx_notify_app').val();
         $.get('osxnotifyregister', { 'app': osx_notify_app }, function (data) { showMsg('<i class="fa fa-check"></i> ' + data, false, true, 3000); });
     });
diff --git a/data/interfaces/default/notifiers_table.html b/data/interfaces/default/notifiers_table.html
index 32f055c2..da0cb624 100644
--- a/data/interfaces/default/notifiers_table.html
+++ b/data/interfaces/default/notifiers_table.html
@@ -10,7 +10,7 @@ DOCUMENTATION :: END
 </%doc>
 
 <ul class="stacked-configs list-unstyled">
-    % for notifier in sorted(notifiers_list, key=lambda k: (k['agent_label'], k['friendly_name'], k['id'])):
+    % for notifier in sorted(notifiers_list, key=lambda k: (k['agent_label'].lower(), k['friendly_name'], k['id'])):
     <li class="notification-agent" data-id="${notifier['id']}">
         <span>
             <span class="toggle-left trigger-tooltip ${'active' if notifier['active'] else ''}" data-toggle="tooltip" data-placement="top" title="Triggers ${'active' if notifier['active'] else 'inactive'}"><i class="fa fa-lg fa-bell"></i></span>
diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html
index 31aa6181..e223fcd9 100644
--- a/data/interfaces/default/settings.html
+++ b/data/interfaces/default/settings.html
@@ -1233,7 +1233,7 @@
                     <div class="row">
                         <div class="col-md-12">
                             <ul class="stacked-configs list-unstyled">
-                                % for agent in available_notification_agents:
+                                % for agent in sorted(available_notification_agents, key=lambda k: k['label'].lower()):
                                 <li class="new-notification-agent" data-id="${agent['id']}">
                                     <span>${agent['label']}</span>
                                 </li>
diff --git a/plexpy/notifiers.py b/plexpy/notifiers.py
index 04979b5f..41ad62d8 100644
--- a/plexpy/notifiers.py
+++ b/plexpy/notifiers.py
@@ -2389,9 +2389,15 @@ class OSX(Notifier):
         config_option = [{'label': 'Register Notify App',
                           'value': self.config['notify_app'],
                           'name': 'osx_notify_app',
-                          'description': 'Enter the path/application name to be registered with the '
-                                         'Notification Center, default is /Applications/Tautulli.',
+                          'description': 'Enter the path/application name to be registered with the Notification Center. '
+                                         'Default is <span class="inline-pre">/Applications/Tautulli</span>.',
                           'input_type': 'text'
+                          },
+                         {'label': 'Register App',
+                          'value': 'Register App',
+                          'name': 'osx_notify_register',
+                          'description': 'Register Tautulli with the Notification Center.',
+                          'input_type': 'button'
                           }
                          ]