From b209c297494cc1571a8c5d072456677d2fd83344 Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Wed, 13 Dec 2017 20:48:04 -0800 Subject: [PATCH] Use svg for platform and library icons --- data/interfaces/default/css/plexpy.css | 159 +++++++++++-- .../default/current_activity_instance.html | 6 +- data/interfaces/default/home_stats.html | 21 +- .../images/home-stat_most-concurrent.png | Bin 4864 -> 0 bytes .../default/images/libraries/artist.png | Bin 24953 -> 0 bytes .../default/images/libraries/artist.svg | 5 + .../default/images/libraries/movie.png | Bin 19242 -> 0 bytes .../default/images/libraries/movie.svg | 5 + .../default/images/libraries/photo.png | Bin 24998 -> 0 bytes .../default/images/libraries/photo.svg | 6 + .../default/images/libraries/playlist.svg | 12 + .../default/images/libraries/show.png | Bin 20948 -> 0 bytes .../default/images/libraries/show.svg | 6 + .../default/images/libraries/video.png | Bin 22665 -> 0 bytes .../default/images/libraries/video.svg | 5 + .../default/images/platforms/android.png | Bin 64984 -> 0 bytes .../default/images/platforms/android.svg | 8 + .../default/images/platforms/appletv.svg | 8 + .../default/images/platforms/atv.png | Bin 65186 -> 0 bytes .../default/images/platforms/chrome.png | Bin 65186 -> 0 bytes .../default/images/platforms/chrome.svg | 8 + .../default/images/platforms/chromecast.png | Bin 65186 -> 0 bytes .../default/images/platforms/chromecast.svg | 8 + .../default/images/platforms/cloudsync.png | Bin 65186 -> 0 bytes .../default/images/platforms/cloudsync.svg | 6 + .../default/images/platforms/default.png | Bin 65263 -> 0 bytes .../default/images/platforms/default.svg | 5 + .../default/images/platforms/dlna.png | Bin 65254 -> 0 bytes .../default/images/platforms/dlna.svg | 5 + .../default/images/platforms/edge.svg | 5 + .../default/images/platforms/firefox.png | Bin 64349 -> 0 bytes .../default/images/platforms/firefox.svg | 5 + .../default/images/platforms/googletv.svg | 14 ++ .../default/images/platforms/gtv.png | Bin 65263 -> 0 bytes .../default/images/platforms/ie.png | Bin 65263 -> 0 bytes .../default/images/platforms/ie.svg | 5 + .../default/images/platforms/ios.png | Bin 64828 -> 0 bytes .../default/images/platforms/kodi.png | Bin 65263 -> 0 bytes .../default/images/platforms/kodi.svg | 8 + .../default/images/platforms/linux.png | Bin 64747 -> 0 bytes .../default/images/platforms/linux.svg | 8 + .../default/images/platforms/macOS.svg | 6 + .../default/images/platforms/msedge.png | Bin 65263 -> 0 bytes .../default/images/platforms/opera.png | Bin 65263 -> 0 bytes .../default/images/platforms/opera.svg | 6 + .../default/images/platforms/osx.png | Bin 64514 -> 0 bytes .../default/images/platforms/pht.png | Bin 65263 -> 0 bytes .../default/images/platforms/playstation.png | Bin 17647 -> 0 bytes .../default/images/platforms/playstation.svg | 7 + .../default/images/platforms/plex.svg | 5 + .../default/images/platforms/plexamp.svg | 5 + .../default/images/platforms/plextogether.png | Bin 65263 -> 0 bytes .../default/images/platforms/pmh.png | Bin 65263 -> 0 bytes .../default/images/platforms/pmp.png | Bin 65263 -> 0 bytes .../default/images/platforms/pms.png | Bin 65263 -> 0 bytes .../default/images/platforms/roku.png | Bin 64194 -> 0 bytes .../default/images/platforms/roku.svg | 7 + .../default/images/platforms/safari.png | Bin 65263 -> 0 bytes .../default/images/platforms/safari.svg | 66 ++++++ .../default/images/platforms/samsung.png | Bin 65263 -> 0 bytes .../default/images/platforms/samsung.svg | 5 + .../default/images/platforms/symbol-defs.svg | 210 ++++++++++++++++++ .../default/images/platforms/synclounge.svg | 9 + .../default/images/platforms/tivo.svg | 5 + .../default/images/platforms/wiiu.png | Bin 65263 -> 0 bytes .../default/images/platforms/wiiu.svg | 6 + .../default/images/platforms/win10.png | Bin 65263 -> 0 bytes .../default/images/platforms/win8.png | Bin 65263 -> 0 bytes .../default/images/platforms/windows.svg | 8 + .../default/images/platforms/wp.png | Bin 65263 -> 0 bytes .../default/images/platforms/xbmc.png | Bin 8426 -> 0 bytes .../default/images/platforms/xbox.png | Bin 65263 -> 0 bytes .../default/images/platforms/xbox.svg | 8 + data/interfaces/default/js/script.js | 70 ------ .../interfaces/default/js/tables/libraries.js | 4 +- data/interfaces/default/library.html | 2 +- data/interfaces/default/library_stats.html | 6 +- .../interfaces/default/user_player_stats.html | 10 +- plexpy/common.py | 34 +++ plexpy/datafactory.py | 14 +- plexpy/libraries.py | 2 +- plexpy/pmsconnect.py | 17 +- plexpy/users.py | 6 +- 83 files changed, 699 insertions(+), 137 deletions(-) delete mode 100644 data/interfaces/default/images/home-stat_most-concurrent.png delete mode 100644 data/interfaces/default/images/libraries/artist.png create mode 100644 data/interfaces/default/images/libraries/artist.svg delete mode 100644 data/interfaces/default/images/libraries/movie.png create mode 100644 data/interfaces/default/images/libraries/movie.svg delete mode 100644 data/interfaces/default/images/libraries/photo.png create mode 100644 data/interfaces/default/images/libraries/photo.svg create mode 100644 data/interfaces/default/images/libraries/playlist.svg delete mode 100644 data/interfaces/default/images/libraries/show.png create mode 100644 data/interfaces/default/images/libraries/show.svg delete mode 100644 data/interfaces/default/images/libraries/video.png create mode 100644 data/interfaces/default/images/libraries/video.svg delete mode 100644 data/interfaces/default/images/platforms/android.png create mode 100644 data/interfaces/default/images/platforms/android.svg create mode 100644 data/interfaces/default/images/platforms/appletv.svg delete mode 100644 data/interfaces/default/images/platforms/atv.png delete mode 100644 data/interfaces/default/images/platforms/chrome.png create mode 100644 data/interfaces/default/images/platforms/chrome.svg delete mode 100644 data/interfaces/default/images/platforms/chromecast.png create mode 100644 data/interfaces/default/images/platforms/chromecast.svg delete mode 100644 data/interfaces/default/images/platforms/cloudsync.png create mode 100644 data/interfaces/default/images/platforms/cloudsync.svg delete mode 100644 data/interfaces/default/images/platforms/default.png create mode 100644 data/interfaces/default/images/platforms/default.svg delete mode 100644 data/interfaces/default/images/platforms/dlna.png create mode 100644 data/interfaces/default/images/platforms/dlna.svg create mode 100644 data/interfaces/default/images/platforms/edge.svg delete mode 100644 data/interfaces/default/images/platforms/firefox.png create mode 100644 data/interfaces/default/images/platforms/firefox.svg create mode 100644 data/interfaces/default/images/platforms/googletv.svg delete mode 100644 data/interfaces/default/images/platforms/gtv.png delete mode 100644 data/interfaces/default/images/platforms/ie.png create mode 100644 data/interfaces/default/images/platforms/ie.svg delete mode 100644 data/interfaces/default/images/platforms/ios.png delete mode 100644 data/interfaces/default/images/platforms/kodi.png create mode 100644 data/interfaces/default/images/platforms/kodi.svg delete mode 100644 data/interfaces/default/images/platforms/linux.png create mode 100644 data/interfaces/default/images/platforms/linux.svg create mode 100644 data/interfaces/default/images/platforms/macOS.svg delete mode 100644 data/interfaces/default/images/platforms/msedge.png delete mode 100644 data/interfaces/default/images/platforms/opera.png create mode 100644 data/interfaces/default/images/platforms/opera.svg delete mode 100644 data/interfaces/default/images/platforms/osx.png delete mode 100644 data/interfaces/default/images/platforms/pht.png delete mode 100644 data/interfaces/default/images/platforms/playstation.png create mode 100644 data/interfaces/default/images/platforms/playstation.svg create mode 100644 data/interfaces/default/images/platforms/plex.svg create mode 100644 data/interfaces/default/images/platforms/plexamp.svg delete mode 100644 data/interfaces/default/images/platforms/plextogether.png delete mode 100644 data/interfaces/default/images/platforms/pmh.png delete mode 100644 data/interfaces/default/images/platforms/pmp.png delete mode 100644 data/interfaces/default/images/platforms/pms.png delete mode 100644 data/interfaces/default/images/platforms/roku.png create mode 100644 data/interfaces/default/images/platforms/roku.svg delete mode 100644 data/interfaces/default/images/platforms/safari.png create mode 100644 data/interfaces/default/images/platforms/safari.svg delete mode 100644 data/interfaces/default/images/platforms/samsung.png create mode 100644 data/interfaces/default/images/platforms/samsung.svg create mode 100644 data/interfaces/default/images/platforms/symbol-defs.svg create mode 100644 data/interfaces/default/images/platforms/synclounge.svg create mode 100644 data/interfaces/default/images/platforms/tivo.svg delete mode 100644 data/interfaces/default/images/platforms/wiiu.png create mode 100644 data/interfaces/default/images/platforms/wiiu.svg delete mode 100644 data/interfaces/default/images/platforms/win10.png delete mode 100644 data/interfaces/default/images/platforms/win8.png create mode 100644 data/interfaces/default/images/platforms/windows.svg delete mode 100644 data/interfaces/default/images/platforms/wp.png delete mode 100644 data/interfaces/default/images/platforms/xbmc.png delete mode 100644 data/interfaces/default/images/platforms/xbox.png create mode 100644 data/interfaces/default/images/platforms/xbox.svg diff --git a/data/interfaces/default/css/plexpy.css b/data/interfaces/default/css/plexpy.css index 5ef61179..e3f71d96 100644 --- a/data/interfaces/default/css/plexpy.css +++ b/data/interfaces/default/css/plexpy.css @@ -618,12 +618,6 @@ a .users-poster-face:hover { .users-name { position: relative; } -.platform { - padding-bottom: 0px; - margin-bottom: 0px; - margin-left: 5px; - float: left; -} #dashboard-checking-activity, #dashboard-no-activity { margin-bottom: 20px; @@ -1138,7 +1132,7 @@ a .dashboard-activity-metadata-user-thumb:hover { border-radius: 4px; overflow: hidden; } -.dashboard-stats-library { +.dashboard-stats-flat { background-position: center; background-size: cover; height: 100px; @@ -1152,9 +1146,6 @@ a .dashboard-activity-metadata-user-thumb:hover { -webkit-backface-visibility: hidden; backface-visibility: hidden; z-index: 1; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; overflow: hidden; } .dashboard-stats-info-container { @@ -1172,8 +1163,9 @@ a .dashboard-activity-metadata-user-thumb:hover { align-items: baseline; height: 30px; width: 100%; - padding: 5px; + padding: 5px 5px 5px 10px; line-height: 20px; + text-transform: uppercase; border-bottom: 1px solid rgba(255,255,255,.1); -webkit-flex-grow: 1; flex-grow: 1; @@ -1181,28 +1173,20 @@ a .dashboard-activity-metadata-user-thumb:hover { } .dashboard-stats-info-title h4 { margin: 0; + font-size: 15px; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; - flex-basis: 250px; -webkit-flex-grow: 1; flex-grow: 1; } -.dashboard-stats-info-title.library h4 { - flex-basis: 200px; -} .dashboard-stats-info-title .dashboard-stats-stats-units { color: #aaa; font-size: 12px; text-align: right; - text-transform: uppercase; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; - max-width: 125px; -} -.dashboard-stats-info-title .dashboard-stats-stats-units.library { - max-width: 200px; } .dashboard-stats-info-scroller { height: 120px; @@ -1626,7 +1610,7 @@ a:hover .dashboard-recent-media-cover { display: block; width: 100%; height: 100%; - background-image: url(../images/plex-logo-light-small.png); + background-image: url(../images/plex-logo-light.svg); background-size: 100px; background-repeat: no-repeat; background-position: center; @@ -3524,4 +3508,137 @@ a:hover .overlay-refresh-image:hover { box-sizing: border-box; height: 45px; vertical-align: middle; +} + +.svg-icon { + padding: 10px; + background-origin: content-box; + background-size: cover; + background-repeat: no-repeat; + background-position: center; +} +.platform-android { + background-color: #a4ca39; + background-image: url(../images/platforms/android.svg); +} +.platform-atv { + background-color: #858487; + background-image: url(../images/platforms/atv.svg); +} +.platform-chrome { + background-color: #ed5e50; + background-image: url(../images/platforms/chrome.svg); +} +.platform-chromecast { + background-color: #10a4e8; + background-image: url(../images/platforms/chromecast.svg); +} +.platform-dlna { + background-color: #0cb14b; + background-image: url(../images/platforms/dlna.svg); +} +.platform-firefox { + background-color: #e67817; + background-image: url(../images/platforms/firefox.svg); +} +.platform-ie { + background-color: #00599e; + background-image: url(../images/platforms/ie.svg); +} +.platform-ios { + background-color: #858487; + background-image: url(../images/platforms/ios.svg); +} +.platform-kodi { + background-color: #31afe1; + background-image: url(../images/platforms/kodi.svg); +} +.platform-linux { + background-color: #1793d0; + background-image: url(../images/platforms/linux.svg); +} +.platform-msedge { + background-color: #0078d7; + background-image: url(../images/platforms/msedge.svg); +} +.platform-opera { + background-color: #ff1b2d; + background-image: url(../images/platforms/opera.svg); +} +.platform-playstation { + background-color: #034da2; + background-image: url(../images/platforms/playstation.svg); +} +.platform-plex { + background-color: #e5a00d; + background-image: url(../images/platforms/plex.svg); +} +.platform-plexamp { + background-color: #e5a00d; + background-image: url(../images/platforms/plexamp.svg); +} +.platform-plextogether { + background-color: #151924; + background-image: url(../images/platforms/plextogether.svg); +} +.platform-roku { + background-color: #6d3c97; + background-image: url(../images/platforms/roku.svg); +} +.platform-safari { + background-color: #00a9ec; + background-image: url(../images/platforms/safari.svg); +} +.platform-samsung { + background-color: #034ea2; + background-image: url(../images/platforms/samsung.svg); +} +.platform-windows { + background-color: #2fc0f5; + background-image: url(../images/platforms/windows.svg); +} +.platform-wp { + background-color: #68217a; + background-image: url(../images/platforms/wp.svg); +} +.platform-wiiu { + background-color: #03a9f4; + background-image: url(../images/platforms/wiiu.svg); +} +.platform-xbmc { + background-color: #3b4872; + background-image: url(../images/platforms/xbmc.svg); +} +.platform-xbox { + background-color: #107c10; + background-image: url(../images/platforms/xbox.svg); +} +.platform-default { + background-color: #e5a00d; + background-image: url(../images/platforms/default.svg); +} +.library-movie { + background-image: url(../images/libraries/movie.svg); +} +.library-show { + background-image: url(../images/libraries/show.svg); +} +.library-artist { + background-image: url(../images/libraries/artist.svg); +} +.library-photo { + background-image: url(../images/libraries/photo.svg); +} +.library-video { + background-image: url(../images/libraries/video.svg); +} +.stats-most_concurrent { + background-image: url(../images/icons/most-concurrent-streams.svg); +} + +.transparent { + background-color: transparent !important; +} +.no-image { + background-image: none !important; } \ No newline at end of file diff --git a/data/interfaces/default/current_activity_instance.html b/data/interfaces/default/current_activity_instance.html index 0d6f6761..13016117 100644 --- a/data/interfaces/default/current_activity_instance.html +++ b/data/interfaces/default/current_activity_instance.html @@ -114,11 +114,7 @@ DOCUMENTATION :: END else: no_terminate = '' %> -
- -
+
% if _session['user_group'] == 'admin' and plexpy.CONFIG.PMS_PLEXPASS and data['session_id']:
diff --git a/data/interfaces/default/home_stats.html b/data/interfaces/default/home_stats.html index a35fc719..f81601b9 100644 --- a/data/interfaces/default/home_stats.html +++ b/data/interfaces/default/home_stats.html @@ -78,6 +78,8 @@ DOCUMENTATION :: END % else:
% endif + % elif stat_id == 'top_platforms': +
% else:
% endif @@ -95,13 +97,9 @@ DOCUMENTATION :: END
% elif stat_id == 'top_platforms': - + % elif stat_id == 'most_concurrent': - + % endif
@@ -123,7 +121,7 @@ DOCUMENTATION :: END