milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update icons

Browse source
This commit is contained in:
Luke Pulverenti 2015-06-18 02:23:44 -04:00
parent 13e18ba442
commit 7343772338
55 changed files with 901 additions and 316 deletions
Download patch file Download diff file Expand all files Collapse all files

32
dashboard-ui/scripts/itemdetailpage.js
View file

@ -2,22 +2,6 @@
var currentItem;
function getExternalPlayUrl(item) {
var providerIds = item.ProviderIds || {};
if (item.GameSystem == "Nintendo" && item.MediaType == "Game" && providerIds.NesBox && providerIds.NesBoxRom) {
return "http://nesbox.com/game/" + providerIds.NesBox + '/rom/' + providerIds.NesBoxRom;
}
if (item.GameSystem == "Super Nintendo" && item.MediaType == "Game" && providerIds.NesBox && providerIds.NesBoxRom) {
return "http://snesbox.com/game/" + providerIds.NesBox + '/rom/' + providerIds.NesBoxRom;
}
return null;
}
function reload(page) {
var id = getParameterByName('id');
@ -49,20 +33,11 @@
renderDetails(page, item, context);
LibraryBrowser.renderDetailPageBackdrop(page, item);
var externalPlayUrl = getExternalPlayUrl(item);
$('.btnPlayExternal', page).attr('href', externalPlayUrl || '#');
if (externalPlayUrl) {
$('.btnPlayExternal', page).removeClass('hide');
$('.btnPlay', page).addClass('hide');
}
else if (MediaController.canPlay(item)) {
if (MediaController.canPlay(item)) {
$('.btnPlay', page).removeClass('hide');
$('.btnPlayExternal', page).addClass('hide');
}
else {
$('.btnPlay', page).addClass('hide');
$('.btnPlayExternal', page).addClass('hide');
}
if (item.LocalTrailerCount && item.PlayAccess == 'Full') {
@ -1624,11 +1599,6 @@
playTrailer(page);
});
$('.btnPlayExternal', page).on('click', function () {
ApiClient.markPlayed(Dashboard.getCurrentUserId(), currentItem.Id, new Date());
});
$('.btnSplitVersions', page).on('click', function () {
splitVersions(page);

10
dashboard-ui/scripts/librarybrowser.js
View file

@ -854,7 +854,7 @@
if (item.UserData.UnplayedItemCount) {
//html += '<span class="ui-li-count">' + item.UserData.UnplayedItemCount + '</span>';
} else if (item.UserData.Played && item.Type != 'TvChannel') {
html += '<div class="playedIndicator"><div class="ui-icon-check ui-btn-icon-notext"></div></div>';
html += '<div class="playedIndicator"><i class="fa fa-check"></i></div>';
}
}
html += '</a>';
@ -1520,7 +1520,7 @@
html += '<div class="mediaSourceIndicator">' + mediaSourceCount + '</div>';
}
if (item.IsUnidentified) {
html += '<div class="unidentifiedIndicator"><div class="ui-icon-alert ui-btn-icon-notext"></div></div>';
html += '<div class="unidentifiedIndicator"><i class="fa fa-exclamation"></i></div>';
}
var progressHtml = options.showProgress === false || item.IsFolder ? '' : LibraryBrowser.getItemProgressBarHtml((item.Type == 'Recording' ? item : item.UserData));
@ -1863,12 +1863,12 @@
if (item.Type == "Series" || item.Type == "Season" || item.Type == "BoxSet" || item.MediaType == "Video" || item.MediaType == "Game" || item.MediaType == "Book") {
if (item.UserData.UnplayedItemCount) {
return '<div class="playedIndicator">' + item.UserData.UnplayedItemCount + '</div>';
return '<div class="playedIndicator textIndicator">' + item.UserData.UnplayedItemCount + '</div>';
}
if (item.Type != 'TvChannel') {
if (item.UserData.PlayedPercentage && item.UserData.PlayedPercentage >= 100 || (item.UserData && item.UserData.Played)) {
return '<div class="playedIndicator"><div class="ui-icon-check ui-btn-icon-notext"></div></div>';
return '<div class="playedIndicator"><i class="fa fa-check"></i></div>';
}
}
}
@ -1879,7 +1879,7 @@
getGroupCountIndicator: function (item) {
if (item.ChildCount) {
return '<div class="playedIndicator">' + item.ChildCount + '</div>';
return '<div class="playedIndicator textIndicator">' + item.ChildCount + '</div>';
}
return '';

41
dashboard-ui/scripts/librarylist.js
View file

@ -706,37 +706,16 @@
if (MediaController.canPlay(item)) {
if (item.MediaType == 'Video' && !item.IsFolder && item.UserData && item.UserData.PlaybackPositionTicks) {
contentHtml += '<div class="detailsMenuButtonContainer">';
contentHtml += '<a href="#" class="btn btnAltAction btnResume">';
contentHtml += '<i class="fa fa-play"></i>';
contentHtml += '<span>' + Globalize.translate('ButtonResume') + '</span>';
contentHtml += '</a>';
contentHtml += '</div>';
contentHtml += '<paper-button raised class="secondary btnResume" style="background-color:#ff8f00;"><iron-icon icon="play-arrow"></iron-icon><span>' + Globalize.translate('ButtonResume') + '</span></paper-button>';
}
contentHtml += '<div class="detailsMenuButtonContainer">';
contentHtml += '<a href="#" class="btn btnActionAccent btnPlay">';
contentHtml += '<i class="fa fa-play"></i>';
contentHtml += '<span>' + Globalize.translate('ButtonPlay') + '</span>';
contentHtml += '</a>';
contentHtml += '</div>';
contentHtml += '<paper-button raised class="secondary btnPlay"><iron-icon icon="play-arrow"></iron-icon><span>' + Globalize.translate('ButtonPlay') + '</span></paper-button>';
}
contentHtml += '<div class="detailsMenuButtonContainer">';
contentHtml += '<a href="' + LibraryBrowser.getHref(item, context) + '" class="btn" style="background-color: #673AB7;">';
contentHtml += '<i class="fa fa-folder-open"></i>';
contentHtml += '<span>' + Globalize.translate('ButtonOpen') + '</span>';
contentHtml += '</a>';
contentHtml += '</div>';
contentHtml += '<paper-button data-href="' + LibraryBrowser.getHref(item, context) + '" raised class="submit btnSync" style="background-color: #673AB7;" onclick="Dashboard.navigate(this.getAttribute(\'data-href\'));"><iron-icon icon="folder-open"></iron-icon><span>' + Globalize.translate('ButtonOpen') + '</span></paper-button>';
if (SyncManager.isAvailable(item, user)) {
contentHtml += '<div class="detailsMenuButtonContainer">';
contentHtml += '<a href="#" class="btn btnSync">';
contentHtml += '<i class="fa fa-refresh"></i>';
contentHtml += '<span>' + Globalize.translate('ButtonSync') + '</span>';
contentHtml += '</a>';
contentHtml += '</div>';
contentHtml += '<paper-button raised class="submit btnSync"><iron-icon icon="refresh"></iron-icon><span>' + Globalize.translate('ButtonSync') + '</span></paper-button>';
}
contentHtml += '</div>';
@ -1125,11 +1104,6 @@
return false;
}
function resetImages(page) {
$('cardImage', page).remove();
}
$(document).on('pageinitdepends', ".libraryPage", function () {
var page = this;
@ -1182,11 +1156,6 @@
hideSelections(page);
$('.viewTabButton:first', page).trigger('click');
}).on('pagebeforehide', ".libraryPage", function () {
var page = this;
resetImages(page);
});
function renderUserDataChanges(card, userData) {
@ -1197,7 +1166,7 @@
$('<div class="playedIndicator"></div>').insertAfter($('.cardOverlayTarget', card));
}
$('.playedIndicator', card).html('<div class="ui-icon-check ui-btn-icon-notext"></div>');
$('.playedIndicator', card).html('<i class="fa fa-check"></i>');
$('.cardProgress', card).remove();
}
else if (userData.UnplayedItemCount) {

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

@ -737,10 +737,10 @@
$('.headerBackButton').visible(canGoBack);
jPage.off('swipeleft', onPageSwipeLeft);
jPage.off('swiperight', onPageSwipeLeft);
if (canGoBack) {
jPage.on('swipeleft', onPageSwipeLeft);
jPage.on('swiperight', onPageSwipeLeft);
}
}

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

