From c0b01814753aefa438d833f52cf057d6800d74a7 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <Jonny.Wong.16@gmail.com>
Date: Sat, 23 Apr 2016 22:22:27 -0700
Subject: [PATCH] Some cleanup

---
 data/interfaces/default/base.html     |  3 +++
 data/interfaces/default/settings.html |  7 +-----
 plexpy/users.py                       | 34 +++++++++++++--------------
 3 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/data/interfaces/default/base.html b/data/interfaces/default/base.html
index dd48b955..1d4d4c25 100644
--- a/data/interfaces/default/base.html
+++ b/data/interfaces/default/base.html
@@ -217,6 +217,9 @@ from plexpy.helpers import anon_url
                             <li role="separator" class="divider"></li>
                             <li><a href="logs"><i class="fa fa-fw fa-list-alt"></i> View Logs</a></li>
                             <li role="separator" class="divider"></li>
+                            <li><a href="${anon_url('https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=DG783BMSCU3V4')}" target="_blank"><i class="fa fa-fw fa-paypal"></i> Paypal</a></li>
+                            <li><a href="${anon_url('http://swiftpanda16.tip.me/')}" target="_blank"><i class="fa fa-fw fa-btc"></i> Bitcoin</a></li>
+                            <li role="separator" class="divider"></li>
                             % if plexpy.CONFIG.CHECK_GITHUB:
                             <li><a href="#" id="nav-update"><i class="fa fa-fw fa-arrow-circle-up"></i> Check for Updates</a></li>
                             % endif
diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html
index 892c120b..52931d0f 100644
--- a/data/interfaces/default/settings.html
+++ b/data/interfaces/default/settings.html
@@ -38,7 +38,7 @@ available_notification_agents = sorted(notifiers.available_notification_agents()
             <ul class="nav-settings list-unstyled" role="tablist">
                 <li role="presentation" class="active"><a href="#tabs-0" aria-controls="tabs-0" role="tab" data-toggle="tab">Help & Info</a></li>
                 <li role="presentation"><a href="#tabs-1" aria-controls="tabs-1" role="tab" data-toggle="tab">General</a></li>
-                <li role="presentation"><a href="#tabs-2" aria-controls="tabs-2" role="tab" data-toggle="tab">Homepage Statistics</a></li>
+                <li role="presentation"><a href="#tabs-2" aria-controls="tabs-2" role="tab" data-toggle="tab">Homepage</a></li>
                 <li role="presentation"><a href="#tabs-3" aria-controls="tabs-3" role="tab" data-toggle="tab">Web Interface</a></li>
                 <li role="presentation"><a href="#tabs-4" aria-controls="tabs-4" role="tab" data-toggle="tab">Access Control</a></li>
                 <li role="presentation"><a href="#tabs-5" aria-controls="tabs-5" role="tab" data-toggle="tab">Plex Media Server</a></li>
@@ -131,11 +131,6 @@ available_notification_agents = sorted(notifiers.available_notification_agents()
                                     <td>Gitter Chat:</td>
                                     <td><a class="no-highlight" href="${anon_url('https://gitter.im/drzoidberg33/plexpy')}" target="_blank">https://gitter.im/drzoidberg33/plexpy</a></td>
                                 </tr>
-                                <tr>
-                                    <td>Support PlexPy:</td>
-                                    <td><a class="no-highlight" href="${anon_url('https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=DG783BMSCU3V4')}" target="_blank">Paypal</a> | 
-                                        <a class="no-highlight" href="${anon_url('http://swiftpanda16.tip.me/')}" target="_blank">Bitcoin</a></td>
-                                </tr>
                             </tbody>
                         </table>
                         <div class="padded-header">
diff --git a/plexpy/users.py b/plexpy/users.py
index e3f28092..bb6c7f44 100644
--- a/plexpy/users.py
+++ b/plexpy/users.py
@@ -84,23 +84,6 @@ class Users(object):
     def __init__(self):
         pass
 
-    def get_user_names(self, kwargs=None):
-        monitor_db = database.MonitorDatabase()
-        
-        try:
-            query = 'SELECT user_id, ' \
-                    '(CASE WHEN users.friendly_name IS NULL OR TRIM(users.friendly_name) = "" \
-                    THEN users.username ELSE users.friendly_name END) AS friendly_name ' \
-                    'FROM users ' \
-                    'WHERE deleted_user = 0'
-
-            result = monitor_db.select(query)
-        except Exception as e:
-            logger.warn(u"PlexPy Graphs :: Unable to execute database query for get_user_names: %s." % e)
-            return None
-        
-        return result
-    
     def get_datatables_list(self, kwargs=None):
         data_tables = datatables.DataTables()
 
@@ -640,6 +623,23 @@ class Users(object):
 
         return None
 
+    def get_user_names(self, kwargs=None):
+        monitor_db = database.MonitorDatabase()
+        
+        try:
+            query = 'SELECT user_id, ' \
+                    '(CASE WHEN users.friendly_name IS NULL OR TRIM(users.friendly_name) = "" \
+                    THEN users.username ELSE users.friendly_name END) AS friendly_name ' \
+                    'FROM users ' \
+                    'WHERE deleted_user = 0'
+
+            result = monitor_db.select(query)
+        except Exception as e:
+            logger.warn(u"PlexPy Users :: Unable to execute database query for get_user_names: %s." % e)
+            return None
+        
+        return result
+    
     def get_tokens(self, user_id=None):
         if user_id:
             try: