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 menus

Browse source
This commit is contained in:
Luke Pulverenti 2015-06-22 11:43:19 -04:00
parent aa7ea8891c
commit 02b433a97f
41 changed files with 241 additions and 5948 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dashboard-ui/scripts/dashboardpage.js
View file

@ -775,7 +775,7 @@
html += "<span style='color:#009F00;margin-left:5px;margin-right:5px;'>" + progress + "%</span>";
html += '<button type="button" data-icon="stop" data-iconpos="notext" data-inline="true" data-mini="true" onclick="DashboardPage.stopTask(\'' + task.Id + '\');">' + Globalize.translate('ButtonStop') + '</button>';
html += '<button type="button" data-icon="delete" data-iconpos="notext" data-inline="true" data-mini="true" onclick="DashboardPage.stopTask(\'' + task.Id + '\');">' + Globalize.translate('ButtonStop') + '</button>';
}
else if (task.State == "Cancelling") {
html += '<span style="color:#cc0000;">' + Globalize.translate('LabelStopping') + '</span>';

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

@ -40,7 +40,7 @@
}
if (!$.browser.mobile && !AppInfo.isNativeApp) {
html += '<a href="dashboard.html" class="headerButton headerButtonRight dashboardEntryHeaderButton hide"><i class="material-icons">settings</i></a>';
html += '<a href="dashboard.html" class="headerButton headerButtonRight dashboardEntryHeaderButton hide" onclick="LibraryMenu.onLinkClicked(this);return false;"><i class="material-icons">settings</i></a>';
//html += '<a href="dashboard.html" class="headerButton headerButtonRight dashboardEntryHeaderButton clearLink" style="display:none;"><paper-icon-button icon="settings"></paper-icon-button></a>';
}
@ -124,7 +124,7 @@
if (AppInfo.isTouchPreferred) {
if ('ontouchend' in document) {
$('.mainDrawerButton').on('touchend', openMainDrawer);
$('.mainDrawerButton').on('touchend click', openMainDrawer);
} else {
$('.mainDrawerButton').on('click', openMainDrawer);
}
@ -277,18 +277,18 @@
html += '</div>';
html += '</div>';
html += '<a class="sidebarLink lnkMediaFolder" data-itemid="remote" href="index.html"><iron-icon icon="home" class="sidebarLinkIcon" style="color:#2196F3;"></iron-icon><span class="sidebarLinkText">' + Globalize.translate('ButtonHome') + '</span></a>';
html += '<a class="sidebarLink lnkMediaFolder" data-itemid="remote" href="index.html" onclick="LibraryMenu.onLinkClicked(this);return false;"><iron-icon icon="home" class="sidebarLinkIcon" style="color:#2196F3;"></iron-icon><span class="sidebarLinkText">' + Globalize.translate('ButtonHome') + '</span></a>';
} else {
html += '<div style="margin-top:5px;"></div>';
html += '<a class="lnkMediaFolder sidebarLink" href="' + homeHref + '">';
html += '<a class="lnkMediaFolder sidebarLink" href="' + homeHref + '" onclick="LibraryMenu.onLinkClicked(this);return false;">';
html += '<div class="lazy" data-src="css/images/mblogoicon.png" style="width:' + 28 + 'px;height:' + 28 + 'px;background-size:contain;background-repeat:no-repeat;background-position:center center;border-radius:1000px;vertical-align:middle;margin:0 1.6em 0 1.5em;display:inline-block;"></div>';
html += Globalize.translate('ButtonHome');
html += '</a>';
}
html += '<a class="sidebarLink lnkMediaFolder" data-itemid="remote" href="nowplaying.html"><iron-icon icon="tablet-android" class="sidebarLinkIcon" style="color:#673AB7;"></iron-icon><span class="sidebarLinkText">' + Globalize.translate('ButtonRemote') + '</span></a>';
html += '<a class="sidebarLink lnkMediaFolder" data-itemid="remote" href="nowplaying.html" onclick="LibraryMenu.onLinkClicked(this);return false;"><iron-icon icon="tablet-android" class="sidebarLinkIcon" style="color:#673AB7;"></iron-icon><span class="sidebarLinkText">' + Globalize.translate('ButtonRemote') + '</span></a>';
$('.userheader', drawer).html(html).lazyChildren();
}
@ -328,33 +328,33 @@
html += '</div>';
html += '<a class="sidebarLink lnkMediaFolder lnkManageServer" data-itemid="dashboard" href="#"><iron-icon icon="dashboard" class="sidebarLinkIcon"></iron-icon><span class="sidebarLinkText">' + Globalize.translate('ButtonManageServer') + '</span></a>';
html += '<a class="sidebarLink lnkMediaFolder editorViewMenu" data-itemid="editor" href="edititemmetadata.html"><iron-icon icon="mode-edit" class="sidebarLinkIcon"></iron-icon><span class="sidebarLinkText">' + Globalize.translate('ButtonMetadataManager') + '</span></a>';
html += '<a class="sidebarLink lnkMediaFolder editorViewMenu" data-itemid="editor" onclick="LibraryMenu.onLinkClicked(this);return false;" href="edititemmetadata.html"><iron-icon icon="mode-edit" class="sidebarLinkIcon"></iron-icon><span class="sidebarLinkText">' + Globalize.translate('ButtonMetadataManager') + '</span></a>';
if (!$.browser.mobile && !AppInfo.isTouchPreferred) {
html += '<a class="sidebarLink lnkMediaFolder" data-itemid="reports" href="reports.html"><iron-icon icon="insert-chart" class="sidebarLinkIcon"></iron-icon><span class="sidebarLinkText">' + Globalize.translate('ButtonReports') + '</span></a>';
html += '<a class="sidebarLink lnkMediaFolder" data-itemid="reports" onclick="LibraryMenu.onLinkClicked(this);return false;" href="reports.html"><iron-icon icon="insert-chart" class="sidebarLinkIcon"></iron-icon><span class="sidebarLinkText">' + Globalize.translate('ButtonReports') + '</span></a>';
}
html += '</div>';
html += '<div class="userMenuOptions">';
html += '<div class="sidebarDivider"></div>';
html += '<a class="sidebarLink lnkMediaFolder" data-itemid="inbox" href="notificationlist.html"><iron-icon icon="inbox" class="sidebarLinkIcon"></iron-icon>';
html += '<a class="sidebarLink lnkMediaFolder" data-itemid="inbox" onclick="LibraryMenu.onLinkClicked(this);return false;" href="notificationlist.html"><iron-icon icon="inbox" class="sidebarLinkIcon"></iron-icon>';
html += Globalize.translate('ButtonInbox');
html += '<div class="btnNotifications"><div class="btnNotificationsInner">0</div></div>';
html += '</a>';
if (user.localUser) {
html += '<a class="sidebarLink lnkMediaFolder lnkMySettings" data-itemid="mysync" href="mypreferencesdisplay.html?userId=' + user.localUser.Id + '"><iron-icon icon="settings" class="sidebarLinkIcon"></iron-icon><span class="sidebarLinkText">' + Globalize.translate('ButtonSettings') + '</span></a>';
html += '<a class="sidebarLink lnkMediaFolder lnkMySettings" onclick="LibraryMenu.onLinkClicked(this);return false;" data-itemid="mysync" href="mypreferencesdisplay.html?userId=' + user.localUser.Id + '"><iron-icon icon="settings" class="sidebarLinkIcon"></iron-icon><span class="sidebarLinkText">' + Globalize.translate('ButtonSettings') + '</span></a>';
}
html += '<a class="sidebarLink lnkMediaFolder lnkMySync" data-itemid="mysync" href="mysync.html"><iron-icon icon="refresh" class="sidebarLinkIcon"></iron-icon><span class="sidebarLinkText">' + Globalize.translate('ButtonSync') + '</span></a>';
html += '<a class="sidebarLink lnkMediaFolder lnkMySync" data-itemid="mysync" onclick="LibraryMenu.onLinkClicked(this);return false;" href="mysync.html"><iron-icon icon="refresh" class="sidebarLinkIcon"></iron-icon><span class="sidebarLinkText">' + Globalize.translate('ButtonSync') + '</span></a>';
if (Dashboard.isConnectMode()) {
html += '<a class="sidebarLink lnkMediaFolder" data-itemid="selectserver" href="selectserver.html"><span class="fa fa-globe sidebarLinkIcon"></span><span class="sidebarLinkText">' + Globalize.translate('ButtonSelectServer') + '</span></a>';
html += '<a class="sidebarLink lnkMediaFolder" data-itemid="selectserver" onclick="LibraryMenu.onLinkClicked(this);return false;" href="selectserver.html"><span class="fa fa-globe sidebarLinkIcon"></span><span class="sidebarLinkText">' + Globalize.translate('ButtonSelectServer') + '</span></a>';
}
if (showUserAtTop()) {
html += '<a class="sidebarLink lnkMediaFolder" data-itemid="logout" href="#" onclick="Dashboard.logout();"><iron-icon icon="lock" class="sidebarLinkIcon"></iron-icon><span class="sidebarLinkText">' + Globalize.translate('ButtonSignOut') + '</span></a>';
html += '<a class="sidebarLink lnkMediaFolder" data-itemid="logout" onclick="LibraryMenu.onLinkClicked(this);return false;" href="#" onclick="Dashboard.logout();"><iron-icon icon="lock" class="sidebarLinkIcon"></iron-icon><span class="sidebarLinkText">' + Globalize.translate('ButtonSignOut') + '</span></a>';
}
html += '</div>';
@ -440,7 +440,7 @@
color = "#293AAE";
}
return '<a data-itemid="' + itemId + '" class="lnkMediaFolder sidebarLink" href="' + getItemHref(i, i.CollectionType) + '"><iron-icon icon="' + icon + '" class="sidebarLinkIcon" style="color:' + color + '"></iron-icon><span class="sectionName">' + i.Name + '</span></a>';
return '<a data-itemid="' + itemId + '" class="lnkMediaFolder sidebarLink" onclick="LibraryMenu.onLinkClicked(this);return false;" href="' + getItemHref(i, i.CollectionType) + '"><iron-icon icon="' + icon + '" class="sidebarLinkIcon" style="color:' + color + '"></iron-icon><span class="sectionName">' + i.Name + '</span></a>';
}).join('');
@ -479,6 +479,8 @@
function onManageServerClicked() {
closeMainDrawer();
requirejs(["scripts/registrationservices"], function () {
RegistrationServices.validateFeature('manageserver').done(function () {
@ -502,7 +504,16 @@
window.LibraryMenu = {
getTopParentId: getTopParentId,
setText: setLibraryMenuText
setText: setLibraryMenuText,
onLinkClicked: function (link) {
closeMainDrawer();
setTimeout(function () {
Dashboard.navigate(link.href);
}, 1000);
}
};
function updateCastIcon() {

20
dashboard-ui/scripts/scheduledtaskspage.js
View file

@ -29,7 +29,7 @@
var html = "";
html += '<ul data-role="listview" data-inset="true" data-auto-enhanced="false" data-split-icon="Play">';
html += '<ul data-role="listview" data-inset="true" data-auto-enhanced="false" data-split-icon="action">';
var currentCategory;
@ -53,15 +53,15 @@
if (task.State == "Idle") {
html += "<a id='btnTask" + task.Id + "' class='btnStartTask' href='#' data-taskid='" + task.Id + "' data-icon='play'>" + Globalize.translate('ButtonStart') + "</a>";
html += "<a id='btnTask" + task.Id + "' class='btnStartTask' href='#' data-taskid='" + task.Id + "' data-icon='action'>" + Globalize.translate('ButtonStart') + "</a>";
}
else if (task.State == "Running") {
html += "<a id='btnTask" + task.Id + "' class='btnStopTask' href='#' data-taskid='" + task.Id + "' data-icon='stop'>" + Globalize.translate('ButtonStop') + "</a>";
html += "<a id='btnTask" + task.Id + "' class='btnStopTask' href='#' data-taskid='" + task.Id + "' data-icon='delete'>" + Globalize.translate('ButtonStop') + "</a>";
} else {
html += "<a id='btnTask" + task.Id + "' class='btnStartTask' href='#' data-taskid='" + task.Id + "' data-icon='play' style='display:none;'>" + Globalize.translate('ButtonStart') + "</a>";
html += "<a id='btnTask" + task.Id + "' class='btnStartTask' href='#' data-taskid='" + task.Id + "' data-icon='action' style='display:none;'>" + Globalize.translate('ButtonStart') + "</a>";
}
html += "</a>";
@ -143,21 +143,21 @@
if (state == "Idle") {
elem = btnTask.addClass('btnStartTask').removeClass('btnStopTask').show().data("icon", "play").attr("title", Globalize.translate('ButtonStart'));
elem = btnTask.addClass('btnStartTask').removeClass('btnStopTask').show().data("icon", "action").attr("title", Globalize.translate('ButtonStart'));
elem.removeClass('ui-icon-stop').addClass('ui-icon-play');
elem.removeClass('ui-icon-delete').addClass('ui-icon-action');
}
else if (state == "Running") {
elem = btnTask.addClass('btnStopTask').removeClass('btnStartTask').show().data("icon", "stop").attr("title", Globalize.translate('ButtonStop'));
elem = btnTask.addClass('btnStopTask').removeClass('btnStartTask').show().data("icon", "delete").attr("title", Globalize.translate('ButtonStop'));
elem.removeClass('ui-icon-play').addClass('ui-icon-stop');
elem.removeClass('ui-icon-action').addClass('ui-icon-delete');
} else {
elem = btnTask.addClass('btnStartTask').removeClass('btnStopTask').hide().data("icon", "play").attr("title", Globalize.translate('ButtonStart'));
elem = btnTask.addClass('btnStartTask').removeClass('btnStopTask').hide().data("icon", "action").attr("title", Globalize.translate('ButtonStart'));
elem.removeClass('ui-icon-stop').addClass('ui-icon-play');
elem.removeClass('ui-icon-stdeleteop').addClass('ui-icon-action');
}
}

46
dashboard-ui/scripts/selectserver.js
View file

@ -218,33 +218,35 @@
var card = $(elem).parents('.card');
var page = $(elem).parents('.page');
var id = card.attr('data-id');
var serverId = card.attr('data-id');
var connectserverid = card.attr('data-connectserverid');
$('.serverMenu', page).popup("close").remove();
var html = '<div data-role="popup" class="serverMenu" data-theme="a">';
html += '<ul data-role="listview" style="min-width: 180px;">';
html += '<li data-role="list-divider">' + Globalize.translate('HeaderMenu') + '</li>';
html += '<li><a href="#" class="btnDelete" data-connectserverid="' + connectserverid + '">' + Globalize.translate('ButtonDelete') + '</a></li>';
html += '</ul>';
html += '</div>';
page.append(html);
var flyout = $('.serverMenu', page).popup({ positionTo: elem || "window" }).trigger('create').popup("open").on("popupafterclose", function () {
$(this).off("popupafterclose").remove();
var menuItems = [];
menuItems.push({
name: Globalize.translate('ButtonDelete'),
id: 'delete',
ironIcon: 'delete'
});
$('.btnDelete', flyout).on('click', function () {
deleteServer(page, this.getAttribute('data-connectserverid'));
$('.serverMenu', page).popup("close").remove();
require(['actionsheet'], function () {
ActionSheetElement.show({
items: menuItems,
positionTo: elem,
callback: function (id) {
switch (id) {
case 'delete':
deleteServer(page, connectserverid);
break;
default:
break;
}
}
});
});
}

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

@ -2034,6 +2034,10 @@ var AppInfo = {};
Dashboard.importCss('thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.icons.css');
return {};
});
define("livetvcss", [], function () {
Dashboard.importCss('css/livetv.css');
return {};
});
if (Dashboard.isRunningInCordova() && $.browser.safari) {
define("actionsheet", ["cordova/ios/actionsheet"]);
@ -2050,7 +2054,10 @@ var AppInfo = {};
var drawer = $('.mainDrawerPanel').removeClass('mainDrawerPanelPreInit')[0];
drawer.forceNarrow = true;
drawer.drawerWidth = screen.availWidth >= 330 ? "310px" : "270px";
drawer.transition = true;
if ($.browser.safari && !AppInfo.isNativeApp) {
drawer.disableEdgeSwipe = true;
}
if (Dashboard.isConnectMode()) {

79
dashboard-ui/scripts/syncactivity.js
View file

@ -2,30 +2,24 @@
function cancelJob(page, id) {
$('.jobMenu', page).on("popupafterclose.deleteuser", function () {
var msg = Globalize.translate('CancelSyncJobConfirmation');
$(this).off('popupafterclose.deleteuser');
Dashboard.confirm(msg, Globalize.translate('HeaderCancelSyncJob'), function (result) {
var msg = Globalize.translate('CancelSyncJobConfirmation');
if (result) {
Dashboard.showLoadingMsg();
Dashboard.confirm(msg, Globalize.translate('HeaderCancelSyncJob'), function (result) {
ApiClient.ajax({
if (result) {
Dashboard.showLoadingMsg();
url: ApiClient.getUrl('Sync/Jobs/' + id),
type: 'DELETE'
ApiClient.ajax({
}).done(function () {
url: ApiClient.getUrl('Sync/Jobs/' + id),
type: 'DELETE'
}).done(function () {
reloadData(page);
});
}
});
}).popup('close');
reloadData(page);
});
}
});
}
function getSyncJobHtml(page, job, cardBoxCssClass, syncJobPage) {
@ -202,37 +196,46 @@
function showJobMenu(elem) {
var card = $(elem).parents('.card');
var page = $(elem).parents('.page');
var id = card.attr('data-id');
var jobId = card.attr('data-id');
var status = card.attr('data-status');
$('.jobMenu', page).popup("close").remove();
var html = '<div data-role="popup" class="jobMenu tapHoldMenu" data-theme="a">';
html += '<ul data-role="listview" style="min-width: 180px;">';
html += '<li data-role="list-divider">' + Globalize.translate('HeaderMenu') + '</li>';
var menuItems = [];
if (status == 'Cancelled') {
html += '<li data-icon="delete"><a href="#" class="btnCancelJob" data-id="' + id + '">' + Globalize.translate('ButtonDelete') + '</a></li>';
menuItems.push({
name: Globalize.translate('ButtonDelete'),
id: 'delete',
ironIcon: 'delete'
});
} else {
html += '<li data-icon="delete"><a href="#" class="btnCancelJob" data-id="' + id + '">' + Globalize.translate('ButtonCancel') + '</a></li>';
menuItems.push({
name: Globalize.translate('ButtonCancelSyncJob'),
id: 'cancel',
ironIcon: 'delete'
});
}
html += '</ul>';
require(['actionsheet'], function () {
html += '</div>';
ActionSheetElement.show({
items: menuItems,
positionTo: elem,
callback: function (id) {
page.append(html);
switch (id) {
var flyout = $('.jobMenu', page).popup({ positionTo: elem || "window" }).trigger('create').popup("open").on("popupafterclose", function () {
case 'delete':
cancelJob(jobId);
break;
case 'cancel':
cancelJob(jobId);
break;
default:
break;
}
}
});
$(this).off("popupafterclose").remove();
});
$('.btnCancelJob', flyout).on('click', function () {
cancelJob(page, this.getAttribute('data-id'));
});
}

98
dashboard-ui/scripts/syncjob.js
View file

@ -2,6 +2,8 @@
function renderJob(page, job, dialogOptions) {
require(['paperbuttonstyle']);
var html = '';
html += '<div>';
@ -12,7 +14,9 @@
html += '<br/>';
html += '<br/>';
html += '<button type="submit" data-icon="check">' + Globalize.translate('ButtonSave') + '</button>';
html += '<button type="submit" data-role="none" class="clearButton">';
html += '<paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>' + Globalize.translate('ButtonSave') + '</span></paper-button>';
html += '</button>';
$('.syncJobForm', page).html(html).trigger('create');
SyncManager.renderForm({
@ -131,66 +135,80 @@
var page = $(elem).parents('.page');
var listItem = $(elem).parents('li');
var id = listItem.attr('data-itemid');
var jobItemId = listItem.attr('data-itemid');
var status = listItem.attr('data-status');
var remove = listItem.attr('data-remove').toLowerCase() == 'true';
$('.jobMenu', page).popup("close").remove();
var html = '<div data-role="popup" class="jobMenu tapHoldMenu" data-theme="a">';
html += '<ul data-role="listview" style="min-width: 180px;">';
html += '<li data-role="list-divider">' + Globalize.translate('HeaderMenu') + '</li>';
var menuItems = [];
if (status == 'Failed') {
html += '<li data-icon="check"><a href="#" class="btnRetryJobItem" data-id="' + id + '">' + Globalize.translate('ButtonQueueForRetry') + '</a></li>';
menuItems.push({
name: Globalize.translate('ButtonQueueForRetry'),
id: 'retry',
ironIcon: 'check'
});
}
else if (status == 'Cancelled') {
html += '<li data-icon="check"><a href="#" class="btnRetryJobItem" data-id="' + id + '">' + Globalize.translate('ButtonReenable') + '</a></li>';
menuItems.push({
name: Globalize.translate('ButtonReenable'),
id: 'retry',
ironIcon: 'check'
});
}
else if (status == 'Queued' || status == 'Transferring' || status == 'Converting' || status == 'ReadyToTransfer') {
html += '<li data-icon="delete"><a href="#" class="btnCancelJobItem" data-id="' + id + '">' + Globalize.translate('ButtonCancelItem') + '</a></li>';
menuItems.push({
name: Globalize.translate('ButtonCancelItem'),
id: 'cancel',
ironIcon: 'delete'
});
}
else if (status == 'Synced' && remove) {
html += '<li data-icon="check"><a href="#" class="btnUnmarkForRemoval" data-id="' + id + '">' + Globalize.translate('ButtonUnmarkForRemoval') + '</a></li>';
menuItems.push({
name: Globalize.translate('ButtonUnmarkForRemoval'),
id: 'unmarkforremoval',
ironIcon: 'check'
});
}
else if (status == 'Synced') {
html += '<li data-icon="check"><a href="#" class="btnMarkForRemoval" data-id="' + id + '">' + Globalize.translate('ButtonMarkForRemoval') + '</a></li>';
menuItems.push({
name: Globalize.translate('ButtonMarkForRemoval'),
id: 'markforremoval',
ironIcon: 'delete'
});
}
html += '</ul>';
require(['actionsheet'], function () {
html += '</div>';
ActionSheetElement.show({
items: menuItems,
positionTo: elem,
callback: function (id) {
page.append(html);
switch (id) {
var flyout = $('.jobMenu', page).popup({ positionTo: elem || "window" }).trigger('create').popup("open").on("popupafterclose", function () {
case 'cancel':
cancelJobItem(page, jobItemId);
break;
case 'retry':
retryJobItem(page, jobItemId);
break;
case 'markforremoval':
markForRemoval(page, jobItemId);
break;
case 'unmarkforremoval':
unMarkForRemoval(page, jobItemId);
break;
default:
break;
}
}
});
$(this).off("popupafterclose").remove();
});
$('.btnCancelJobItem', flyout).on('click', function () {
cancelJobItem(page, this.getAttribute('data-id'));
});
$('.btnRetryJobItem', flyout).on('click', function () {
retryJobItem(page, this.getAttribute('data-id'));
});
$('.btnUnmarkForRemoval', flyout).on('click', function () {
unMarkForRemoval(page, this.getAttribute('data-id'));
});
$('.btnMarkForRemoval', flyout).on('click', function () {
markForRemoval(page, this.getAttribute('data-id'));
});
}
function cancelJobItem(page, jobItemId) {
$('.jobMenu', page).popup('close');
// Need a timeout because jquery mobile will not show a popup while another is in the act of closing
Dashboard.showLoadingMsg();
@ -209,8 +227,6 @@
function markForRemoval(page, jobItemId) {
$('.jobMenu', page).popup('close');
ApiClient.ajax({
type: "POST",
@ -224,8 +240,6 @@
function unMarkForRemoval(page, jobItemId) {
$('.jobMenu', page).popup('close');
ApiClient.ajax({
type: "POST",
@ -239,8 +253,6 @@
function retryJobItem(page, jobItemId) {
$('.jobMenu', page).popup('close');
ApiClient.ajax({
type: "POST",