@ -84,8 +84,10 @@
html += '<div class="cardFooter">';
html += '<div class="cardText" style="text-align:right; float:right;">';
html += '<button class="btnCardMenu" type="button" data-inline="true" data-iconpos="notext" data-icon="ellipsis-v" style="margin: 2px 0 0;"></button>';
html += '<div class="cardText" style="text-align:right; float:right;font-size:20px;">';
html += '<button type="button" data-role="none" class="btnCardMenu imageButton" style="padding-right:5px;padding-top:5px;">';
html += '<i class="material-icons">more_vert</i>';
html += '</button>';
html += "</div>";
html += "<div class='cardText'>";

4
dashboard-ui/scripts/sections.js
View file

@ -154,7 +154,7 @@
html += '<h1 style="display:inline-block; vertical-align:middle;" class="listHeader">' + Globalize.translate('HeaderLatestMedia') + '</h1>';
if (user.Policy.EnableUserPreferenceAccess && !AppInfo.isNativeApp) {
html += '<a href="mypreferencesdisplay.html" class="clearLink" style="margin-left:2em;"><paper-button raised class="submit mini"><i class="fa fa-pencil"></i>' + Globalize.translate('ButtonEdit') + '</paper-button></a>';
html += '<a href="mypreferencesdisplay.html" class="clearLink" style="margin-left:2em;"><paper-button raised class="submit mini"><iron-icon icon="mode-edit"></iron-icon><span>' + Globalize.translate('ButtonEdit') + '</span></paper-button></a>';
}
html += '</div>';
@ -236,7 +236,7 @@
html += '<h1 style="display:inline-block; vertical-align:middle;" class="' + cssClass + '">' + Globalize.translate('HeaderMyMedia') + '</h1>';
if (user.Policy.EnableUserPreferenceAccess && !AppInfo.isNativeApp) {
html += '<a href="mypreferencesdisplay.html" class="clearLink" style="margin-left:2em;"><paper-button raised class="submit mini"><i class="fa fa-pencil"></i>' + Globalize.translate('ButtonEdit') + '</paper-button></a>';
html += '<a href="mypreferencesdisplay.html" class="clearLink" style="margin-left:2em;"><paper-button raised class="submit mini"><iron-icon icon="mode-edit"></iron-icon><span>' + Globalize.translate('ButtonEdit') + '</span></paper-button></a>';
}
html += '</div>';

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

