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

fix icons

Browse source
This commit is contained in:
Luke Pulverenti 2015-06-29 21:56:25 -04:00
parent 5317ec6951
commit cc0fd844c3
20 changed files with 92 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

6
dashboard-ui/bower_components/iron-selector/.bower.json vendored
View file

@ -28,14 +28,14 @@
"web-component-tester": "*",
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
},
"homepage": "https://github.com/PolymerElements/iron-selector",
"homepage": "https://github.com/polymerelements/iron-selector",
"_release": "1.0.2",
"_resolution": {
"type": "version",
"tag": "v1.0.2",
"commit": "ea22d91d11ba6f72c01faa952d5e600f9d1773cf"
},
"_source": "git://github.com/PolymerElements/iron-selector.git",
"_source": "git://github.com/polymerelements/iron-selector.git",
"_target": "^1.0.0",
"_originalSource": "PolymerElements/iron-selector"
"_originalSource": "polymerelements/iron-selector"
}

18
dashboard-ui/cordova/android/vlcplayer.js vendored
View file

@ -5,35 +5,35 @@
var self = this;
function onEnded() {
$(self).trigger('ended');
Events.trigger(self, 'ended');
}
function onTimeUpdate() {
$(self).trigger('timeupdate');
Events.trigger(self, 'timeupdate');
}
function onVolumeChange() {
$(self).trigger('volumechange');
Events.trigger(self, 'volumechange');
}
function onPlaying() {
$(self).trigger('playing');
Events.trigger(self, 'playing');
}
function onPlay() {
$(self).trigger('play');
Events.trigger(self, 'play');
}
function onPause() {
$(self).trigger('pause');
Events.trigger(self, 'pause');
}
function onClick() {
$(self).trigger('click');
Events.trigger(self, 'click');
}
function onDblClick() {
$(self).trigger('dblclick');
Events.trigger(self, 'dblclick');
}
function onError() {
@ -41,7 +41,7 @@
var errorCode = this.error ? this.error.code : '';
Logger.log('Media element error code: ' + errorCode);
$(self).trigger('error');
Events.trigger(self, 'error');
}
var playerState = {};

2
dashboard-ui/cordova/ios/orientation.js vendored
View file

