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 external subs

Browse source
This commit is contained in:
Luke Pulverenti 2015-09-12 12:39:24 -04:00
parent 0f37b99468
commit 10bcfa593b
13 changed files with 110 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dashboard-ui/css/librarybrowser.css
View file

@ -504,6 +504,10 @@ span.itemCommunityRating:not(:empty) + .userDataIcons {
max-height: 300px; max-height: 300px;
} }
.portraitDetailImageContainer img {
max-width: 220px;
}
.squareDetailImageContainer { .squareDetailImageContainer {
margin-top: -150px; margin-top: -150px;
} }

2
dashboard-ui/livetv.html
View file

@ -133,7 +133,7 @@
</neon-animated-pages> </neon-animated-pages>
</div> </div>
<div data-role="panel" class="viewPanel channelViewPanel" data-theme="a" data-position="right" data-display="overlay" data-position-fixed="true"> <div data-role="panel" class="viewPanel channelViewPanel hide" data-theme="a" data-position="right" data-display="overlay" data-position-fixed="true">
<div class="ui-panel-inner"> <div class="ui-panel-inner">
<form> <form>
<div> <div>

30
dashboard-ui/livetvstatus.html
View file

@ -4,7 +4,7 @@
<title>${TitleLiveTV}</title> <title>${TitleLiveTV}</title>
</head> </head>
<body> <body>
<div id="liveTvStatusPage" data-role="page" class="page type-interior liveTvSettingsPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Live%20TV" data-require="jqmtable,scripts/livetvstatus,scripts/taskbutton,detailtablecss"> <div id="liveTvStatusPage" data-role="page" class="page type-interior liveTvSettingsPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Live%20TV" data-require="scripts/livetvstatus">
<div data-role="content"> <div data-role="content">
<div class="content-primary"> <div class="content-primary">
@ -19,37 +19,29 @@
<div class="liveTvStatusContent" style="display: none;"> <div class="liveTvStatusContent" style="display: none;">
<h1>${HeaderTunerDevices}</h1> <div>
<paper-button raised class="submit btnAddDevice block"><iron-icon icon="add"></iron-icon><span>${ButtonAdd}</span></paper-button> <h1 style="display:inline-block;vertical-align:middle;">${HeaderTunerDevices}</h1>
<paper-fab class="btnAddDevice mini" icon="add" title="${ButtonAdd}" style="margin-left:1em;"></paper-fab>
</div>
<div class="devicesList"> <div class="devicesList">
</div> </div>
<div> <div>
<br /> <br />
<h1>${HeaderGuideProviders}</h1> <div>
<h1 style="display:inline-block;vertical-align:middle;">${HeaderGuideProviders}</h1>
<paper-fab class="btnAddProvider mini" icon="add" title="${ButtonAdd}" style="margin-left:1em;"></paper-fab>
</div>
<p>${AddGuideProviderHelp}</p> <p>${AddGuideProviderHelp}</p>
<paper-button raised class="submit btnAddProvider block"><iron-icon icon="add"></iron-icon><span>${ButtonAdd}</span></paper-button>
<div class="providerList"> <div class="providerList">
</div> </div>
</div> </div>
<br /> <br />
<h1>${HeaderTvTuners}</h1> <h1>${HeaderTvTuners}</h1>
<table data-role="table" data-mode="reflow" class="tblTuners stripedTable ui-responsive table-stroke"> <div class="tunerList">
<thead> </div>
<tr>
<th>${HeaderName}</th>
<th>${HeaderSource}</th>
<th>${HeaderStatus}</th>
<th>${HeaderProgram}</th>
<th>${HeaderClients}</th>
<th></th>
</tr>
</thead>
<tbody class="tunersResultBody"></tbody>
</table>
</div> </div>
<div class="servicesSection" style="display:none;"> <div class="servicesSection" style="display:none;">

6
dashboard-ui/movies.html
View file

