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

fix context menu margin and user preference buttons

Browse source
This commit is contained in:
dkanada 2019-12-11 23:34:29 +09:00
parent e108997376
commit 4e683c4fca
27 changed files with 99 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/components/actionsheet/actionsheet.css
View file

@ -37,6 +37,7 @@
box-shadow: none;
flex-shrink: 0;
border-radius: 0;
margin: 0;
}
.actionSheetMenuItem:focus {

1
src/components/indicators/indicators.js
View file

@ -115,7 +115,6 @@ define(['datetime', 'itemHelper', 'css!./indicators.css', 'material-icons'], fun
}
function getTimerIndicator(item) {
var status;
if (item.Type === 'SeriesTimer') {

8
src/components/itemMediaInfo/itemMediaInfo.template.html
View file

@ -1,8 +1,8 @@
<div class="formDialogHeader">
<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">arrow_back</i></button>
<h3 class="formDialogHeaderTitle">
${HeaderMediaInfo}
</h3>
<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1">
<i class="md-icon">arrow_back</i>
</button>
<h3 class="formDialogHeaderTitle">${HeaderMediaInfo}</h3>
</div>
<div class="formDialogContent smoothScrollY">

19
src/components/itemidentifier/itemidentifier.template.html
View file

@ -2,9 +2,7 @@
<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1">
<i class="md-icon">arrow_back</i>
</button>
<h3 class="formDialogHeaderTitle">
${Identify}
</h3>
<h3 class="formDialogHeaderTitle">${Identify}</h3>
</div>
<div class="formDialogContent smoothScrollY">
@ -17,16 +15,13 @@
<div class="txtPath fieldDescription"></div>
</div>
<div class="inputContainer">
<input is="emby-input" type="text" id="txtLookupName" class="identifyField" data-lookup="Name"
label="${LabelName}" />
<input is="emby-input" type="text" id="txtLookupName" class="identifyField" data-lookup="Name" label="${LabelName}" />
</div>
<div class="fldLookupYear inputContainer">
<input is="emby-input" type="number" id="txtLookupYear" class="identifyField" data-lookup="Year"
pattern="[0-9]*" min="1800" label="${LabelYear}" />
<input is="emby-input" type="number" id="txtLookupYear" class="identifyField" data-lookup="Year" pattern="[0-9]*" min="1800" label="${LabelYear}" />
</div>
<div class="identifyProviderIds">
</div>
<div class="identifyProviderIds"></div>
<div class="formDialogFooter">
<button is="emby-button" type="submit" class="raised button-submit block formDialogFooterItem">
@ -34,14 +29,13 @@
</button>
</div>
</form>
<div class="identificationSearchResults hide">
<div class="identificationSearchResults hide">
<h1>${SearchResults}</h1>
<div class="identificationSearchResultList itemsContainer vertical-wrap"></div>
</div>
<form class="identifyOptionsForm hide" style="margin:auto;">
<br />
<div class="selectedSearchResult"></div>
<br />
@ -51,8 +45,7 @@
</label>
<div class="formDialogFooter">
<button is="emby-button" type="submit"
class="raised button-submit block btnSubmit formDialogFooterItem">
<button is="emby-button" type="submit" class="raised button-submit block btnSubmit formDialogFooterItem">
<span>${ButtonOk}</span>
</button>
</div>

0
src/components/loading/loader2.gif → src/components/loading/loader.gif
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Before After
Before After

7
src/components/loading/loadingLegacy.js
View file

@ -6,14 +6,11 @@ define(['require', 'css!./loadingLegacy'], function (require) {
return {
show: function () {
var elem = loadingElem;
if (!elem) {
elem = document.createElement("img");
elem.src = require.toUrl('.').split('?')[0] + '/loader2.gif';
elem.src = require.toUrl('.').split('?')[0] + '/loader.gif';
loadingElem = elem;
elem.classList.add('loading-spinner');
document.body.appendChild(elem);
@ -23,9 +20,7 @@ define(['require', 'css!./loadingLegacy'], function (require) {
},
hide: function () {
var elem = loadingElem;
if (elem) {
elem.classList.add('hide');
}
}

3
src/components/loading/package.json
View file

@ -1,3 +0,0 @@
{
"main": "loading.js"
}

9
src/components/loadingdialog/loadingdialog.js
View file

@ -2,14 +2,12 @@ define(['loading', 'events', 'dialogHelper', 'dom', 'layoutManager', 'scrollHelp
'use strict';
function showDialog(instance, options, template) {
var dialogOptions = {
removeOnClose: true,
scrollY: false
};
var enableTvLayout = layoutManager.tv;
if (enableTvLayout) {
dialogOptions.size = 'fullscreen';
}
@ -48,7 +46,6 @@ define(['loading', 'events', 'dialogHelper', 'dom', 'layoutManager', 'scrollHelp
instance.dlg = dlg;
return dialogHelper.open(dlg).then(function () {
if (enableTvLayout) {
scrollHelper.centerFocus.off(dlg.querySelector('.formDialogContent'), false);
}
@ -58,12 +55,10 @@ define(['loading', 'events', 'dialogHelper', 'dom', 'layoutManager', 'scrollHelp
}
function LoadingDialog(options) {
this.options = options;
}
LoadingDialog.prototype.show = function () {
var instance = this;
loading.show();
@ -76,15 +71,12 @@ define(['loading', 'events', 'dialogHelper', 'dom', 'layoutManager', 'scrollHelp
};
LoadingDialog.prototype.setTitle = function (title) {
};
LoadingDialog.prototype.setText = function (text) {
};
LoadingDialog.prototype.hide = function () {
if (this.dlg) {
dialogHelper.close(this.dlg);
this.dlg = null;
@ -92,7 +84,6 @@ define(['loading', 'events', 'dialogHelper', 'dom', 'layoutManager', 'scrollHelp
};
LoadingDialog.prototype.destroy = function () {
this.dlg = null;
this.options = null;
};

3
src/components/mediainfo/mediainfo.css
View file

@ -69,10 +69,7 @@
}
.closedCaptionMediaInfoText {
/*padding: .24em .4em;*/
font-weight: bold;
/*font-size: inherit;*/
/*background: rgba(81, 81, 81, .7);*/
}
.mediaInfoOfficialRating {

3
src/components/serverNotifications/package.json
View file

@ -1,3 +0,0 @@
{
"main": "serverNotifications.js"
}

14
src/mypreferencesmenu.html
View file

@ -3,7 +3,7 @@
<div class="readOnlyContent" style="margin: 0 auto;">
<div class="verticalSection verticalSection-extrabottompadding">
<h2 class="sectionTitle headerUsername" style="padding-left:.25em;"></h2>
<a is="emby-linkbutton" data-ripple="false" href="#" class="lnkMyProfile listItem-border">
<a is="emby-linkbutton" data-ripple="false" href="#" style="display:block;padding:0;margin:0;" class="lnkMyProfile listItem-border">
<div class="listItem">
<i class="md-icon listItemIcon listItemIcon-transparent">person</i>
<div class="listItemBody">
@ -12,7 +12,7 @@
</div>
</a>
<a is="emby-linkbutton" data-ripple="false" href="#" class="lnkDisplayPreferences listItem-border">
<a is="emby-linkbutton" data-ripple="false" href="#" style="display:block;padding:0;margin:0;" class="lnkDisplayPreferences listItem-border">
<div class="listItem">
<i class="md-icon listItemIcon listItemIcon-transparent">tv</i>
<div class="listItemBody">
@ -21,7 +21,7 @@
</div>
</a>
<a is="emby-linkbutton" data-ripple="false" href="#" class="lnkHomePreferences listItem-border">
<a is="emby-linkbutton" data-ripple="false" href="#" style="display:block;padding:0;margin:0;" class="lnkHomePreferences listItem-border">
<div class="listItem">
<i class="md-icon listItemIcon listItemIcon-transparent">home</i>
<div class="listItemBody">
@ -30,7 +30,7 @@
</div>
</a>
<a is="emby-linkbutton" data-ripple="false" href="#" class="lnkPlaybackPreferences listItem-border">
<a is="emby-linkbutton" data-ripple="false" href="#" style="display:block;padding:0;margin:0;" class="lnkPlaybackPreferences listItem-border">
<div class="listItem">
<i class="md-icon listItemIcon listItemIcon-transparent">play_circle_filled</i>
<div class="listItemBody">
@ -39,7 +39,7 @@
</div>
</a>
<a is="emby-linkbutton" data-ripple="false" href="#" class="lnkSubtitlePreferences listItem-border">
<a is="emby-linkbutton" data-ripple="false" href="#" style="display:block;padding:0;margin:0;" class="lnkSubtitlePreferences listItem-border">
<div class="listItem">
<i class="md-icon listItemIcon listItemIcon-transparent">closed_caption</i>
<div class="listItemBody">
@ -69,7 +69,7 @@
</div>
<div class="userSection verticalSection verticalSection-extrabottompadding">
<h2 class="sectionTitle" style="padding-left:.25em;">${HeaderUser}</h2>
<a is="emby-linkbutton" data-ripple="false" href="selectserver.html" class="selectServer hide listItem-border">
<a is="emby-linkbutton" data-ripple="false" href="selectserver.html" style="display:block;padding:0;margin:0;" class="selectServer hide listItem-border">
<div class="listItem">
<i class="md-icon listItemIcon listItemIcon-transparent">wifi</i>
<div class="listItemBody">
@ -77,7 +77,7 @@
</div>
</div>
</a>
<a is="emby-linkbutton" data-ripple="false" href="#" class="btnLogout listItem-border">
<a is="emby-linkbutton" data-ripple="false" href="#" style="display:block;padding:0;margin:0;" class="btnLogout listItem-border">
<div class="listItem">
<i class="md-icon listItemIcon listItemIcon-transparent">exit_to_app</i>
<div class="listItemBody">

3
src/mypreferencesplayback.html
View file

@ -1,4 +1,3 @@
<div id="languagePreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${TitlePlayback}" data-backbutton="true">
<div class="settingsContainer padded-left padded-right padded-bottom-page">
</div>
<div class="settingsContainer padded-left padded-right padded-bottom-page"></div>
</div>

3
src/mypreferencessubtitles.html
View file

@ -1,4 +1,3 @@
<div id="homeScreenPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${Subtitles}" data-backbutton="true">
<div class="settingsContainer padded-left padded-right padded-bottom-page">
</div>
<div class="settingsContainer padded-left padded-right padded-bottom-page"></div>
</div>

4
src/myprofile.html
View file

@ -42,9 +42,7 @@
</form>
<form class="localAccessForm localAccessSection userProfileSettingsForm hide" style="margin: 3em auto 0;">
<div class="verticalSection">
<h2 class="sectionTitle">
${HeaderEasyPinCode}
</h2>
<h2 class="sectionTitle">${HeaderEasyPinCode}</h2>
<div>${EasyPasswordHelp}</div>
<br />
<div class="inputContainer">

3
src/notificationsettings.html
View file

@ -2,8 +2,7 @@
<div>
<div class="content-primary">
<div class="readOnlyContent">
<div class="notificationList">
</div>
<div class="notificationList"></div>
</div>
</div>
</div>

4
src/nowplaying.html
View file

@ -13,7 +13,6 @@
</div>
<div class="nowPlayingInfoButtons">
<button is="paper-icon-button-light" class="btnPreviousTrack btnPlayStateCommand autoSize" title="${ButtonPreviousTrack}">
<i class="md-icon">skip_previous</i>
</button>
@ -53,8 +52,7 @@
</div>
<div class="nowPlayingSecondaryButtons">
<div class="nowPlayingPageUserDataButtons">
</div>
<div class="nowPlayingPageUserDataButtons"></div>
<button is="paper-icon-button-light" class="btnToggleFullscreen videoButton btnPlayStateCommand autoSize" title="${ButtonFullscreen}" data-command="ToggleFullscreen">
<i class="md-icon">fullscreen</i>

8
src/search.html
View file

@ -1,8 +1,4 @@
<div id="searchPage" data-role="page" class="page libraryPage allLibraryPage noSecondaryNavPage" data-title="${ButtonSearch}" data-backbutton="true">
<div class="padded-left padded-right searchFields">
</div>
<div class="searchResults padded-bottom-page padded-top">
</div>
<div class="padded-left padded-right searchFields"></div>
<div class="searchResults padded-bottom-page padded-top"></div>
</div>

4
src/streamingsettings.html
View file

@ -11,7 +11,9 @@
<div class="fieldDescription">${LabelRemoteClientBitrateLimitHelp}</div>
</div>
</div>
<button is="emby-button" type="submit" class="raised button-submit block"><span>${ButtonSave}</span></button>
<button is="emby-button" type="submit" class="raised button-submit block">
<span>${ButtonSave}</span>
</button>
</form>
</div>
</div>

9
src/tv.html
View file

@ -8,10 +8,8 @@
<button is="paper-icon-button-light" class="btnFilter autoSize" title="${ButtonFilter}"><i class="md-icon">filter_list</i></button>
</div>
<div is="emby-itemscontainer" class="itemsContainer padded-left padded-left-withalphapicker padded-right">
</div>
<div class="alphaPicker alphaPicker-fixed alphaPicker-fixed-right alphaPicker-vertical">
</div>
<div is="emby-itemscontainer" class="itemsContainer padded-left padded-left-withalphapicker padded-right"></div>
<div class="alphaPicker alphaPicker-fixed alphaPicker-fixed-right alphaPicker-vertical"></div>
<div class="flex align-items-center justify-content-center flex-wrap-wrap padded-top padded-left padded-right padded-bottom">
<div class="paging"></div>
@ -23,8 +21,7 @@
<h2 class="sectionTitle sectionTitle-cards padded-left">${HeaderContinueWatching}</h2>
</div>
<div is="emby-itemscontainer" id="resumableItems" class="itemsContainer padded-left padded-right">
</div>
<div is="emby-itemscontainer" id="resumableItems" class="itemsContainer padded-left padded-right"></div>
</div>
<div class="verticalSection">

17
src/userparentalcontrol.html
View file

@ -1,5 +1,4 @@
<div id="userParentalControlPage" data-role="page" class="page type-interior">
<div>
<div class="content-primary">
<div class="verticalSection">
@ -15,17 +14,17 @@
<a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userparentalcontrol.html', true);" class="ui-btn-active">${TabParentalControl}</a>
<a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userpassword.html', true);">${TabPassword}</a>
</div>
<form class="userParentalControlForm">
<form class="userParentalControlForm">
<div class="selectContainer">
<select is="emby-select" id="selectMaxParentalRating" label="${LabelMaxParentalRating}"></select>
<div class="fieldDescription">${MaxParentalRatingHelp}</div>
</div>
<div>
<div class="blockUnratedItems">
</div>
<div class="blockUnratedItems"></div>
</div>
<br />
<div class="verticalSection" style="margin-bottom:2em;">
@ -35,9 +34,7 @@
<i class="md-icon">add</i>
</button>
</div>
<div class="blockedTags" style="margin-top:.5em;">
</div>
<div class="blockedTags" style="margin-top:.5em;"></div>
</div>
<div class="accessScheduleSection verticalSection" style="margin-bottom:2em;">
@ -47,10 +44,9 @@
<i class="md-icon">add</i>
</button>
</div>
<p>${HeaderAccessScheduleHelp}</p>
<div class="accessScheduleList paperList">
</div>
<p>${HeaderAccessScheduleHelp}</p>
<div class="accessScheduleList paperList"></div>
</div>
<div>
@ -58,7 +54,6 @@
<span>${ButtonSave}</span>
</button>
</div>
</form>
</div>
</div>

2
src/userpassword.html
View file

@ -1,5 +1,4 @@
<div id="userPasswordPage" data-role="page" class="page type-interior userPasswordPage">
<div>
<div class="content-primary">
<div class="verticalSection">
@ -18,7 +17,6 @@
<div class="readOnlyContent">
<form class="updatePasswordForm passwordSection hide" style="margin: 0 auto 2em;">
<div class="detailSection">
<div id="fldCurrentPassword" class="inputContainer hide">
<input is="emby-input" type="password" id="txtCurrentPassword" label="${LabelCurrentPassword}" autocomplete="off" />

9
src/wizardfinish.html
View file

@ -1,14 +1,8 @@
<div id="wizardFinishPage" data-role="page" class="page standalonePage wizardPage">
<div class="padded-left padded-right padded-top">
<div class="ui-corner-all ui-shadow wizardContent">
<h1>
${LabelYoureDone}
</h1>
<h1>${LabelYoureDone}</h1>
<p style="margin:2em 0;">${WizardCompleted}</p>
<div class="wizardNavigation">
<button is="emby-button" type="button" class="raised button-cancel" onclick="history.back();">
<i class="md-icon">arrow_back</i>
@ -20,6 +14,5 @@
</button>
</div>
</div>
</div>
</div>

19
src/wizardlibrary.html
View file

@ -1,25 +1,24 @@
<div id="wizardLibraryPage" data-role="page" class="page standalonePage wizardPage mediaLibraryPage">
<div class="padded-left padded-right padded-top">
<div class="ui-corner-all ui-shadow wizardContent">
<div>
<h1 style="display:inline-block;">
${HeaderSetupLibrary}
</h1>
<h1 style="display:inline-block;">${HeaderSetupLibrary}</h1>
<a href="https://docs.jellyfin.org/general/server/libraries.html" target="_blank" class="clearLink" style="margin-top:-10px;display:inline-block;vertical-align:middle;margin-left:2em;"><button is="emby-button" type="button" class="raised"><i class="md-icon">info</i><span>${ButtonHelp}</span></button></a>
</div>
<br />
<div id="divVirtualFolders"></div>
<br />
<br />
<div class="wizardNavigation">
<button is="emby-button" type="button" class="raised button-cancel" onclick="history.back();"><i class="md-icon">arrow_back</i><span>${LabelPrevious}</span></button>
<button is="emby-button" type="button" class="raised button-submit" onclick="WizardLibraryPage.next();"><span>${LabelNext}</span><i class="md-icon">arrow_forward</i></button>
<button is="emby-button" type="button" class="raised button-cancel" onclick="history.back();">
<i class="md-icon">arrow_back</i>
<span>${LabelPrevious}</span>
</button>
<button is="emby-button" type="button" class="raised button-submit" onclick="WizardLibraryPage.next();">
<span>${LabelNext}</span>
<i class="md-icon">arrow_forward</i>
</button>
</div>
</div>
</div>
</div>

14
src/wizardremoteaccess.html
View file

@ -1,7 +1,5 @@
<div id="wizardSettingsPage" data-role="page" class="page standalonePage wizardPage">
<div class="padded-left padded-right padded-top">
<div class="ui-corner-all ui-shadow wizardContent">
<form class="wizardSettingsForm">
<h1>${HeaderConfigureRemoteAccess}</h1>
@ -21,13 +19,17 @@
<div class="fieldDescription checkboxFieldDescription">${LabelEnableAutomaticPortMapHelp}</div>
</div>
<br />
<div class="wizardNavigation">
<button is="emby-button" type="button" class="raised button-cancel" onclick="history.back();"><i class="md-icon">arrow_back</i><span>${LabelPrevious}</span></button>
<button is="emby-button" type="submit" class="raised button-submit"><span>${LabelNext}</span><i class="md-icon">arrow_forward</i></button>
<button is="emby-button" type="button" class="raised button-cancel" onclick="history.back();">
<i class="md-icon">arrow_back</i>
<span>${LabelPrevious}</span>
</button>
<button is="emby-button" type="submit" class="raised button-submit">
<span>${LabelNext}</span>
<i class="md-icon">arrow_forward</i>
</button>
</div>
</form>
</div>
</div>
</div>

13
src/wizardsettings.html
View file

@ -1,11 +1,8 @@
<div id="wizardSettingsPage" data-role="page" class="page standalonePage wizardPage">
<div class="padded-left padded-right padded-top">
<div class="ui-corner-all ui-shadow wizardContent">
<form class="wizardSettingsForm">
<h1>${HeaderPreferredMetadataLanguage}</h1>
<p style="margin:1.5em 0;">${DefaultMetadataLangaugeDescription}</p>
<div class="selectContainer">
@ -18,8 +15,14 @@
<br />
<div class="wizardNavigation">
<button is="emby-button" type="button" class="raised button-cancel" onclick="history.back();"><i class="md-icon">arrow_back</i><span>${LabelPrevious}</span></button>
<button is="emby-button" type="submit" class="raised button-submit"><span>${LabelNext}</span><i class="md-icon">arrow_forward</i></button>
<button is="emby-button" type="button" class="raised button-cancel" onclick="history.back();">
<i class="md-icon">arrow_back</i>
<span>${LabelPrevious}</span>
</button>
<button is="emby-button" type="submit" class="raised button-submit">
<span>${LabelNext}</span>
<i class="md-icon">arrow_forward</i>
</button>
</div>
</form>
</div>

13
src/wizardstart.html
View file

@ -1,14 +1,9 @@
<div id="wizardStartPage" data-role="page" class="page standalonePage wizardPage">
<div class="padded-left padded-right padded-top">
<div class="ui-corner-all ui-shadow wizardContent" style="position:relative;">
<form class="wizardStartForm">
<div>
<h1 style="float:left;">
${WelcomeToProject}
</h1>
<h1 style="float:left;">${WelcomeToProject}</h1>
<a is="emby-linkbutton" href="https://docs.jellyfin.org/general/administration/quick-start.html" target="_blank" class="raised raised-alt" style="float:right;margin-top:20px;">
<span>${ButtonQuickStartGuide}</span>
</a>
@ -23,10 +18,12 @@
<br />
<div class="wizardNavigation" style="text-align:right;">
<button is="emby-button" type="submit" class="raised button-submit"><span>${LabelNext}</span><i class="md-icon">arrow_forward</i></button>
<button is="emby-button" type="submit" class="raised button-submit">
<span>${LabelNext}</span>
<i class="md-icon">arrow_forward</i>
</button>
</div>
</form>
</div>
</div>
</div>

19
src/wizarduser.html
View file

@ -1,15 +1,9 @@
<div id="wizardUserPage" data-role="page" class="page standalonePage wizardPage">
<div class="padded-left padded-right padded-top">
<div class="ui-corner-all ui-shadow wizardContent">
<form class="wizardUserForm">
<div class="verticalSection">
<h1 class="sectionTitle">
${TellUsAboutYourself}
</h1>
<h1 class="sectionTitle">${TellUsAboutYourself}</h1>
<p style="margin-top:2em;">${UserProfilesIntro}</p>
<br />
<div class="inputContainer">
@ -26,11 +20,16 @@
</div>
<div class="wizardNavigation">
<button is="emby-button" type="button" class="raised button-cancel" onclick="history.back();"><i class="md-icon">arrow_back</i><span>${LabelPrevious}</span></button>
<button is="emby-button" type="submit" class="raised button-submit"><span>${LabelNext}</span><i class="md-icon">arrow_forward</i></button>
<button is="emby-button" type="button" class="raised button-cancel" onclick="history.back();">
<i class="md-icon">arrow_back</i>
<span>${LabelPrevious}</span>
</button>
<button is="emby-button" type="submit" class="raised button-submit">
<span>${LabelNext}</span>
<i class="md-icon">arrow_forward</i>
</button>
</div>
</form>
</div>
</div>
</div>