@ -7,7 +7,7 @@
// Try to make it react quicker to the orientation change
doc.scrollTop(doc.scrollTop() + 1);
$('.libraryViewNav').filter(':visible').hide().show();
$('paper-tabs').filter(':visible').hide().show();
}
function onOrientationChange() {

14
dashboard-ui/nowplaying.html
View file

@ -43,23 +43,23 @@
<paper-fab icon="stop" class="btnPlayStateCommand btnStop subdued" title="${ButtonStop}"></paper-fab>
<paper-fab icon="skip-next" class="btnPlayStateCommand btnNextTrack subdued" title="${ButtonNextTrack}"></paper-fab>
</div>
<div>
<paper-fab icon="volume-up" class="btnCommand subdued" title="${ButtonVolumeUp}" data-command="VolumeUp"></paper-fab>
<paper-fab icon="volume-off" class="btnCommand subdued" title="${ButtonMute}" data-command="ToggleMute"></paper-fab>
<div class="buttonsRow2">
<paper-fab icon="volume-up" class="btnCommand subdued volumeButton" title="${ButtonVolumeUp}" data-command="VolumeUp"></paper-fab>
<paper-fab icon="volume-off" class="btnCommand subdued volumeButton" title="${ButtonMute}" data-command="ToggleMute"></paper-fab>
<paper-fab icon="info" class="btnCommand videoButton subdued" title="${ButtonOsd}" data-command="ToggleOsdMenu"></paper-fab>
<paper-fab icon="fullscreen" class="btnToggleFullscreen videoButton btnPlayStateCommand subdued" title="${ButtonFullscreen}" data-command="ToggleFullscreen"></paper-fab>
</div>
<div>
<paper-fab icon="volume-down" class="btnCommand subdued" title="${ButtonVolumeDown}" data-command="VolumeDown"></paper-fab>
<div class="buttonsRow3">
<paper-fab icon="volume-down" class="btnCommand subdued volumeButton" title="${ButtonVolumeDown}" data-command="VolumeDown"></paper-fab>
<paper-fab icon="audiotrack" class="btnAudioTracks videoButton btnPlayStateCommand subdued" title="${ButtonAudioTracks}" data-command="GoToSearch"></paper-fab>
<paper-fab icon="subtitles" class="btnSubtitles videoButton btnPlayStateCommand subdued" title="${ButtonSubtitles}" data-command="GoToSearch"></paper-fab>
<paper-fab icon="movie" class="btnChapters videoButton btnPlayStateCommand subdued" title="${ButtonScenes}" data-command="GoToSearch"></paper-fab>
</div>
</div>
<div class="nowPlayingPageUserDataButtons" style="margin-top:1.5em;">
<div class="nowPlayingPageUserDataButtons" style="margin-top:1em;">
</div>
</div>
</div>
</neon-animatable>
<neon-animatable>
<div style="text-align:center;">

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

@ -115,16 +115,16 @@
var resumePosition = (item.UserData || {}).PlaybackPositionTicks || 0;
html += '<button type="button" class="btnPlayItem" data-itemid="' + item.Id + '" data-itemtype="' + item.Type + '" data-isfolder="' + item.IsFolder + '" data-mediatype="' + item.MediaType + '" data-resumeposition="' + resumePosition + '" data-mini="true" data-inline="true" data-icon="play" data-iconpos="notext" title="' + Globalize.translate('ButtonPlay') + '" style="' + buttonMargin + '">' + Globalize.translate('ButtonPlay') + '</button>';
html += '<paper-icon-button icon="play-circle-filled" class="btnPlayItem" data-itemid="' + item.Id + '" data-itemtype="' + item.Type + '" data-isfolder="' + item.IsFolder + '" data-mediatype="' + item.MediaType + '" data-resumeposition="' + resumePosition + '"></paper-icon-button>';
buttonCount++;
}
if (commands.indexOf('trailer') != -1) {
html += '<button type="button" data-mini="true" data-inline="true" data-icon="video" data-iconpos="notext" class="btnPlayTrailer" data-itemid="' + item.Id + '" title="' + Globalize.translate('ButtonPlayTrailer') + '" style="' + buttonMargin + '">' + Globalize.translate('ButtonPlayTrailer') + '</button>';
html += '<paper-icon-button icon="videocam" class="btnPlayTrailer" data-itemid="' + item.Id + '"></paper-icon-button>';
buttonCount++;
}
html += '<button type="button" class="btnMoreCommands" data-mini="true" data-inline="true" data-icon="ellipsis-v" data-iconpos="notext" title="' + Globalize.translate('ButtonMore') + '" style="' + buttonMargin + '">' + Globalize.translate('ButtonMore') + '</button>';
html += '<paper-icon-button icon="more-vert" class="btnMoreCommands"></paper-icon-button>';
buttonCount++;
html += '</div>';

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

@ -482,7 +482,7 @@
}
function showUserAtTop() {
return $.browser.mobile || AppInfo.isNativeApp;
return AppInfo.isNativeApp;
}
var requiresLibraryMenuRefresh = false;
@ -770,7 +770,7 @@
});
}
if (!$.browser.mobile) {
if (!AppInfo.isNativeApp) {
darkDrawer = true;
}
}

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

@ -50,7 +50,7 @@
LiveTvHelpers.renderMiscProgramInfo($('.miscTvProgramInfo', page), item);
$(page).trigger('displayingitem', [{
Events.trigger(page, 'displayingitem', [{
item: item,
context: 'livetv'

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

@ -67,7 +67,7 @@
});
}
$('#recentlyAddedItems', page).html(html).lazyChildren().trigger('create');
$('#recentlyAddedItems', page).html(html).lazyChildren();
});
}
@ -128,7 +128,7 @@
});
}
$('#resumableItems', page).html(html).lazyChildren().trigger('create');
$('#resumableItems', page).html(html).lazyChildren();
});
}

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