@ -139,7 +139,7 @@
</neon-animated-pages> </neon-animated-pages>
</div> </div>
<div data-role="panel" class="viewPanel movieViewPanel" data-theme="a" data-position="right" data-display="overlay" data-position-fixed="true"> <div data-role="panel" class="viewPanel movieViewPanel hide" data-theme="a" data-position="right" data-display="overlay" data-position-fixed="true">
<div class="ui-panel-inner"> <div class="ui-panel-inner">
<form> <form>
@ -248,7 +248,7 @@
</div> </div>
</div> </div>
<div data-role="panel" class="viewPanel trailerViewPanel" data-theme="a" data-position="right" data-display="overlay" data-position-fixed="true"> <div data-role="panel" class="viewPanel trailerViewPanel hide" data-theme="a" data-position="right" data-display="overlay" data-position-fixed="true">
<div class="ui-panel-inner"> <div class="ui-panel-inner">
<form> <form>
@ -290,7 +290,7 @@
</form> </form>
</div> </div>
</div> </div>
<div data-role="panel" class="viewPanel peopleViewPanel" data-theme="a" data-position="right" data-display="overlay" data-position-fixed="true"> <div data-role="panel" class="viewPanel peopleViewPanel hide" data-theme="a" data-position="right" data-display="overlay" data-position-fixed="true">
<div class="ui-panel-inner"> <div class="ui-panel-inner">
<form> <form>

8
dashboard-ui/music.html
View file

@ -136,7 +136,7 @@
</neon-animated-pages> </neon-animated-pages>
</div> </div>
<div data-role="panel" class="viewPanel albumsViewPanel" data-theme="a" data-position="right" data-display="overlay" data-position-fixed="true"> <div data-role="panel" class="viewPanel albumsViewPanel hide" data-theme="a" data-position="right" data-display="overlay" data-position-fixed="true">
<div class="ui-panel-inner"> <div class="ui-panel-inner">
<form> <form>
@ -192,7 +192,7 @@
</div> </div>
</div> </div>
<div data-role="panel" class="viewPanel artistsViewPanel" data-theme="a" data-position="right" data-display="overlay" data-position-fixed="true"> <div data-role="panel" class="viewPanel artistsViewPanel hide" data-theme="a" data-position="right" data-display="overlay" data-position-fixed="true">
<div class="ui-panel-inner"> <div class="ui-panel-inner">
<form> <form>
@ -227,7 +227,7 @@
</div> </div>
</div> </div>
<div data-role="panel" class="viewPanel albumArtistsViewPanel" data-theme="a" data-position="right" data-display="overlay" data-position-fixed="true"> <div data-role="panel" class="viewPanel albumArtistsViewPanel hide" data-theme="a" data-position="right" data-display="overlay" data-position-fixed="true">
<div class="ui-panel-inner"> <div class="ui-panel-inner">
<form> <form>
@ -263,7 +263,7 @@
</div> </div>
</div> </div>
<div data-role="panel" class="viewPanel songsViewPanel" data-theme="a" data-position="right" data-display="overlay" data-position-fixed="true"> <div data-role="panel" class="viewPanel songsViewPanel hide" data-theme="a" data-position="right" data-display="overlay" data-position-fixed="true">
<div class="ui-panel-inner"> <div class="ui-panel-inner">
<form> <form>

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

@ -361,7 +361,7 @@
// on here // on here
$('.btnOrganize', page).taskButton({ $('.btnOrganize', page).taskButton({
mode: 'on', mode: 'on',
progressElem: $('.organizeProgress', page), progressElem: page.querySelector('.organizeProgress'),
panel: $('.organizeTaskPanel', page), panel: $('.organizeTaskPanel', page),
taskKey: 'AutoOrganize' taskKey: 'AutoOrganize'
}); });

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

