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 action sheet

Browse source
This commit is contained in:
Luke Pulverenti 2016-05-20 01:36:57 -04:00
parent 619cad7f41
commit 68ad751b25
9 changed files with 51 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dashboard-ui/bower_components/emby-webcomponents/.bower.json vendored
View file

@ -16,12 +16,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.3.49", "version": "1.3.50",
"_release": "1.3.49", "_release": "1.3.50",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.3.49", "tag": "1.3.50",
"commit": "9838b499815bcaf95d4d50c4476c3b95173ffc30" "commit": "2c09d5bf9a8f9698095956faca9a8fa55886cb42"
}, },
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.0", "_target": "^1.2.0",

22
dashboard-ui/bower_components/emby-webcomponents/actionsheet/actionsheet.css vendored
View file

@ -22,7 +22,9 @@
flex-direction: column; flex-direction: column;
display: flex; display: flex;
justify-content: center; justify-content: center;
height: 100%; flex-grow: 1;
align-items: center;
text-align: center;
} }
.actionSheetMenuItem { .actionSheetMenuItem {
@ -40,8 +42,8 @@
} }
.layout-tv .actionSheetMenuItem { .layout-tv .actionSheetMenuItem {
padding-top: .2em; padding-top: .16em;
padding-bottom: .2em; padding-bottom: .16em;
} }
.actionSheetItemIcon { .actionSheetItemIcon {
@ -49,27 +51,25 @@
} }
.actionSheetScroller { .actionSheetScroller {
max-height: 60%;
overflow-x: hidden;
overflow-y: auto;
/* Override default style being applied by polymer */ /* Override default style being applied by polymer */
margin-bottom: 0 !important; margin-bottom: 0 !important;
scroll-behavior: smooth; flex-grow: 1;
} }
.actionSheetScroller::-webkit-scrollbar, .actionSheetScroller::-webkit-scrollbar { .layout-tv .actionSheetScroller {
width: 0 !important; max-height: 60%;
display: none; }
}
h1.actionSheetTitle { h1.actionSheetTitle {
margin: .5em 0 1em !important; margin: .5em 0 1em !important;
padding: 0 1em; padding: 0 1em;
flex-grow: 0;
} }
h2.actionSheetTitle { h2.actionSheetTitle {
margin: .25em 0 .55em !important; margin: .25em 0 .55em !important;
padding: 0 1em; padding: 0 1em;
flex-grow: 0;
} }
.actionSheet.extraSpacing { .actionSheet.extraSpacing {

4
dashboard-ui/bower_components/emby-webcomponents/actionsheet/actionsheet.js vendored
View file

@ -1,4 +1,4 @@
define(['dialogHelper', 'layoutManager', 'globalize', 'paper-button', 'css!./actionsheet', 'html!./../icons/nav.html'], function (dialogHelper, layoutManager, globalize) { define(['dialogHelper', 'layoutManager', 'globalize', 'paper-button', 'css!./actionsheet', 'html!./../icons/nav.html', 'scrollStyles'], function (dialogHelper, layoutManager, globalize) {
function parentWithClass(elem, className) { function parentWithClass(elem, className) {
@ -130,7 +130,7 @@
} }
} }
html += '<div class="actionSheetScroller">'; html += '<div class="actionSheetScroller hiddenScrollY">';
options.items.forEach(function (o) { options.items.forEach(function (o) {
o.ironIcon = o.selected ? 'nav:check' : null; o.ironIcon = o.selected ? 'nav:check' : null;

2
dashboard-ui/bower_components/emby-webcomponents/viewmanager/viewcontainer-lite.js vendored
View file

@ -93,7 +93,7 @@ define(['browser'], function (browser) {
function animate(newAnimatedPage, oldAnimatedPage, transition, isBack) { function animate(newAnimatedPage, oldAnimatedPage, transition, isBack) {
if (enableAnimation() && newAnimatedPage.animate) { if (enableAnimation() && oldAnimatedPage && newAnimatedPage.animate) {
if (transition == 'slide') { if (transition == 'slide') {
return slide(newAnimatedPage, oldAnimatedPage, transition, isBack); return slide(newAnimatedPage, oldAnimatedPage, transition, isBack);
} else if (transition == 'fade') { } else if (transition == 'fade') {

2
dashboard-ui/components/viewcontainer-lite.js
View file

@ -195,7 +195,7 @@ define(['browser'], function (browser) {
function animate(newAnimatedPage, oldAnimatedPage, transition, isBack) { function animate(newAnimatedPage, oldAnimatedPage, transition, isBack) {
if (enableAnimation() && newAnimatedPage.animate) { if (enableAnimation() && oldAnimatedPage && newAnimatedPage.animate) {
if (transition == 'slide') { if (transition == 'slide') {
return slide(newAnimatedPage, oldAnimatedPage, transition, isBack); return slide(newAnimatedPage, oldAnimatedPage, transition, isBack);
} else if (transition == 'fade') { } else if (transition == 'fade') {

9
dashboard-ui/dashboard.html
View file

@ -62,6 +62,15 @@
</emby-collapsible> </emby-collapsible>
</div> </div>
<div class="healthMonitorSection hide" style="margin-top: 2em;">
<h1 style="display:flex;align-items:center;">
<div>${HeaderHealthMonitor}</div>
<button is="paper-icon-button-light" type="button" style="margin-left:.5em;"><iron-icon icon="refresh"></iron-icon></button>
</h1>
<div class="healthMonitor paperList">
</div>
</div>
<div class="activeDevicesCollapsible" style="margin-top: 2em;"> <div class="activeDevicesCollapsible" style="margin-top: 2em;">
<h1>${HeaderActiveDevices}</h1> <h1>${HeaderActiveDevices}</h1>
<div class="activeDevices"> <div class="activeDevices">

18
dashboard-ui/scripts/dashboardpage.js
View file

@ -1,5 +1,21 @@
define(['datetime'], function (datetime) { define(['datetime'], function (datetime) {
function renderNoHealthAlertsMessage(page) {
var html = '<p style="padding:0 .5em;display:flex;align-items:center;">';
html += '<iron-icon icon="check" style="margin-right:.5em;background-color: #52B54B;border-radius:1em;color: #fff;"></iron-icon>';
html += Globalize.translate('HealthMonitorNoAlerts') + '</p>';
page.querySelector('.healthMonitor').innerHTML = html;
}
function refreshHealthMonitor(page) {
renderNoHealthAlertsMessage(page);
}
window.DashboardPage = { window.DashboardPage = {
newsStartIndex: 0, newsStartIndex: 0,
@ -44,6 +60,8 @@
$('.swaggerLink', page).attr('href', apiClient.getUrl('swagger-ui/index.html', { $('.swaggerLink', page).attr('href', apiClient.getUrl('swagger-ui/index.html', {
api_key: ApiClient.accessToken() api_key: ApiClient.accessToken()
})); }));
refreshHealthMonitor(page);
}, },
onPageHide: function () { onPageHide: function () {

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

@ -699,7 +699,7 @@
} }
html += LibraryBrowser.getPosterViewHtml({ html += LibraryBrowser.getPosterViewHtml({
items: result.Items, items: result.Items,
shape: enableScrollX() ? 'autoOverflow' : 'auto', shape: enableScrollX() ? 'autooverflow' : 'auto',
showTitle: true, showTitle: true,
showParentTitle: true, showParentTitle: true,
coverImage: true, coverImage: true,

6
dashboard-ui/strings/en-US.json
View file

@ -562,7 +562,7 @@
"LabelEnableAutomaticPortMap": "Enable automatic port mapping", "LabelEnableAutomaticPortMap": "Enable automatic port mapping",
"LabelEnableAutomaticPortMapHelp": "Attempt to automatically map the public port to the local port via UPnP. This may not work with some router models.", "LabelEnableAutomaticPortMapHelp": "Attempt to automatically map the public port to the local port via UPnP. This may not work with some router models.",
"LabelExternalDDNS": "External domain:", "LabelExternalDDNS": "External domain:",
"LabelExternalDDNSHelp": "If you have a dynamic DNS enter it here. Emby apps will use it when connecting remotely. This field is required when used with a custom https certificate.", "LabelExternalDDNSHelp": "If you have a dynamic DNS enter it here. Emby apps will use it when connecting remotely. This field is required when used with a custom ssl certificate.",
"TabResume": "Resume", "TabResume": "Resume",
"TabWeather": "Weather", "TabWeather": "Weather",
"TitleAppSettings": "App Settings", "TitleAppSettings": "App Settings",
@ -2353,5 +2353,7 @@
"OptionConvertRecordingPreserveAudio": "Preserve original audio when converting recordings", "OptionConvertRecordingPreserveAudio": "Preserve original audio when converting recordings",
"OptionConvertRecordingPreserveAudioHelp": "This will provide better audio but may require transcoding during playback on some devices.", "OptionConvertRecordingPreserveAudioHelp": "This will provide better audio but may require transcoding during playback on some devices.",
"CreateCollectionHelp": "Collections allow you to create personalized groupings of movies and other library content.", "CreateCollectionHelp": "Collections allow you to create personalized groupings of movies and other library content.",
"AddItemToCollectionHelp": "Add items to collections by searching for them and using their right-click or tap menus to add them to a collection." "AddItemToCollectionHelp": "Add items to collections by searching for them and using their right-click or tap menus to add them to a collection.",
"HeaderHealthMonitor": "Health Monitor",
"HealthMonitorNoAlerts": "There are no active alerts."
} }