@ -11,7 +11,7 @@
ApiClient.getUser(userId).done(function (user) {
$('.username', page).html(user.Name);
$('#uploadUserImage', page).val('').trigger('change');
Events.trigger($('#uploadUserImage', page).val('')[0], 'change');
Dashboard.setPageTitle(user.Name);

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

@ -175,7 +175,7 @@
elem = $(getNowPlayingBarHtml()).insertBefore('#footerNotifications')[0];
if ($.browser.safari && $.browser.mobile) {
if (($.browser.safari || !AppInfo.isNativeApp) && $.browser.mobile) {
// Not handled well here. The wrong elements receive events, bar doesn't update quickly enough, etc.
elem.classList.add('noMediaProgress');
}

14
dashboard-ui/scripts/nowplayingpage.js
View file

@ -476,6 +476,20 @@
$('.videoButton', page).css('visibility', 'hidden');
}
if (playerInfo.isLocalPlayer && AppInfo.hasPhysicalVolumeButtons) {
$('.volumeButton', page).css('visibility', 'hidden');
} else {
$('.volumeButton', page).css('visibility', 'visible');
}
if (playerInfo.isLocalPlayer && AppInfo.hasPhysicalVolumeButtons && item && item.MediaType == 'Audio') {
$('.buttonsRow2', page).hide();
$('.buttonsRow3', page).hide();
} else {
$('.buttonsRow2', page).show();
$('.buttonsRow3', page).show();
}
updateNowPlayingInfo(page, state);
}

14
dashboard-ui/scripts/registrationservices.js
View file

@ -84,29 +84,29 @@
addRecurringFields: function (page, period) {
var formSelector = '.supporterForm';
var form = page.querySelector('.supporterForm');
// Add recurring fields to form
$("<input type='hidden' name='a3' class='pprecurring' />")
.attr('value', $('#donateAmt', page).val())
.appendTo(formSelector, page);
.appendTo(form);
$("<input type='hidden' name='p3' value='1' class='pprecurring' />")
.appendTo(formSelector, page);
.appendTo(form);
$("<input type='hidden' name='t3' value='" + period + "' class='pprecurring' />")
.appendTo(formSelector, page);
.appendTo(form);
$("<input type='hidden' name='src' value='1' class='pprecurring' />")
.appendTo(formSelector, page);
.appendTo(form);
$("<input type='hidden' name='sra' value='1' class='pprecurring' />")
.appendTo(formSelector, page);
.appendTo(form);
//change command for subscriptions
$('#ppCmd', page).val('_xclick-subscriptions');
$(formSelector, page).trigger('create');
Events.trigger(form, 'create');
},

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

@ -296,7 +296,7 @@
function firePlaybackEvent(name, session) {
$(player).trigger(name, [getPlayerState(session)]);
Events.trigger(player, name, [getPlayerState(session)]);
}
function onWebSocketConnectionChange() {

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

@ -147,7 +147,7 @@
var page = $.mobile.activePage;
$('#selectTriggerType', page).val('DailyTrigger').trigger('change').selectmenu('refresh');
Events.trigger($('#selectTriggerType', page).val('DailyTrigger').selectmenu('refresh')[0], 'change');
$('#popupAddTrigger', page).on("popupafteropen", function () {
$('#addTriggerForm input:first', this).focus();

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

@ -177,7 +177,8 @@
html += getSyncJobHtml(page, job, cardBoxCssClass, syncJobPage);
}
var elem = $('.syncActivity', page).html(html).trigger('create').lazyChildren();
var elem = $('.syncActivity', page).html(html).lazyChildren();
Events.trigger(elem[0], 'create');
$('.btnJobMenu', elem).on('click', function () {
showJobMenu(this);

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

@ -35,7 +35,7 @@
totalRecordCount: result.TotalRecordCount,
viewButton: true,
showLimit: false
})).trigger('create');
}));
updateFilterControls(page);
@ -190,7 +190,7 @@
LibraryBrowser.getSavedViewSetting(viewkey).done(function (val) {
if (val) {
$('#selectView', page).val(val).selectmenu('refresh').trigger('change');
Events.trigger($('#selectView', page).val(val).selectmenu('refresh')[0], 'change');
} else {
reloadItems(page);
}

27
dashboard-ui/scripts/tvstudios.js
View file

@ -1,23 +1,36 @@
(function ($, document) {
// The base query options
var query = {
var data = {};
function getQuery() {
var key = getWindowUrl();
var pageData = data[key];
if (!pageData) {
pageData = data[key] = {
query: {
SortBy: "SortName",
SortOrder: "Ascending",
IncludeItemTypes: "Series",
Recursive: true,
Fields: "DateCreated,ItemCounts",
StartIndex: 0
}
};
}
return pageData.query;
}
function getSavedQueryKey() {
return 'tvstudios' + (query.ParentId || '');
return 'tvstudios' + (getQuery().ParentId || '');
}
function reloadItems(page) {
var query = getQuery();
Dashboard.showLoadingMsg();
ApiClient.getStudios(Dashboard.getCurrentUserId(), query).done(function (result) {
@ -33,7 +46,7 @@
totalRecordCount: result.TotalRecordCount,
viewButton: true,
showLimit: false
})).trigger('create');
}));
updateFilterControls(page);
@ -71,6 +84,8 @@
function updateFilterControls(page) {
var query = getQuery();
$('.chkStandardFilter', page).each(function () {
var filters = "," + (query.Filters || "");
@ -89,6 +104,8 @@
$('.chkStandardFilter', this).on('change', function () {
var query = getQuery();
var filterName = this.getAttribute('data-filter');
var filters = query.Filters || "";
@ -105,6 +122,8 @@
});
$('#selectPageSize', page).on('change', function () {
var query = getQuery();
query.Limit = parseInt(this.value);
query.StartIndex = 0;
reloadItems(page);
@ -112,6 +131,8 @@
}).on('pagebeforeshowready', "#tvStudiosPage", function () {
var query = getQuery();
query.ParentId = LibraryMenu.getTopParentId();
var limit = LibraryBrowser.getDefaultPageSize();

2
dashboard-ui/themes/ios.css
View file

@ -145,7 +145,7 @@ h1, h1 a {
}
.bottomFab {
bottom: 70px;
bottom: 70px !important;
}
.sidebarLinkText {

1
dashboard-ui/thirdparty/emby-icons.html vendored
View file

@ -108,6 +108,7 @@ See [iron-iconset](#iron-iconset) and [iron-iconset-svg](#iron-iconset-svg) for
<g id="keyboard-arrow-up"><path d="M7.41 15.41L12 10.83l4.59 4.58L18 14l-6-6-6 6z" /></g>
<g id="queue-music"><path d="M15 6H3v2h12V6zm0 4H3v2h12v-2zM3 16h8v-2H3v2zM17 6v8.18c-.31-.11-.65-.18-1-.18-1.66 0-3 1.34-3 3s1.34 3 3 3 3-1.34 3-3V8h3V6h-5z" /></g>
<g id="games"><path d="M15 7.5V2H9v5.5l3 3 3-3zM7.5 9H2v6h5.5l3-3-3-3zM9 16.5V22h6v-5.5l-3-3-3 3zM16.5 9l-3 3 3 3H22V9h-5.5z" /></g>
<g id="play-circle-filled"><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm-2 14.5v-9l6 4.5-6 4.5z" /></g>
</defs>
</svg>
</iron-iconset-svg>

1
dashboard-ui/vulcanize-out.html
View file

@ -17114,6 +17114,7 @@ paper-ripple {
<g id="keyboard-arrow-up"><path d="M7.41 15.41L12 10.83l4.59 4.58L18 14l-6-6-6 6z"></path></g>
<g id="queue-music"><path d="M15 6H3v2h12V6zm0 4H3v2h12v-2zM3 16h8v-2H3v2zM17 6v8.18c-.31-.11-.65-.18-1-.18-1.66 0-3 1.34-3 3s1.34 3 3 3 3-1.34 3-3V8h3V6h-5z"></path></g>
<g id="games"><path d="M15 7.5V2H9v5.5l3 3 3-3zM7.5 9H2v6h5.5l3-3-3-3zM9 16.5V22h6v-5.5l-3-3-3 3zM16.5 9l-3 3 3 3H22V9h-5.5z"></path></g>
<g id="play-circle-filled"><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm-2 14.5v-9l6 4.5-6 4.5z"></path></g>
</defs>
</svg>
</iron-iconset-svg>