@ -1559,11 +1559,12 @@ var Dashboard = {
var deferred = DeferredBuilder.Deferred();
Dashboard.importCss('thirdparty/swipebox-master/css/swipebox.min.css');
require([
'thirdparty/swipebox-master/js/jquery.swipebox.min'
], function () {
Dashboard.importCss('thirdparty/swipebox-master/css/swipebox.min.css');
deferred.resolve();
});
return deferred.promise();
@ -1964,7 +1965,7 @@ var AppInfo = {};
}
// just until this can be removed
require(['jqmicons']);
// require(['jqmicons']);
}
function init(deferred, capabilities, appName, deviceId, deviceName) {

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

@ -257,6 +257,8 @@
dialogOptionsFn: getTargetDialogOptionsFn(dialogOptionsQuery)
});
});
require(['jqmicons']);
}
function getTargetDialogOptionsFn(query) {

10
dashboard-ui/scripts/userprofilespage.js
View file

@ -129,7 +129,7 @@
html += '<div class="' + imageClass + '" style="background-image:url(\'' + imgUrl + '\');">';
if (user.ConnectUserId && addConnectIndicator) {
html += '<div class="playedIndicator" title="' + Globalize.translate('TooltipLinkedToEmbyConnect') + '"><div class="ui-icon-cloud ui-btn-icon-notext"></div></div>';
html += '<div class="playedIndicator" title="' + Globalize.translate('TooltipLinkedToEmbyConnect') + '"><i class="fa fa-cloud"></i></div>';
}
html += "</div>";
@ -142,11 +142,13 @@
html += '<div class="cardFooter">';
html += '<div class="cardText" style="text-align:right; float:right;">';
html += '<button class="btnUserMenu" type="button" data-inline="true" data-iconpos="notext" data-icon="ellipsis-v" style="margin: 2px 0 0;"></button>';
html += '<div class="cardText" style="text-align:right; float:right;font-size:20px;">';
html += '<button type="button" data-role="none" class="btnUserMenu imageButton">';
html += '<i class="material-icons">more_vert</i>';
html += '</button>';
html += "</div>";
html += '<div class="cardText" style="margin-right: 30px; padding: 11px 0 10px;">';
html += '<div class="cardText" style="padding-top:10px;padding-bottom:10px;">';
html += user.Name;
html += "</div>";