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

Merge pull request #3688 from thornbill/no-hash-bang

Browse source 
Remove hash bang paths
This commit is contained in:
Bill Thornton 2022-06-14 10:39:09 -04:00 • committed by GitHub
commit 6d3365bc09
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
26 changed files with 136 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

70
src/components/appRouter.js
View file

@ -73,9 +73,13 @@ class AppRouter {
async show(path, options) {
if (this.promiseShow) await this.promiseShow;
// ensure the path does not start with '#!' since the router adds this
if (path.startsWith('#!')) {
path = path.substring(2);
// ensure the path does not start with '#' since the router adds this
if (path.startsWith('#')) {
path = path.substring(1);
}
// Support legacy '#!' routes since people may have old bookmarks, etc.
if (path.startsWith('!')) {
path = path.substring(1);
}
if (path.indexOf('/') !== 0 && path.indexOf('://') === -1) {
@ -515,27 +519,27 @@ class AppRouter {
const serverId = item.ServerId || options.serverId;
if (item === 'settings') {
return '#!/mypreferencesmenu.html';
return '#/mypreferencesmenu.html';
}
if (item === 'wizard') {
return '#!/wizardstart.html';
return '#/wizardstart.html';
}
if (item === 'manageserver') {
return '#!/dashboard.html';
return '#/dashboard.html';
}
if (item === 'recordedtv') {
return '#!/livetv.html?tab=3&serverId=' + options.serverId;
return '#/livetv.html?tab=3&serverId=' + options.serverId;
}
if (item === 'nextup') {
return '#!/list.html?type=nextup&serverId=' + options.serverId;
return '#/list.html?type=nextup&serverId=' + options.serverId;
}
if (item === 'list') {
let url = '#!/list.html?serverId=' + options.serverId + '&type=' + options.itemTypes;
let url = '#/list.html?serverId=' + options.serverId + '&type=' + options.itemTypes;
if (options.isFavorite) {
url += '&IsFavorite=true';
@ -546,61 +550,61 @@ class AppRouter {
if (item === 'livetv') {
if (options.section === 'programs') {
return '#!/livetv.html?tab=0&serverId=' + options.serverId;
return '#/livetv.html?tab=0&serverId=' + options.serverId;
}
if (options.section === 'guide') {
return '#!/livetv.html?tab=1&serverId=' + options.serverId;
return '#/livetv.html?tab=1&serverId=' + options.serverId;
}
if (options.section === 'movies') {
return '#!/list.html?type=Programs&IsMovie=true&serverId=' + options.serverId;
return '#/list.html?type=Programs&IsMovie=true&serverId=' + options.serverId;
}
if (options.section === 'shows') {
return '#!/list.html?type=Programs&IsSeries=true&IsMovie=false&IsNews=false&serverId=' + options.serverId;
return '#/list.html?type=Programs&IsSeries=true&IsMovie=false&IsNews=false&serverId=' + options.serverId;
}
if (options.section === 'sports') {
return '#!/list.html?type=Programs&IsSports=true&serverId=' + options.serverId;
return '#/list.html?type=Programs&IsSports=true&serverId=' + options.serverId;
}
if (options.section === 'kids') {
return '#!/list.html?type=Programs&IsKids=true&serverId=' + options.serverId;
return '#/list.html?type=Programs&IsKids=true&serverId=' + options.serverId;
}
if (options.section === 'news') {
return '#!/list.html?type=Programs&IsNews=true&serverId=' + options.serverId;
return '#/list.html?type=Programs&IsNews=true&serverId=' + options.serverId;
}
if (options.section === 'onnow') {
return '#!/list.html?type=Programs&IsAiring=true&serverId=' + options.serverId;
return '#/list.html?type=Programs&IsAiring=true&serverId=' + options.serverId;
}
if (options.section === 'channels') {
return '#!/livetv.html?tab=2&serverId=' + options.serverId;
return '#/livetv.html?tab=2&serverId=' + options.serverId;
}
if (options.section === 'dvrschedule') {
return '#!/livetv.html?tab=4&serverId=' + options.serverId;
return '#/livetv.html?tab=4&serverId=' + options.serverId;
}
if (options.section === 'seriesrecording') {
return '#!/livetv.html?tab=5&serverId=' + options.serverId;
return '#/livetv.html?tab=5&serverId=' + options.serverId;
}
return '#!/livetv.html?serverId=' + options.serverId;
return '#/livetv.html?serverId=' + options.serverId;
}
if (itemType == 'SeriesTimer') {
return '#!/details?seriesTimerId=' + id + '&serverId=' + serverId;
return '#/details?seriesTimerId=' + id + '&serverId=' + serverId;
}
if (item.CollectionType == 'livetv') {
return '#!/livetv.html';
return '#/livetv.html';
}
if (item.Type === 'Genre') {
url = '#!/list.html?genreId=' + item.Id + '&serverId=' + serverId;
url = '#/list.html?genreId=' + item.Id + '&serverId=' + serverId;
if (context === 'livetv') {
url += '&type=Programs';
@ -614,7 +618,7 @@ class AppRouter {
}
if (item.Type === 'MusicGenre') {
url = '#!/list.html?musicGenreId=' + item.Id + '&serverId=' + serverId;
url = '#/list.html?musicGenreId=' + item.Id + '&serverId=' + serverId;
if (options.parentId) {
url += '&parentId=' + options.parentId;
@ -624,7 +628,7 @@ class AppRouter {
}
if (item.Type === 'Studio') {
url = '#!/list.html?studioId=' + item.Id + '&serverId=' + serverId;
url = '#/list.html?studioId=' + item.Id + '&serverId=' + serverId;
if (options.parentId) {
url += '&parentId=' + options.parentId;
@ -635,7 +639,7 @@ class AppRouter {
if (context !== 'folders' && !itemHelper.isLocalItem(item)) {
if (item.CollectionType == 'movies') {
url = '#!/movies.html?topParentId=' + item.Id;
url = '#/movies.html?topParentId=' + item.Id;
if (options && options.section === 'latest') {
url += '&tab=1';
@ -645,7 +649,7 @@ class AppRouter {
}
if (item.CollectionType == 'tvshows') {
url = '#!/tv.html?topParentId=' + item.Id;
url = '#/tv.html?topParentId=' + item.Id;
if (options && options.section === 'latest') {
url += '&tab=1';
@ -655,7 +659,7 @@ class AppRouter {
}
if (item.CollectionType == 'music') {
url = '#!/music.html?topParentId=' + item.Id;
url = '#/music.html?topParentId=' + item.Id;
if (options?.section === 'latest') {
url += '&tab=1';
@ -668,24 +672,24 @@ class AppRouter {
const itemTypes = ['Playlist', 'TvChannel', 'Program', 'BoxSet', 'MusicAlbum', 'MusicGenre', 'Person', 'Recording', 'MusicArtist'];
if (itemTypes.indexOf(itemType) >= 0) {
return '#!/details?id=' + id + '&serverId=' + serverId;
return '#/details?id=' + id + '&serverId=' + serverId;
}
const contextSuffix = context ? '&context=' + context : '';
if (itemType == 'Series' || itemType == 'Season' || itemType == 'Episode') {
return '#!/details?id=' + id + contextSuffix + '&serverId=' + serverId;
return '#/details?id=' + id + contextSuffix + '&serverId=' + serverId;
}
if (item.IsFolder) {
if (id) {
return '#!/list.html?parentId=' + id + '&serverId=' + serverId;
return '#/list.html?parentId=' + id + '&serverId=' + serverId;
}
return '#';
}
return '#!/details?id=' + id + '&serverId=' + serverId;
return '#/details?id=' + id + '&serverId=' + serverId;
}
showLocalLogin(serverId) {

2
src/components/dashboard/users/UserCardBox.tsx
View file

@ -9,7 +9,7 @@ const createLinkElement = ({ user, renderImgUrl }: { user: UserDto, renderImgUrl
__html: `<a
is="emby-linkbutton"
class="cardContent"
href="#!/useredit.html?userId=${user.Id}"
href="#/useredit.html?userId=${user.Id}"
>
${renderImgUrl}
</a>`

2
src/components/favoriteitems.js
View file

@ -148,7 +148,7 @@ import '../elements/emby-itemscontainer/emby-itemscontainer';
html += '<div class="sectionTitleContainer sectionTitleContainer-cards padded-left">';
if (!layoutManager.tv && options.Limit && result.Items.length >= options.Limit) {
html += '<a is="emby-linkbutton" href="' + ('#!/list.html?serverId=' + ApiClient.serverId() + '&type=' + section.types + '&IsFavorite=true') + '" class="more button-flat button-flat-mini sectionTitleTextButton">';
html += '<a is="emby-linkbutton" href="' + ('#/list.html?serverId=' + ApiClient.serverId() + '&type=' + section.types + '&IsFavorite=true') + '" class="more button-flat button-flat-mini sectionTitleTextButton">';
html += '<h2 class="sectionTitle sectionTitle-cards">';
html += globalize.translate(section.name);
html += '</h2>';

8
src/components/remotecontrol/remotecontrol.js
View file

@ -147,7 +147,7 @@ function updateNowPlayingInfo(context, state, serverId) {
for (const artist of item.ArtistItems) {
const artistName = escapeHtml(artist.Name);
const artistId = artist.Id;
artistsSeries += `<a class="button-link emby-button" is="emby-linkbutton" href="#!/details?id=${artistId}&serverId=${nowPlayingServerId}">${escapeHtml(artistName)}</a>`;
artistsSeries += `<a class="button-link emby-button" is="emby-linkbutton" href="#/details?id=${artistId}&serverId=${nowPlayingServerId}">${escapeHtml(artistName)}</a>`;
if (artist !== item.ArtistItems.slice(-1)[0]) {
artistsSeries += ', ';
}
@ -165,7 +165,7 @@ function updateNowPlayingInfo(context, state, serverId) {
}
}
if (item.Album != null) {
albumName = '<a class="button-link emby-button" is="emby-linkbutton" href="#!/details?id=' + item.AlbumId + `&serverId=${nowPlayingServerId}">` + escapeHtml(item.Album) + '</a>';
albumName = '<a class="button-link emby-button" is="emby-linkbutton" href="#/details?id=' + item.AlbumId + `&serverId=${nowPlayingServerId}">` + escapeHtml(item.Album) + '</a>';
}
context.querySelector('.nowPlayingAlbum').innerHTML = albumName;
context.querySelector('.nowPlayingArtist').innerHTML = artistsSeries;
@ -173,12 +173,12 @@ function updateNowPlayingInfo(context, state, serverId) {
} else if (item.Type == 'Episode') {
if (item.SeasonName != null) {
const seasonName = item.SeasonName;
context.querySelector('.nowPlayingSeason').innerHTML = '<a class="button-link emby-button" is="emby-linkbutton" href="#!/details?id=' + item.SeasonId + `&serverId=${nowPlayingServerId}">${escapeHtml(seasonName)}</a>`;
context.querySelector('.nowPlayingSeason').innerHTML = '<a class="button-link emby-button" is="emby-linkbutton" href="#/details?id=' + item.SeasonId + `&serverId=${nowPlayingServerId}">${escapeHtml(seasonName)}</a>`;
}
if (item.SeriesName != null) {
const seriesName = item.SeriesName;
if (item.SeriesId != null) {
context.querySelector('.nowPlayingSerie').innerHTML = '<a class="button-link emby-button" is="emby-linkbutton" href="#!/details?id=' + item.SeriesId + `&serverId=${nowPlayingServerId}">${escapeHtml(seriesName)}</a>`;
context.querySelector('.nowPlayingSerie').innerHTML = '<a class="button-link emby-button" is="emby-linkbutton" href="#/details?id=' + item.SeriesId + `&serverId=${nowPlayingServerId}">${escapeHtml(seriesName)}</a>`;
} else {
context.querySelector('.nowPlayingSerie').innerText = seriesName;
}

10
src/controllers/dashboard/dashboard.html
View file

@ -3,7 +3,7 @@
<div class="dashboardSections" style="padding-top:.5em;">
<div class="dashboardColumn dashboardColumn-2-60 dashboardColumn-3-46">
<div class="dashboardSection">
<a is="emby-linkbutton" href="#!/dashboardgeneral.html" class="button-flat sectionTitleTextButton">
<a is="emby-linkbutton" href="#/dashboardgeneral.html" class="button-flat sectionTitleTextButton">
<h3>${TabServer}</h3>
<span class="material-icons chevron_right" aria-hidden="true"></span>
</a>
@ -35,7 +35,7 @@
</div>
<div class="dashboardSection">
<a is="emby-linkbutton" href="#!/devices.html" class="button-flat sectionTitleTextButton">
<a is="emby-linkbutton" href="#/devices.html" class="button-flat sectionTitleTextButton">
<h3>${HeaderActiveDevices}</h3>
<span class="material-icons chevron_right" aria-hidden="true"></span>
</a>
@ -46,7 +46,7 @@
<div class="dashboardColumn dashboardColumn-2-40 dashboardColumn-3-27">
<div class="dashboardSection">
<a is="emby-linkbutton" href="#!/serveractivity.html?useractivity=true" class="button-flat sectionTitleTextButton">
<a is="emby-linkbutton" href="#/serveractivity.html?useractivity=true" class="button-flat sectionTitleTextButton">
<h3>${HeaderActivity}</h3>
<span class="material-icons chevron_right" aria-hidden="true"></span>
</a>
@ -63,7 +63,7 @@
</div>
<div class="dashboardSection serverActivitySection hide activityContainer">
<a is="emby-linkbutton" href="#!/serveractivity.html?useractivity=false" class="button-flat sectionTitleTextButton">
<a is="emby-linkbutton" href="#/serveractivity.html?useractivity=false" class="button-flat sectionTitleTextButton">
<h3>${Alerts}</h3>
<span class="material-icons chevron_right" aria-hidden="true"></span>
</a>
@ -72,7 +72,7 @@
</div>
<div class="dashboardSection">
<a is="emby-linkbutton" href="#!/dashboardgeneral.html" class="button-flat sectionTitleTextButton">
<a is="emby-linkbutton" href="#/dashboardgeneral.html" class="button-flat sectionTitleTextButton">
<h3>${HeaderPaths}</h3>
<span class="material-icons chevron_right" aria-hidden="true"></span>
</a>

2
src/controllers/dashboard/devices/devices.js
View file

@ -98,7 +98,7 @@ import confirm from '../../../components/confirm/confirm';
deviceHtml += '<div class="cardBox visualCardBox">';
deviceHtml += '<div class="cardScalable">';
deviceHtml += '<div class="cardPadder cardPadder-backdrop"></div>';
deviceHtml += `<a is="emby-linkbutton" href="${canEdit ? '#!/device.html?id=' + device.Id : '#'}" class="cardContent cardImageContainer ${cardBuilder.getDefaultBackgroundClass()}">`;
deviceHtml += `<a is="emby-linkbutton" href="${canEdit ? '#/device.html?id=' + device.Id : '#'}" class="cardContent cardImageContainer ${cardBuilder.getDefaultBackgroundClass()}">`;
const iconUrl = imageHelper.getDeviceIcon(device);
if (iconUrl) {

2
src/controllers/dashboard/dlna/profiles.html
View file

@ -8,7 +8,7 @@
<div class="verticalSection verticalSection-extrabottompadding">
<div class="sectionTitleContainer flex align-items-center">
<h2 class="sectionTitle">${HeaderCustomDlnaProfiles}</h2>
<a is="emby-linkbutton" href="#!/dlnaprofile.html" class="fab submit" style="margin:0 0 0 1em">
<a is="emby-linkbutton" href="#/dlnaprofile.html" class="fab submit" style="margin:0 0 0 1em">
<span class="material-icons add" aria-hidden="true"></span>
</a>
</div>

6
src/controllers/dashboard/dlna/profiles.js
View file

@ -42,7 +42,7 @@ import confirm from '../../../components/confirm/confirm';
html += '<div class="listItem listItem-border">';
html += '<span class="listItemIcon material-icons live_tv" aria-hidden="true"></span>';
html += '<div class="listItemBody two-line">';
html += "<a is='emby-linkbutton' style='padding:0;margin:0;' data-ripple='false' class='clearLink' href='#!/dlnaprofile.html?id=" + profile.Id + "'>";
html += "<a is='emby-linkbutton' style='padding:0;margin:0;' data-ripple='false' class='clearLink' href='#/dlnaprofile.html?id=" + profile.Id + "'>";
html += '<div>' + escapeHtml(profile.Name) + '</div>';
html += '</a>';
html += '</div>';
@ -80,10 +80,10 @@ import confirm from '../../../components/confirm/confirm';
function getTabs() {
return [{
href: '#!/dlnasettings.html',
href: '#/dlnasettings.html',
name: globalize.translate('Settings')
}, {
href: '#!/dlnaprofiles.html',
href: '#/dlnaprofiles.html',
name: globalize.translate('TabProfiles')
}];
}

4
src/controllers/dashboard/dlna/settings.js
View file

@ -39,10 +39,10 @@ import Dashboard from '../../../utils/dashboard';
function getTabs() {
return [{
href: '#!/dlnasettings.html',
href: '#/dlnasettings.html',
name: globalize.translate('Settings')
}, {
href: '#!/dlnaprofiles.html',
href: '#/dlnaprofiles.html',
name: globalize.translate('TabProfiles')
}];
}

6
src/controllers/dashboard/encodingsettings.js
View file

@ -153,13 +153,13 @@ import alert from '../../components/alert';
function getTabs() {
return [{
href: '#!/encodingsettings.html',
href: '#/encodingsettings.html',
name: globalize.translate('Transcoding')
}, {
href: '#!/playbackconfiguration.html',
href: '#/playbackconfiguration.html',
name: globalize.translate('ButtonResume')
}, {
href: '#!/streamingsettings.html',
href: '#/streamingsettings.html',
name: globalize.translate('TabStreaming')
}];
}

8
src/controllers/dashboard/library.js
View file

@ -360,16 +360,16 @@ import cardBuilder from '../../components/cardbuilder/cardBuilder';
function getTabs() {
return [{
href: '#!/library.html',
href: '#/library.html',
name: globalize.translate('HeaderLibraries')
}, {
href: '#!/librarydisplay.html',
href: '#/librarydisplay.html',
name: globalize.translate('Display')
}, {
href: '#!/metadataimages.html',
href: '#/metadataimages.html',
name: globalize.translate('Metadata')
}, {
href: '#!/metadatanfo.html',
href: '#/metadatanfo.html',
name: globalize.translate('TabNfoSettings')
}];
}

8
src/controllers/dashboard/librarydisplay.js
View file

@ -9,16 +9,16 @@ import Dashboard from '../../utils/dashboard';
function getTabs() {
return [{
href: '#!/library.html',
href: '#/library.html',
name: globalize.translate('HeaderLibraries')
}, {
href: '#!/librarydisplay.html',
href: '#/librarydisplay.html',
name: globalize.translate('Display')
}, {
href: '#!/metadataimages.html',
href: '#/metadataimages.html',
name: globalize.translate('Metadata')
}, {
href: '#!/metadatanfo.html',
href: '#/metadatanfo.html',
name: globalize.translate('TabNfoSettings')
}];
}

8
src/controllers/dashboard/metadataImages.js
View file

@ -54,16 +54,16 @@ import Dashboard from '../../utils/dashboard';
function getTabs() {
return [{
href: '#!/library.html',
href: '#/library.html',
name: globalize.translate('HeaderLibraries')
}, {
href: '#!/librarydisplay.html',
href: '#/librarydisplay.html',
name: globalize.translate('Display')
}, {
href: '#!/metadataimages.html',
href: '#/metadataimages.html',
name: globalize.translate('Metadata')
}, {
href: '#!/metadatanfo.html',
href: '#/metadatanfo.html',
name: globalize.translate('TabNfoSettings')
}];
}

8
src/controllers/dashboard/metadatanfo.js
View file

@ -48,16 +48,16 @@ import alert from '../../components/alert';
function getTabs() {
return [{
href: '#!/library.html',
href: '#/library.html',
name: globalize.translate('HeaderLibraries')
}, {
href: '#!/librarydisplay.html',
href: '#/librarydisplay.html',
name: globalize.translate('Display')
}, {
href: '#!/metadataimages.html',
href: '#/metadataimages.html',
name: globalize.translate('Metadata')
}, {
href: '#!/metadatanfo.html',
href: '#/metadatanfo.html',
name: globalize.translate('TabNfoSettings')
}];
}

6
src/controllers/dashboard/playback.js
View file

@ -33,13 +33,13 @@ import Dashboard from '../../utils/dashboard';
function getTabs() {
return [{
href: '#!/encodingsettings.html',
href: '#/encodingsettings.html',
name: globalize.translate('Transcoding')
}, {
href: '#!/playbackconfiguration.html',
href: '#/playbackconfiguration.html',
name: globalize.translate('ButtonResume')
}, {
href: '#!/streamingsettings.html',
href: '#/streamingsettings.html',
name: globalize.translate('TabStreaming')
}];
}

8
src/controllers/dashboard/plugins/available/index.js
View file

@ -92,7 +92,7 @@ function populateList(options) {
function getPluginHtml(plugin, options, installedPlugins) {
let html = '';
let href = plugin.externalUrl ? plugin.externalUrl : '#!/addplugin.html?name=' + encodeURIComponent(plugin.name) + '&guid=' + plugin.guid;
let href = plugin.externalUrl ? plugin.externalUrl : '#/addplugin.html?name=' + encodeURIComponent(plugin.name) + '&guid=' + plugin.guid;
if (options.context) {
href += '&context=' + options.context;
@ -134,13 +134,13 @@ function getPluginHtml(plugin, options, installedPlugins) {
function getTabs() {
return [{
href: '#!/installedplugins.html',
href: '#/installedplugins.html',
name: globalize.translate('TabMyPlugins')
}, {
href: '#!/availableplugins.html',
href: '#/availableplugins.html',
name: globalize.translate('TabCatalog')
}, {
href: '#!/repositories.html',
href: '#/repositories.html',
name: globalize.translate('TabRepositories')
}];
}

8
src/controllers/dashboard/plugins/installed/index.js
View file

@ -127,7 +127,7 @@ function populateList(page, plugins, pluginConfigurationPages) {
} else {
html += '<div class="centerMessage">';
html += '<h1>' + globalize.translate('MessageNoPluginsInstalled') + '</h1>';
html += '<p><a is="emby-linkbutton" class="button-link" href="#!/availableplugins.html">';
html += '<p><a is="emby-linkbutton" class="button-link" href="#/availableplugins.html">';
html += globalize.translate('MessageBrowsePluginCatalog');
html += '</a></p>';
html += '</div>';
@ -212,13 +212,13 @@ function reloadList(page) {
function getTabs() {
return [{
href: '#!/installedplugins.html',
href: '#/installedplugins.html',
name: globalize.translate('TabMyPlugins')
}, {
href: '#!/availableplugins.html',
href: '#/availableplugins.html',
name: globalize.translate('TabCatalog')
}, {
href: '#!/repositories.html',
href: '#/repositories.html',
name: globalize.translate('TabRepositories')
}];
}

6
src/controllers/dashboard/plugins/repositories/index.js
View file

@ -104,13 +104,13 @@ function getRepositoryElement(repository) {
function getTabs() {
return [{
href: '#!/installedplugins.html',
href: '#/installedplugins.html',
name: globalize.translate('TabMyPlugins')
}, {
href: '#!/availableplugins.html',
href: '#/availableplugins.html',
name: globalize.translate('TabCatalog')
}, {
href: '#!/repositories.html',
href: '#/repositories.html',
name: globalize.translate('TabRepositories')
}];
}

6
src/controllers/dashboard/streaming.js
View file

@ -24,13 +24,13 @@ import Dashboard from '../../utils/dashboard';
function getTabs() {
return [{
href: '#!/encodingsettings.html',
href: '#/encodingsettings.html',
name: globalize.translate('Transcoding')
}, {
href: '#!/playbackconfiguration.html',
href: '#/playbackconfiguration.html',
name: globalize.translate('ButtonResume')
}, {
href: '#!/streamingsettings.html',
href: '#/streamingsettings.html',
name: globalize.translate('TabStreaming')
}];
}

12
src/controllers/livetv.html
View file

@ -3,7 +3,7 @@
<div class="pageTabContent" id="suggestionsTab" data-index="0">
<div id="activePrograms" class="verticalSection">
<div class="sectionTitleContainer sectionTitleContainer-cards padded-left">
<a href="#!/list.html?type=Programs&IsAiring=true" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs">
<a href="#/list.html?type=Programs&IsAiring=true" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs">
<h2 class="sectionTitle sectionTitle-cards" style="display: inline-block; vertical-align: middle;">${HeaderOnNow}</h2>
<span class="material-icons chevron_right" aria-hidden="true"></span>
</a>
@ -12,7 +12,7 @@
</div>
<div id="upcomingEpisodes" class="verticalSection">
<div class="sectionTitleContainer sectionTitleContainer-cards padded-left">
<a href="#!/list.html?type=Programs&IsSeries=true&IsMovie=false&IsNews=false" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs">
<a href="#/list.html?type=Programs&IsSeries=true&IsMovie=false&IsNews=false" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs">
<h2 class="sectionTitle sectionTitle-cards" style="display: inline-block; vertical-align: middle;">${Shows}</h2>
<span class="material-icons chevron_right" aria-hidden="true"></span>
</a>
@ -21,7 +21,7 @@
</div>
<div id="upcomingTvMovies" class="verticalSection">
<div class="sectionTitleContainer sectionTitleContainer-cards padded-left">
<a href="#!/list.html?type=Programs&IsMovie=true" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs">
<a href="#/list.html?type=Programs&IsMovie=true" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs">
<h2 class="sectionTitle sectionTitle-cards" style="display: inline-block; vertical-align: middle;">${Movies}</h2>
<span class="material-icons chevron_right" aria-hidden="true"></span>
</a>
@ -30,7 +30,7 @@
</div>
<div id="upcomingSports" class="verticalSection">
<div class="sectionTitleContainer sectionTitleContainer-cards padded-left">
<a href="#!/list.html?type=Programs&IsSports=true" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs">
<a href="#/list.html?type=Programs&IsSports=true" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs">
<h2 class="sectionTitle sectionTitle-cards" style="display: inline-block; vertical-align: middle;">${Sports}</h2>
<span class="material-icons chevron_right" aria-hidden="true"></span>
</a>
@ -39,7 +39,7 @@
</div>
<div id="upcomingKids" class="verticalSection">
<div class="sectionTitleContainer sectionTitleContainer-cards padded-left">
<a href="#!/list.html?type=Programs&IsKids=true" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs">
<a href="#/list.html?type=Programs&IsKids=true" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs">
<h2 class="sectionTitle sectionTitle-cards" style="display: inline-block; vertical-align: middle;">${HeaderForKids}</h2>
<span class="material-icons chevron_right" aria-hidden="true"></span>
</a>
@ -48,7 +48,7 @@
</div>
<div id="upcomingNews" class="verticalSection">
<div class="sectionTitleContainer sectionTitleContainer-cards padded-left">
<a href="#!/list.html?type=Programs&IsNews=true" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs">
<a href="#/list.html?type=Programs&IsNews=true" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs">
<h2 class="sectionTitle sectionTitle-cards" style="display: inline-block; vertical-align: middle;">${News}</h2>
<span class="material-icons chevron_right" aria-hidden="true"></span>
</a>

4
src/controllers/livetvstatus.js
View file

@ -219,9 +219,9 @@ function getProviderName(providerId) {
function getProviderConfigurationUrl(providerId) {
switch (providerId = providerId.toLowerCase()) {
case 'xmltv':
return '#!/livetvguideprovider.html?type=xmltv';
return '#/livetvguideprovider.html?type=xmltv';
case 'schedulesdirect':
return '#!/livetvguideprovider.html?type=schedulesdirect';
return '#/livetvguideprovider.html?type=schedulesdirect';
}
}

2
src/controllers/session/selectServer/index.html
View file

@ -9,7 +9,7 @@
</div>
</div>
<div class="padded-top padded-left padded-right flex flex-shrink-zero justify-content-center verticalSection flex-wrap-wrap margin-auto-x">
<a is="emby-linkbutton" href="#!/addserver.html" class="raised cancel btnAddServer flex-shrink-zero" style="margin: .25em;">
<a is="emby-linkbutton" href="#/addserver.html" class="raised cancel btnAddServer flex-shrink-zero" style="margin: .25em;">
<span>${ButtonAddServer}</span>
</a>
</div>

4
src/controllers/user/menu/index.html
View file

@ -77,7 +77,7 @@
</div>
<div class="adminSection verticalSection verticalSection-extrabottompadding hide">
<h2 class="sectionTitle" style="padding-left:.25em;">${HeaderAdmin}</h2>
<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">
<span class="material-icons listItemIcon listItemIcon-transparent dashboard" aria-hidden="true"></span>
<div class="listItemBody">
@ -85,7 +85,7 @@
</div>
</div>
</a>
<a is="emby-linkbutton" href="#!/edititemmetadata.html" style="display:block;padding:0;margin:0;" class="listItem-border">
<a is="emby-linkbutton" href="#/edititemmetadata.html" style="display:block;padding:0;margin:0;" class="listItem-border">
<div class="listItem">
<span class="material-icons listItemIcon listItemIcon-transparent mode_edit" aria-hidden="true"></span>
<div class="listItemBody">

14
src/controllers/user/menu/index.js
View file

@ -26,13 +26,13 @@ export default function (view, params) {
const userId = params.userId || Dashboard.getCurrentUserId();
const page = this;
page.querySelector('.lnkMyProfile').setAttribute('href', '#!/myprofile.html?userId=' + userId);
page.querySelector('.lnkDisplayPreferences').setAttribute('href', '#!/mypreferencesdisplay.html?userId=' + userId);
page.querySelector('.lnkHomePreferences').setAttribute('href', '#!/mypreferenceshome.html?userId=' + userId);
page.querySelector('.lnkPlaybackPreferences').setAttribute('href', '#!/mypreferencesplayback.html?userId=' + userId);
page.querySelector('.lnkSubtitlePreferences').setAttribute('href', '#!/mypreferencessubtitles.html?userId=' + userId);
page.querySelector('.lnkQuickConnectPreferences').setAttribute('href', '#!/mypreferencesquickconnect.html');
page.querySelector('.lnkControlsPreferences').setAttribute('href', '#!/mypreferencescontrols.html?userId=' + userId);
page.querySelector('.lnkMyProfile').setAttribute('href', '#/myprofile.html?userId=' + userId);
page.querySelector('.lnkDisplayPreferences').setAttribute('href', '#/mypreferencesdisplay.html?userId=' + userId);
page.querySelector('.lnkHomePreferences').setAttribute('href', '#/mypreferenceshome.html?userId=' + userId);
page.querySelector('.lnkPlaybackPreferences').setAttribute('href', '#/mypreferencesplayback.html?userId=' + userId);
page.querySelector('.lnkSubtitlePreferences').setAttribute('href', '#/mypreferencessubtitles.html?userId=' + userId);
page.querySelector('.lnkQuickConnectPreferences').setAttribute('href', '#/mypreferencesquickconnect.html');
page.querySelector('.lnkControlsPreferences').setAttribute('href', '#/mypreferencescontrols.html?userId=' + userId);
const supportsClientSettings = appHost.supports('clientsettings');
page.querySelector('.clientSettings').classList.toggle('hide', !supportsClientSettings);

12
src/scripts/itembynamedetailpage.js
View file

@ -301,26 +301,26 @@ function loadItems(element, item, type, query, listOptions) {
function getMoreItemsHref(item, type) {
if (item.Type === 'Genre') {
return '#!/list.html?type=' + type + '&genreId=' + item.Id + '&serverId=' + item.ServerId;
return '#/list.html?type=' + type + '&genreId=' + item.Id + '&serverId=' + item.ServerId;
}
if (item.Type === 'MusicGenre') {
return '#!/list.html?type=' + type + '&musicGenreId=' + item.Id + '&serverId=' + item.ServerId;
return '#/list.html?type=' + type + '&musicGenreId=' + item.Id + '&serverId=' + item.ServerId;
}
if (item.Type === 'Studio') {
return '#!/list.html?type=' + type + '&studioId=' + item.Id + '&serverId=' + item.ServerId;
return '#/list.html?type=' + type + '&studioId=' + item.Id + '&serverId=' + item.ServerId;
}
if (item.Type === 'MusicArtist') {
return '#!/list.html?type=' + type + '&artistId=' + item.Id + '&serverId=' + item.ServerId;
return '#/list.html?type=' + type + '&artistId=' + item.Id + '&serverId=' + item.ServerId;
}
if (item.Type === 'Person') {
return '#!/list.html?type=' + type + '&personId=' + item.Id + '&serverId=' + item.ServerId;
return '#/list.html?type=' + type + '&personId=' + item.Id + '&serverId=' + item.ServerId;
}
return '#!/list.html?type=' + type + '&parentId=' + item.Id + '&serverId=' + item.ServerId;
return '#/list.html?type=' + type + '&parentId=' + item.Id + '&serverId=' + item.ServerId;
}
function addCurrentItemToQuery(query, item) {

42
src/scripts/libraryMenu.js
View file

@ -293,7 +293,7 @@ import '../assets/css/flexstyles.scss';
function refreshLibraryInfoInDrawer(user) {
let html = '';
html += '<div style="height:.5em;"></div>';
html += `<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder" href="#!/home.html"><span class="material-icons navMenuOptionIcon home" aria-hidden="true"></span><span class="navMenuOptionText">${globalize.translate('Home')}</span></a>`;
html += `<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder" href="#/home.html"><span class="material-icons navMenuOptionIcon home" aria-hidden="true"></span><span class="navMenuOptionText">${globalize.translate('Home')}</span></a>`;
// placeholder for custom menu links
html += '<div class="customMenuOptions"></div>';
@ -306,8 +306,8 @@ import '../assets/css/flexstyles.scss';
html += '<h3 class="sidebarHeader">';
html += globalize.translate('HeaderAdmin');
html += '</h3>';
html += `<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder lnkManageServer" data-itemid="dashboard" href="#!/dashboard.html"><span class="material-icons navMenuOptionIcon dashboard" aria-hidden="true"></span><span class="navMenuOptionText">${globalize.translate('TabDashboard')}</span></a>`;
html += `<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder editorViewMenu" data-itemid="editor" href="#!/edititemmetadata.html"><span class="material-icons navMenuOptionIcon mode_edit" aria-hidden="true"></span><span class="navMenuOptionText">${globalize.translate('Metadata')}</span></a>`;
html += `<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder lnkManageServer" data-itemid="dashboard" href="#/dashboard.html"><span class="material-icons navMenuOptionIcon dashboard" aria-hidden="true"></span><span class="navMenuOptionText">${globalize.translate('TabDashboard')}</span></a>`;
html += `<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder editorViewMenu" data-itemid="editor" href="#/edititemmetadata.html"><span class="material-icons navMenuOptionIcon mode_edit" aria-hidden="true"></span><span class="navMenuOptionText">${globalize.translate('Metadata')}</span></a>`;
html += '</div>';
}
@ -408,28 +408,28 @@ import '../assets/css/flexstyles.scss';
name: globalize.translate('TabServer')
}, {
name: globalize.translate('TabDashboard'),
href: '#!/dashboard.html',
href: '#/dashboard.html',
pageIds: ['dashboardPage'],
icon: 'dashboard'
}, {
name: globalize.translate('General'),
href: '#!/dashboardgeneral.html',
href: '#/dashboardgeneral.html',
pageIds: ['dashboardGeneralPage'],
icon: 'settings'
}, {
name: globalize.translate('HeaderUsers'),
href: '#!/userprofiles.html',
href: '#/userprofiles.html',
pageIds: ['userProfilesPage', 'newUserPage', 'editUserPage', 'userLibraryAccessPage', 'userParentalControlPage', 'userPasswordPage'],
icon: 'people'
}, {
name: globalize.translate('HeaderLibraries'),
href: '#!/library.html',
href: '#/library.html',
pageIds: ['mediaLibraryPage', 'librarySettingsPage', 'libraryDisplayPage', 'metadataImagesConfigurationPage', 'metadataNfoPage'],
icon: 'folder'
}, {
name: globalize.translate('TitlePlayback'),
icon: 'play_arrow',
href: '#!/encodingsettings.html',
href: '#/encodingsettings.html',
pageIds: ['encodingSettingsPage', 'playbackConfigurationPage', 'streamingSettingsPage']
}];
addPluginPagesToMainMenu(links, pluginItems, 'server');
@ -439,19 +439,19 @@ import '../assets/css/flexstyles.scss';
});
links.push({
name: globalize.translate('HeaderDevices'),
href: '#!/devices.html',
href: '#/devices.html',
pageIds: ['devicesPage', 'devicePage'],
icon: 'devices'
});
links.push({
name: globalize.translate('HeaderActivity'),
href: '#!/serveractivity.html',
href: '#/serveractivity.html',
pageIds: ['serverActivityPage'],
icon: 'assessment'
});
links.push({
name: globalize.translate('DLNA'),
href: '#!/dlnasettings.html',
href: '#/dlnasettings.html',
pageIds: ['dlnaSettingsPage', 'dlnaProfilesPage', 'dlnaProfilePage'],
icon: 'input'
});
@ -461,13 +461,13 @@ import '../assets/css/flexstyles.scss';
});
links.push({
name: globalize.translate('LiveTV'),
href: '#!/livetvstatus.html',
href: '#/livetvstatus.html',
pageIds: ['liveTvStatusPage', 'liveTvTunerPage'],
icon: 'live_tv'
});
links.push({
name: globalize.translate('HeaderDVR'),
href: '#!/livetvsettings.html',
href: '#/livetvsettings.html',
pageIds: ['liveTvSettingsPage'],
icon: 'dvr'
});
@ -479,36 +479,36 @@ import '../assets/css/flexstyles.scss';
links.push({
name: globalize.translate('TabNetworking'),
icon: 'cloud',
href: '#!/networking.html',
href: '#/networking.html',
pageIds: ['networkingPage']
});
links.push({
name: globalize.translate('HeaderApiKeys'),
icon: 'vpn_key',
href: '#!/apikeys.html',
href: '#/apikeys.html',
pageIds: ['apiKeysPage']
});
links.push({
name: globalize.translate('TabLogs'),
href: '#!/log.html',
href: '#/log.html',
pageIds: ['logPage'],
icon: 'bug_report'
});
links.push({
name: globalize.translate('TabNotifications'),
icon: 'notifications',
href: '#!/notificationsettings.html',
href: '#/notificationsettings.html',
pageIds: ['notificationSettingsPage', 'notificationSettingPage']
});
links.push({
name: globalize.translate('TabPlugins'),
icon: 'shopping_cart',
href: '#!/installedplugins.html',
href: '#/installedplugins.html',
pageIds: ['pluginsPage', 'pluginCatalogPage']
});
links.push({
name: globalize.translate('TabScheduledTasks'),
href: '#!/scheduledtasks.html',
href: '#/scheduledtasks.html',
pageIds: ['scheduledTasksPage', 'scheduledTaskPage'],
icon: 'schedule'
});
@ -593,7 +593,7 @@ import '../assets/css/flexstyles.scss';
function createDashboardMenu(apiClient) {
return getToolsMenuHtml(apiClient).then(function (toolsMenuHtml) {
let html = '';
html += '<a class="adminDrawerLogo clearLink" is="emby-linkbutton" href="#!/home.html">';
html += '<a class="adminDrawerLogo clearLink" is="emby-linkbutton" href="#/home.html">';
html += '<img src="assets/img/icon-transparent.png" />';
html += '</a>';
html += toolsMenuHtml;
@ -624,7 +624,7 @@ import '../assets/css/flexstyles.scss';
guideView.Name = globalize.translate('Guide');
guideView.ImageTags = {};
guideView.icon = 'dvr';
guideView.url = '#!/livetv.html?tab=1';
guideView.url = '#/livetv.html?tab=1';
list.push(guideView);
}
}