mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

update library menu

Browse source
This commit is contained in:
Luke Pulverenti 2015-04-27 13:55:57 -04:00
parent e6615a1803
commit 4ae4c4e71a
5 changed files with 49 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

20
dashboard-ui/css/librarymenu.css
View file

@ -8,7 +8,7 @@
.libraryMenuDivider {
height: 1px;
background: #333;
background: #282828;
margin: .5em 0;
}
@ -179,8 +179,16 @@
vertical-align: top;
}
.librarySidebarLinks {
margin-left: -1em;
margin-right: -1em;
margin-top: -1em;
padding-top: 0;
}
.librarySidebarLinks a {
font-weight: 300 !important;
padding: .7em 20px .7em 0;
}
.librarySidebarLinks a:hover {
@ -188,14 +196,6 @@
color: #fff !important;
}
.homeViewMenu {
background-image: url(images/mblogoicon.png) !important;
background-size: 39px 26px !important;
background-position: 13px center !important;
padding-left: 66px !important;
background-repeat: no-repeat !important;
}
.viewMenuSecondary {
position: absolute;
top: 0;
@ -213,7 +213,7 @@
}
.ui-panel.ui-body-b {
background-color: #222;
background-color: #161616;
}
.libraryViewNav .ui-btn-active {

1
dashboard-ui/css/site.css
View file

@ -382,6 +382,7 @@ h1 .imageLink {
font-size: 17px;
width: 66px;
text-align: center;
vertical-align: middle;
}
.ui-page-theme-a .sidebarLinkIcon {

29
dashboard-ui/scripts/librarymenu.js
View file

@ -121,7 +121,9 @@
var page = $.mobile.activePage;
var panel;
panel = getLibraryMenu();
ConnectionManager.user().done(function (user) {
panel = getLibraryMenu(user);
updateLibraryNavLinks(page);
$(panel).panel('toggle').off('mouseleave.librarymenu').on('mouseleave.librarymenu', function () {
@ -129,6 +131,7 @@
$(this).panel("close");
});
});
}
function showDashboardMenu() {
@ -248,13 +251,29 @@
html += '<div data-role="panel" id="libraryPanel" class="libraryPanel" data-position="left" data-display="overlay" data-position-fixed="true" data-theme="b">';
html += '<div class="sidebarLinks librarySidebarLinks" style="margin-top: 0;margin-left: -1em;margin-right: -1em;">';
html += '<div class="sidebarLinks librarySidebarLinks">';
html += '<a style="margin-top:0;padding-left:1em;display:block;color:#fff;text-decoration:none;font-size:16px;font-weight:400!important;background: #000;" href="mypreferencesdisplay.html?userId=' + Dashboard.getCurrentUserId() + '">';
var imgWidth = 48;
if (user.imageUrl) {
var url = user.imageUrl;
if (user.supportsImageParams) {
url += "&width=" + imgWidth;
}
html += '<img style="max-width:' + imgWidth + 'px;vertical-align:middle;margin-right:.75em;border-radius: 50px;" src="' + url + '" />';
}
html += user.name;
html += '</a>';
html += '<div class="libraryMenuDivider" style="margin-top:0;"></div>';
var homeHref = ConnectionManager.currentApiClient() ? 'index.html' : 'selectserver.html';
html += '<a class="lnkMediaFolder sidebarLink homeViewMenu" href="' + homeHref + '">' + Globalize.translate('ButtonHome') + '</a>';
html += '<div class="libraryMenuDivider"></div>';
html += '<a class="lnkMediaFolder sidebarLink homeViewMenu" href="' + homeHref + '"><span class="fa fa-home sidebarLinkIcon"></span>' + Globalize.translate('ButtonHome') + '</a>';
html += getViewsHtml();
html += '</div>';

6
dashboard-ui/scripts/site.js
View file

@ -577,14 +577,16 @@ var Dashboard = {
html += '<h3>';
var imgWidth = 48;
if (user.imageUrl) {
var url = user.imageUrl;
if (user.supportsImageParams) {
url += "&width=" + 28;
url += "&width=" + imgWidth;
}
html += '<img style="max-width:28px;vertical-align:middle;margin-right:5px;" src="' + url + '" />';
html += '<img style="max-width:' + imgWidth + 'px;vertical-align:middle;margin-right:.5em;border-radius: 50px;" src="' + url + '" />';
}
html += user.name;
html += '</h3>';

4
dashboard-ui/thirdparty/apiclient/apiclient.js vendored
View file

@ -2354,9 +2354,7 @@
throw new Error("null userId");
}
options = options || {
};
options = options || {};
var url = "Users/" + userId + "/Images/" + options.type;