Fix header padding.

Use user_id on sync table.
Fix nav tabs direct linking.
This commit is contained in:
Tim 2015-08-03 00:07:14 +02:00
parent 6a97537249
commit 17d2c615cf
4 changed files with 10 additions and 16 deletions

View file

@ -15,22 +15,9 @@ from plexpy import version
<link href="interfaces/default/css/plexpy.css" rel="stylesheet"> <link href="interfaces/default/css/plexpy.css" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet" type="text/css"> <link href="https://fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet" type="text/css">
<link href="interfaces/default/css/font-awesome.min.css" rel="stylesheet"> <link href="interfaces/default/css/font-awesome.min.css" rel="stylesheet">
<style type="text/css">
body {
padding-top: 60px;
padding-bottom: 40px;
}
.sidebar-nav {
padding: 9px 0;
}
.spinner {
padding-bottom: 25px;
position: relative;
}
</style>
${next.headIncludes()} ${next.headIncludes()}
<link rel="icon" type="image/x-icon" href="interfaces/default/images/favicon.ico"/>
<link rel="icon" type="image/x-icon" href="interfaces/default/images/favicon.ico"/>
<!-- touch icons --> <!-- touch icons -->
<link rel="shortcut icon" href="interfaces/default/images/favicon.png"> <link rel="shortcut icon" href="interfaces/default/images/favicon.png">
<link rel="apple-touch-icon" href="interfaces/default/images/icon_iphone.png"> <link rel="apple-touch-icon" href="interfaces/default/images/icon_iphone.png">

View file

@ -1,6 +1,7 @@
body { body {
font-family: 'Open Sans', sans-serif; font-family: 'Open Sans', sans-serif;
color: #fff; color: #fff;
padding-top: 50px;
} }
a { a {
color: #eee; color: #eee;

View file

@ -33,7 +33,13 @@ sync_table_options = {
"data": "friendly_name", "data": "friendly_name",
"createdCell": function (td, cellData, rowData, row, col) { "createdCell": function (td, cellData, rowData, row, col) {
if (cellData !== '') { if (cellData !== '') {
$(td).html('<a href="user?user=' + rowData['username'] + '">' + cellData + '</a>'); if (rowData['user_id']) {
$(td).html('<a href="user?user_id=' + rowData['user_id'] + '">' + cellData + '</a>');
} else {
$(td).html('<a href="user?user=' + rowData['user'] + '">' + cellData + '</a>');
}
} else {
$(td).html(cellData);
} }
}, },
"className": "no-wrap" "className": "no-wrap"

View file

@ -804,7 +804,7 @@ $(document).ready(function() {
} }
// Change hash for page-reload // Change hash for page-reload
$('.nav-settings a').on('shown', function (e) { $('.nav-settings a').on('shown.bs.tab', function (e) {
window.location.hash = e.target.hash.replace("#", "#" + prefix); window.location.hash = e.target.hash.replace("#", "#" + prefix);
}); });