@ -2520,6 +2520,11 @@
}, },
openViewPanel: function (btn, className) {
$('.' + className, jQuery(btn).parents('.page')).removeClass('hide').panel('toggle');
},
getQueryPagingHtml: function (options) { getQueryPagingHtml: function (options) {
var startIndex = options.startIndex; var startIndex = options.startIndex;
@ -2583,7 +2588,7 @@
//html += '<paper-button raised class="subdued notext"><iron-icon icon="view-comfy"></iron-icon></paper-button>'; //html += '<paper-button raised class="subdued notext"><iron-icon icon="view-comfy"></iron-icon></paper-button>';
var viewPanelClass = options.viewPanelClass || 'viewPanel'; var viewPanelClass = options.viewPanelClass || 'viewPanel';
var title = options.viewIcon == 'filter-list' ? Globalize.translate('ButtonFilter') : Globalize.translate('ButtonMenu'); var title = options.viewIcon == 'filter-list' ? Globalize.translate('ButtonFilter') : Globalize.translate('ButtonMenu');
html += '<paper-icon-button title="' + title + '" icon="' + (options.viewIcon || AppInfo.moreIcon) + '" onclick="jQuery(\'.' + viewPanelClass + '\', jQuery(this).parents(\'.page\')).panel(\'toggle\');"></paper-icon-button>'; html += '<paper-icon-button title="' + title + '" icon="' + (options.viewIcon || AppInfo.moreIcon) + '" onclick="LibraryBrowser.openViewPanel(this, \'' + viewPanelClass + '\');"></paper-icon-button>';
} }
html += '</div>'; html += '</div>';

87
dashboard-ui/scripts/livetvstatus.js
View file

@ -24,70 +24,64 @@
var html = ''; var html = '';
for (var i = 0, length = tuners.length; i < length; i++) { if (tuners.length) {
html += '<div class="paperList">';
var tuner = tuners[i]; for (var i = 0, length = tuners.length; i < length; i++) {
html += '<tr>'; var tuner = tuners[i];
html += '<paper-icon-item>';
html += '<td>'; html += '<paper-fab class="listAvatar" style="background:#52B54B;" icon="live-tv" item-icon></paper-fab>';
html += tuner.Name;
html += '</td>';
html += '<td>'; html += '<paper-item-body two-line>';
html += tuner.SourceType;
html += '</td>';
html += '<td>'; html += '<div>';
html += tuner.Name;
html += '</div>';
if (tuner.Status == 'RecordingTv') { html += '<div secondary>';
if (tuner.ChannelName) { html += tuner.SourceType;
html += '</div>';
html += '<a href="itemdetails.html?id=' + tuner.ChannelId + '">'; html += '<div secondary>';
html += Globalize.translate('StatusRecordingProgram').replace('{0}', tuner.ChannelName); if (tuner.Status == 'RecordingTv') {
html += '</a>'; if (tuner.ChannelName) {
} else {
html += Globalize.translate('StatusRecording'); html += '<a href="itemdetails.html?id=' + tuner.ChannelId + '">';
html += Globalize.translate('StatusRecordingProgram').replace('{0}', tuner.ChannelName);
html += '</a>';
} else {
html += Globalize.translate('StatusRecording');
}
} }
} else if (tuner.Status == 'LiveTv') {
else if (tuner.Status == 'LiveTv') {
if (tuner.ChannelName) { if (tuner.ChannelName) {
html += '<a href="itemdetails.html?id=' + tuner.ChannelId + '">'; html += '<a href="itemdetails.html?id=' + tuner.ChannelId + '">';
html += Globalize.translate('StatusWatchingProgram').replace('{0}', tuner.ChannelName); html += Globalize.translate('StatusWatchingProgram').replace('{0}', tuner.ChannelName);
html += '</a>'; html += '</a>';
} else { } else {
html += Globalize.translate('StatusWatching'); html += Globalize.translate('StatusWatching');
}
} }
} else {
else { html += tuner.Status;
html += tuner.Status; }
} html += '</div>';
html += '</td>';
html += '<td>'; html += '</paper-item-body>';
html += '<paper-icon-button icon="refresh" data-tunerid="' + tuner.Id + '" title="' + Globalize.translate('ButtonResetTuner') + '" class="btnResetTuner"></paper-icon-button>';
if (tuner.ProgramName) { html += '</paper-icon-item>';
html += tuner.ProgramName;
} }
html += '</td>'; html += '</div>';
html += '<td>';
html += tuner.Clients.join('<br/>');
html += '</td>';
html += '<td>';
html += '<paper-icon-button data-tunerid="' + tuner.Id + '" icon="refresh" class="btnResetTuner" title="' + Globalize.translate('ButtonResetTuner') + '"></paper-icon-button>';
html += '</td>';
html += '</tr>';
} }
var elem = $('.tunersResultBody', page).html(html).parents('.tblTuners').table("refresh").trigger('create'); var elem = $('.tunerList', page).html(html);
$('.btnResetTuner', elem).on('click', function () { $('.btnResetTuner', elem).on('click', function () {
@ -498,6 +492,7 @@
var page = this; var page = this;
reload(page); reload(page);
}); });
})(jQuery, document, window); })(jQuery, document, window);

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

