diff --git a/data/interfaces/default/config.html b/data/interfaces/default/config.html index 3ba883fb..50b73d9a 100644 --- a/data/interfaces/default/config.html +++ b/data/interfaces/default/config.html @@ -13,10 +13,10 @@
-
+

Settings

-
+
% if config['check_github']: % endif @@ -123,7 +123,7 @@
- +
@@ -183,7 +183,7 @@

Port that Plex Media Server is listening on.

- Verify + Verify
@@ -220,7 +220,7 @@
- +
@@ -363,7 +363,7 @@

- +
@@ -656,7 +656,7 @@

- + @@ -815,7 +815,7 @@
- +
diff --git a/data/interfaces/default/css/plexwatch.css b/data/interfaces/default/css/plexwatch.css index bf9c522d..db5da365 100644 --- a/data/interfaces/default/css/plexwatch.css +++ b/data/interfaces/default/css/plexwatch.css @@ -8277,9 +8277,9 @@ ol.test >li { font-size: 12px; } -button.rounded { +.rounded { padding: 4px 12px; - margin-bottom: 0; + margin: 4px 4px 4px 0px; font-size: 14px; font-weight: normal; line-height: 1.42857143; @@ -8301,6 +8301,44 @@ button.rounded { -webkit-appearance:none; } -.rounded:hover{ +.rounded:hover { color: #F9AA03; +} + +.rounded:active { + border: 1px solid #eb8600; +} + +.rounded-primary { + background-color: #eb8600; + color: #f2f2f2; +} + +.rounded-primary:hover { + color: #fff; +} + +.rounded-primary:active { + border: 1px solid #444; + color: #444; +} + +.header-bar { + float: left; +} + +.button-bar { + float: right; +} + +@media (min-width: 1024px) { + .colvis-button-bar { + float: right; + } +} + +@media (max-width: 1023px) { + .colvis-button-bar { + display: none; + } } \ No newline at end of file diff --git a/data/interfaces/default/history.html b/data/interfaces/default/history.html index 461d388e..f2791728 100644 --- a/data/interfaces/default/history.html +++ b/data/interfaces/default/history.html @@ -15,10 +15,10 @@ from plexpy import helpers
-
+

History

-
+
@@ -27,10 +27,10 @@ from plexpy import helpers Time - User + User Platform IP Address - Title + Title Started Paused Stopped @@ -73,7 +73,7 @@ from plexpy import helpers history_table = $('#history_table').DataTable(history_table_options); var colvis = new $.fn.dataTable.ColVis( history_table ); - $( colvis.button() ).appendTo('div.button-bar'); + $( colvis.button() ).appendTo('div.colvis-button-bar'); }); diff --git a/data/interfaces/default/info.html b/data/interfaces/default/info.html index eac486d8..2557d999 100644 --- a/data/interfaces/default/info.html +++ b/data/interfaces/default/info.html @@ -167,11 +167,11 @@ from plexpy import helpers
-
+
% if data['type'] == 'movie' or data['type'] == 'episode' or data['type'] == 'show':

Watch history for ${data['title']}

-
+
@@ -185,9 +185,9 @@ from plexpy import helpers Title Started Paused - Stopped + Stopped Duration - + @@ -260,7 +260,7 @@ from plexpy import helpers history_table.column(4).visible(false); var colvis = new $.fn.dataTable.ColVis( history_table ); - $( colvis.button() ).appendTo('div.button-bar'); + $( colvis.button() ).appendTo('div.colvis-button-bar'); }); @@ -281,7 +281,7 @@ from plexpy import helpers history_table = $('#history_table').DataTable(history_table_options); var colvis = new $.fn.dataTable.ColVis( history_table ); - $( colvis.button() ).appendTo('div.button-bar'); + $( colvis.button() ).appendTo('div.colvis-button-bar'); }); diff --git a/data/interfaces/default/js/jquery.dataTables.bootstrap.pagination.integration.js b/data/interfaces/default/js/jquery.dataTables.bootstrap.pagination.integration.js index c5c196a4..8fe91f5b 100644 --- a/data/interfaces/default/js/jquery.dataTables.bootstrap.pagination.integration.js +++ b/data/interfaces/default/js/jquery.dataTables.bootstrap.pagination.integration.js @@ -65,7 +65,7 @@ $.extend( $.fn.dataTableExt.oPagination, { // Add the new list items and their event handlers for ( j=iStart ; j<=iEnd ; j++ ) { sClass = (j==oPaging.iPage+1) ? 'class="active"' : ''; - $('
  • '+j+'
    • ') + $('
  • '+j+'
    • ') .insertBefore( $('li:last', an[i])[0] ) .bind('click', function (e) { e.preventDefault(); diff --git a/data/interfaces/default/logs.html b/data/interfaces/default/logs.html index 30a4535f..53f48969 100644 --- a/data/interfaces/default/logs.html +++ b/data/interfaces/default/logs.html @@ -19,10 +19,10 @@ from plexpy import helpers
    -
    +

    Logs

    -
    +
    diff --git a/data/interfaces/default/plexwatch_import.html b/data/interfaces/default/plexwatch_import.html index 260de928..fad8c971 100644 --- a/data/interfaces/default/plexwatch_import.html +++ b/data/interfaces/default/plexwatch_import.html @@ -26,7 +26,7 @@
    - +
    diff --git a/data/interfaces/default/sync.html b/data/interfaces/default/sync.html index f2b06fde..2d5efce2 100644 --- a/data/interfaces/default/sync.html +++ b/data/interfaces/default/sync.html @@ -20,10 +20,10 @@ from plexpy import helpers
    -
    +

    Synced Items

    -
    +
    @@ -68,7 +68,7 @@ from plexpy import helpers sync_table = $('#sync_table').DataTable(sync_table_options); var colvis = new $.fn.dataTable.ColVis( sync_table ); - $( colvis.button() ).appendTo('div.button-bar'); + $( colvis.button() ).appendTo('div.colvis-button-bar'); }); diff --git a/data/interfaces/default/user.html b/data/interfaces/default/user.html index 46561417..9f668273 100644 --- a/data/interfaces/default/user.html +++ b/data/interfaces/default/user.html @@ -175,12 +175,12 @@ from plexpy import helpers
    -
    +

    Watch History for ${data['friendly_name']}

    -
    +
    @@ -191,12 +191,12 @@ from plexpy import helpers User Platform IP Address - Title + Title Started Paused - Stopped + Stopped Duration - + @@ -215,12 +215,12 @@ from plexpy import helpers
    -
    +

    Synced Items for ${data['friendly_name']}

    -
    +
    diff --git a/data/interfaces/default/users.html b/data/interfaces/default/users.html index 497c147a..eaecf7c5 100644 --- a/data/interfaces/default/users.html +++ b/data/interfaces/default/users.html @@ -13,10 +13,10 @@ from plexpy import helpers
    -
    +

    Active Users

    -
    +