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

Merge pull request #46 from dkanada/removetwo

Browse source 
minor changes to navbar elements
This commit is contained in:
Andrew Rabert 2019-01-20 20:37:18 -05:00 • committed by GitHub
commit b4d9b37cbd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 37 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/mypreferencesmenu.html
View file

@ -3,6 +3,15 @@
<div class="padded-left padded-right padded-bottom-page padded-top"> <div class="padded-left padded-right padded-bottom-page padded-top">
<div class="readOnlyContent" style="margin: 0 auto;"> <div class="readOnlyContent" style="margin: 0 auto;">
<div class="verticalSection verticalSection-extrabottompadding"> <div class="verticalSection verticalSection-extrabottompadding">
<a is="emby-linkbutton" style="display:block; padding: 0; margin:0;" data-ripple="false" href="#" class="lnkMyProfile listItem-border">
<div class="listItem">
<i class="md-icon listItemIcon listItemIcon-transparent">person</i>
<div class="listItemBody">
<div class="listItemBodyText">${ButtonProfile}</div>
</div>
</div>
</a>
<a is="emby-linkbutton" style="display:block; padding: 0; margin:0;" data-ripple="false" href="#" class="lnkDisplayPreferences listItem-border"> <a is="emby-linkbutton" style="display:block; padding: 0; margin:0;" data-ripple="false" href="#" class="lnkDisplayPreferences listItem-border">
<div class="listItem"> <div class="listItem">
<i class="md-icon listItemIcon listItemIcon-transparent">tv</i> <i class="md-icon listItemIcon listItemIcon-transparent">tv</i>
@ -38,15 +47,6 @@
</div> </div>
</div> </div>
</a> </a>
<a is="emby-linkbutton" style="display:block; padding: 0; margin:0;" data-ripple="false" href="#" class="lnkMyProfile listItem-border">
<div class="listItem">
<i class="md-icon listItemIcon listItemIcon-transparent">person</i>
<div class="listItemBody">
<div class="listItemBodyText">${ButtonProfile}</div>
</div>
</div>
</a>
</div> </div>
<div class="verticalSection verticalSection-extrabottompadding"> <div class="verticalSection verticalSection-extrabottompadding">
<h2 class="sectionTitle headerUser" style="padding-left:.25em;"></h2> <h2 class="sectionTitle headerUser" style="padding-left:.25em;"></h2>
@ -61,7 +61,7 @@
</a> </a>
<a is="emby-linkbutton" style="display:block; padding: 0; margin:0;" data-ripple="false" href="#" class="btnLogout hide listItem-border"> <a is="emby-linkbutton" style="display:block; padding: 0; margin:0;" data-ripple="false" href="#" class="btnLogout hide listItem-border">
<div class="listItem"> <div class="listItem">
<i class="md-icon listItemIcon listItemIcon-transparent">lock</i> <i class="md-icon listItemIcon listItemIcon-transparent">exit_to_app</i>
<div class="listItemBody"> <div class="listItemBody">
<div class="listItemBodyText">${ButtonSignOut}</div> <div class="listItemBodyText">${ButtonSignOut}</div>
</div> </div>
@ -75,9 +75,9 @@
<div> <div>
<a is="emby-linkbutton" href="dashboard.html" style="display: block; padding: 0; margin:0;" class="listItem-border"> <a is="emby-linkbutton" href="dashboard.html" style="display: block; padding: 0; margin:0;" class="listItem-border">
<div class="listItem"> <div class="listItem">
<i class="md-icon listItemIcon listItemIcon-transparent">settings</i> <i class="md-icon listItemIcon listItemIcon-transparent">dashboard</i>
<div class="listItemBody"> <div class="listItemBody">
<div class="listItemBodyText">${ButtonServerDashboard}</div> <div class="listItemBodyText">${TabDashboard}</div>
</div> </div>
</div> </div>
</a> </a>

56
src/scripts/librarymenu.js
View file