@ -378,7 +378,7 @@ var WizardLibraryPage = {
// on here // on here
$('.btnRefresh', page).taskButton({ $('.btnRefresh', page).taskButton({
mode: 'on', mode: 'on',
progressElem: $('.refreshProgress', page), progressElem: page.querySelector('.refreshProgress'),
lastResultElem: $('.lastRefreshResult', page), lastResultElem: $('.lastRefreshResult', page),
taskKey: 'RefreshLibrary' taskKey: 'RefreshLibrary'
}); });

50
dashboard-ui/scripts/mediaplayer.js
View file

@ -438,30 +438,38 @@
Format: 'srt', Format: 'srt',
Method: 'Embed' Method: 'Embed'
}); });
//profile.SubtitleProfiles.push({ profile.SubtitleProfiles.push({
// Format: 'ass', Format: 'ass',
// Method: 'Embed' Method: 'Embed'
//}); });
//profile.SubtitleProfiles.push({ profile.SubtitleProfiles.push({
// Format: 'ssa', Format: 'ssa',
// Method: 'Embed' Method: 'Embed'
//}); });
//profile.SubtitleProfiles.push({ profile.SubtitleProfiles.push({
// Format: 'pgs', Format: 'pgs',
// Method: 'Embed' Method: 'Embed'
//}); });
//profile.SubtitleProfiles.push({ profile.SubtitleProfiles.push({
// Format: 'pgssub', Format: 'pgssub',
// Method: 'Embed' Method: 'Embed'
//}); });
//profile.SubtitleProfiles.push({ profile.SubtitleProfiles.push({
// Format: 'dvdsub', Format: 'dvdsub',
// Method: 'Embed' Method: 'Embed'
//}); });
profile.SubtitleProfiles.push({ profile.SubtitleProfiles.push({
Format: 'vtt', Format: 'vtt',
Method: 'Embed' Method: 'Embed'
}); });
profile.SubtitleProfiles.push({
Format: 'sub',
Method: 'Embed'
});
profile.SubtitleProfiles.push({
Format: 'idx',
Method: 'Embed'
});
} else { } else {
profile.SubtitleProfiles.push({ profile.SubtitleProfiles.push({
Format: 'vtt', Format: 'vtt',
@ -733,7 +741,7 @@
if (positionSlider) { if (positionSlider) {
positionSlider.disabled = !canClientSeek; positionSlider.disabled = !((self.currentDurationTicks || 0) > 0 || canClientSeek);
} }
if (currentTimeElement) { if (currentTimeElement) {

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

@ -317,7 +317,7 @@
// on here // on here
$('.btnSync', page).taskButton({ $('.btnSync', page).taskButton({
mode: 'on', mode: 'on',
progressElem: $('.syncProgress', page), progressElem: page.querySelector('.syncProgress'),
taskKey: 'SyncPrepare' taskKey: 'SyncPrepare'
}); });

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

@ -39,12 +39,12 @@ $.fn.taskButton = function (options) {
var progress = (task.CurrentProgressPercentage || 0).toFixed(1); var progress = (task.CurrentProgressPercentage || 0).toFixed(1);
if (options.progressElem) { if (options.progressElem) {
var progressElem = options.progressElem.val(progress); options.progressElem.value = progress;
if (task.State == 'Running') { if (task.State == 'Running') {
progressElem.show(); options.progressElem.classList.remove('hide');
} else { } else {
progressElem.hide(); options.progressElem.classList.add('hide');
} }
} }

5
dashboard-ui/thirdparty/paper-button-style.css vendored
View file

@ -278,6 +278,11 @@ paper-fab {
height: 22px; height: 22px;
} }
paper-fab.mini iron-icon {
width: 22px;
height: 22px;
}
paper-fab.subdued { paper-fab.subdued {
background: #404040; background: #404040;
color: #fff; color: #fff;