@ -177,49 +177,41 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
function refreshLibraryInfoInDrawer(user, drawer) { function refreshLibraryInfoInDrawer(user, drawer) {
var html = ""; var html = "";
html += '<div style="height:.5em;"></div>'; html += '<div style="height:.5em;"></div>';
html += '<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder" href="home.html"><i class="md-icon navMenuOptionIcon">&#xE88A;</i><span class="navMenuOptionText">' + globalize.translate("ButtonHome") + "</span></a>"; html += '<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder" href="home.html"><i class="md-icon navMenuOptionIcon">home</i><span class="navMenuOptionText">' + globalize.translate("ButtonHome") + "</span></a>";
html += '<div class="libraryMenuDownloads">';
html += '<h3 class="sidebarHeader">'; // libraries are added here
html += globalize.translate("sharedcomponents#HeaderMyDownloads");
html += "</h3>";
html += '<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder" data-itemid="manageoffline" href="offline/offline.html"><i class="md-icon navMenuOptionIcon">&#xE2C7;</i><span class="navMenuOptionText">' + globalize.translate("sharedcomponents#Browse") + "</span></a>";
html += '<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder" data-itemid="manageoffline" href="managedownloads.html"><i class="md-icon navMenuOptionIcon">&#xE254;</i><span class="navMenuOptionText">' + globalize.translate("sharedcomponents#Manage") + "</span></a>";
html += "</div>";
html += '<div class="libraryMenuOptions">'; html += '<div class="libraryMenuOptions">';
html += "</div>"; html += "</div>";
var localUser = user.localUser;
if (localUser && localUser.Policy.IsAdministrator) { if (user.localUser && user.localUser.Policy.IsAdministrator) {
html += '<div class="adminMenuOptions">'; html += '<div class="adminMenuOptions">';
html += '<h3 class="sidebarHeader">'; html += '<h3 class="sidebarHeader">';
html += globalize.translate("HeaderAdmin"); html += globalize.translate("HeaderAdmin");
html += "</h3>"; html += "</h3>";
html += '<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder lnkManageServer" data-itemid="dashboard" href="dashboard.html"><i class="md-icon navMenuOptionIcon">&#xE8B8;</i><span class="navMenuOptionText">' + globalize.translate("ButtonManageServer") + "</span></a>"; html += '<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder lnkManageServer" data-itemid="dashboard" href="dashboard.html"><i class="md-icon navMenuOptionIcon">dashboard</i><span class="navMenuOptionText">' + globalize.translate("TabDashboard") + "</span></a>";
html += '<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder editorViewMenu" data-itemid="editor" href="edititemmetadata.html"><i class="md-icon navMenuOptionIcon">&#xE2C7;</i><span class="navMenuOptionText">' + globalize.translate("MetadataManager") + "</span></a>";
html += "</div>"; html += "</div>";
} }
html += '<div class="userMenuOptions">'; html += '<div class="userMenuOptions">';
html += '<h3 class="sidebarHeader">';
html += globalize.translate("HeaderUser");
html += "</h3>";
if (user.localUser) { if (user.localUser) {
html += '<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder lnkMySettings" href="mypreferencesmenu.html"><i class="md-icon navMenuOptionIcon">&#xE8B8;</i><span class="navMenuOptionText">' + globalize.translate("ButtonSettings") + "</span></a>"; html += '<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder lnkMySettings" href="mypreferencesmenu.html"><i class="md-icon navMenuOptionIcon">settings</i><span class="navMenuOptionText">' + globalize.translate("ButtonSettings") + "</span></a>";
} }
html += '<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder lnkSyncToOtherDevices" data-itemid="syncotherdevices" href="mysync.html"><i class="md-icon navMenuOptionIcon">&#xE627;</i><span class="navMenuOptionText">' + globalize.translate("sharedcomponents#Sync") + "</span></a>";
if (AppInfo.isNativeApp) { if (AppInfo.isNativeApp) {
html += '<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder" data-itemid="selectserver" href="selectserver.html?showuser=1"><i class="md-icon navMenuOptionIcon">&#xE308;</i><span class="navMenuOptionText">' + globalize.translate("ButtonSelectServer") + "</span></a>"; html += '<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder" data-itemid="selectserver" href="selectserver.html?showuser=1"><i class="md-icon navMenuOptionIcon">wifi</i><span class="navMenuOptionText">' + globalize.translate("ButtonSelectServer") + "</span></a>";
} }
if (user.localUser && !user.localUser.EnableAutoLogin) {
if (!(!user.localUser || user.localUser.EnableAutoLogin)) { html += '<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder btnLogout" data-itemid="logout" href="#"><i class="md-icon navMenuOptionIcon">exit_to_app</i><span class="navMenuOptionText">' + globalize.translate("ButtonSignOut") + "</span></a>";
html += '<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder btnLogout" data-itemid="logout" href="#"><i class="md-icon navMenuOptionIcon">&#xE879;</i><span class="navMenuOptionText">' + globalize.translate("ButtonSignOut") + "</span></a>";
} }
html += "</div>"; html += "</div>";
// add buttons to navigation drawer
navDrawerScrollContainer.innerHTML = html; navDrawerScrollContainer.innerHTML = html;
// bind logout button click to method
var btnLogout = navDrawerScrollContainer.querySelector(".btnLogout"); var btnLogout = navDrawerScrollContainer.querySelector(".btnLogout");
if (btnLogout) { if (btnLogout) {
btnLogout.addEventListener("click", onLogoutClick); btnLogout.addEventListener("click", onLogoutClick);
} }
@ -298,13 +290,13 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
color: "#38c" color: "#38c"
}, { }, {
name: globalize.translate("TabPlayback"), name: globalize.translate("TabPlayback"),
icon: "play_circle_filled", icon: "play_arrow",
color: "#E5342E", color: "#E5342E",
href: "playbackconfiguration.html", href: "playbackconfiguration.html",
pageIds: ["playbackConfigurationPage", "streamingSettingsPage"] pageIds: ["playbackConfigurationPage", "streamingSettingsPage"]
}, { }, {
name: globalize.translate("TabTranscoding"), name: globalize.translate("TabTranscoding"),
icon: "transform", icon: "swap_horiz",
href: "encodingsettings.html", href: "encodingsettings.html",
pageIds: ["encodingSettingsPage"] pageIds: ["encodingSettingsPage"]
}]; }];
@ -317,7 +309,7 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
name: globalize.translate("TabDevices"), name: globalize.translate("TabDevices"),
href: "devices/devices.html", href: "devices/devices.html",
pageIds: ["devicesPage", "devicePage"], pageIds: ["devicesPage", "devicePage"],
icon: "tablet" icon: "devices"
}); });
links.push({ links.push({
name: globalize.translate("TabCameraUpload"), name: globalize.translate("TabCameraUpload"),
@ -329,7 +321,7 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
name: globalize.translate("DLNA"), name: globalize.translate("DLNA"),
href: "dlnasettings.html", href: "dlnasettings.html",
pageIds: ["dlnaSettingsPage", "dlnaProfilesPage", "dlnaProfilePage"], pageIds: ["dlnaSettingsPage", "dlnaProfilesPage", "dlnaProfilePage"],
icon: "&#xE912;" icon: "input"
}); });
links.push({ links.push({
divider: true, divider: true,
@ -339,13 +331,13 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
name: globalize.translate("TabLiveTV"), name: globalize.translate("TabLiveTV"),
href: "livetvstatus.html", href: "livetvstatus.html",
pageIds: ["liveTvStatusPage", "liveTvTunerPage"], pageIds: ["liveTvStatusPage", "liveTvTunerPage"],
icon: "&#xE639;" icon: "tv"
}); });
links.push({ links.push({
name: globalize.translate("DVR"), name: globalize.translate("DVR"),
href: "livetvsettings.html", href: "livetvsettings.html",
pageIds: ["liveTvSettingsPage"], pageIds: ["liveTvSettingsPage"],
icon: "dvr" icon: "list"
}); });
links.push({ links.push({
divider: true, divider: true,
@ -353,7 +345,7 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
}); });
links.push({ links.push({
name: globalize.translate("TabAdvanced"), name: globalize.translate("TabAdvanced"),
icon: "settings", icon: "code",
href: "dashboardhosting.html", href: "dashboardhosting.html",
color: "#F16834", color: "#F16834",
pageIds: ["dashboardHostingPage", "serverSecurityPage"] pageIds: ["dashboardHostingPage", "serverSecurityPage"]
@ -362,7 +354,7 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
name: globalize.translate("TabLogs"), name: globalize.translate("TabLogs"),
href: "log.html", href: "log.html",
pageIds: ["logPage"], pageIds: ["logPage"],
icon: "folder_open" icon: "bug_report"
}); });
links.push({ links.push({
name: globalize.translate("TabNotifications"), name: globalize.translate("TabNotifications"),
@ -373,7 +365,7 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
}); });
links.push({ links.push({
name: globalize.translate("TabPlugins"), name: globalize.translate("TabPlugins"),
icon: "add_shopping_cart", icon: "shopping_cart",
color: "#9D22B1", color: "#9D22B1",
href: "plugins.html", href: "plugins.html",
pageIds: ["pluginsPage", "pluginCatalogPage"] pageIds: ["pluginsPage", "pluginCatalogPage"]

2
src/strings/en-US.json
View file

@ -138,7 +138,7 @@
"ButtonShuffle": "Shuffle", "ButtonShuffle": "Shuffle",
"ButtonShutdown": "Shutdown", "ButtonShutdown": "Shutdown",
"ButtonSignIn": "Sign In", "ButtonSignIn": "Sign In",
"ButtonSignOut": "Sign out", "ButtonSignOut": "Sign Out",
"ButtonSignUp": "Sign up", "ButtonSignUp": "Sign up",
"ButtonSkip": "Skip", "ButtonSkip": "Skip",
"ButtonSort": "Sort", "ButtonSort": "Sort",