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 people sorting

Browse source
This commit is contained in:
Luke Pulverenti 2015-07-14 15:04:16 -04:00
parent 1c27cdeb2c
commit f5fb6ccca5
8 changed files with 51 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -25,14 +25,14 @@
"web-component-tester": "*", "web-component-tester": "*",
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
}, },
"homepage": "https://github.com/PolymerElements/iron-meta", "homepage": "https://github.com/polymerelements/iron-meta",
"_release": "1.0.3", "_release": "1.0.3",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.0.3", "tag": "v1.0.3",
"commit": "91529259262b0d8f33fed44bc3fd47aedf35cb04" "commit": "91529259262b0d8f33fed44bc3fd47aedf35cb04"
}, },
"_source": "git://github.com/PolymerElements/iron-meta.git", "_source": "git://github.com/polymerelements/iron-meta.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "PolymerElements/iron-meta" "_originalSource": "polymerelements/iron-meta"
} }

12
dashboard-ui/css/metadataeditor.css
View file

@ -193,15 +193,9 @@
.editorTile { .editorTile {
display: inline-block; display: inline-block;
margin: 5px; margin: 0 2em 2em 0;
padding: 8px; text-align: center;
border: 1px solid #444; vertical-align: middle;
background-image: -webkit-gradient(linear,left top,left bottom,from(#333),to(#2d2d2d));
background-image: -webkit-linear-gradient(#333,#2d2d2d);
background-image: -moz-linear-gradient(#333,#2d2d2d);
background-image: -ms-linear-gradient(#333,#2d2d2d);
background-image: -o-linear-gradient(#333,#2d2d2d);
background-image: linear-gradient(#333,#2d2d2d);
} }
.imageEditorTile { .imageEditorTile {

30
dashboard-ui/edititemimages.html
View file

@ -22,37 +22,29 @@
<a href="#" data-role="button" class="ui-btn-active">${TabImages}</a> <a href="#" data-role="button" class="ui-btn-active">${TabImages}</a>
</div> </div>
<div style="margin: -25px 0 1em;"> <div style="margin: 0 0 1em;">
<div style="display: inline-block;"> <paper-button raised class="subdued btnBrowseAllImages"><iron-icon icon="cloud"></iron-icon><span>${ButtonBrowseImages}</span></paper-button>
<a class="lnkBrowseImages lnkBrowseAllImages hide" data-rel="popup" data-position-to="window" data-role="button" data-inline="true" data-icon="cloud" data-mini="true">${ButtonBrowseImages}</a> <paper-button raised class="subdued btnOpenUploadMenu"><iron-icon icon="add"></iron-icon><span>${ButtonUpload}</span></paper-button>
</div>
<div style="display: inline-block;">
<a href="#popupUpload" data-rel="popup" data-position-to="window" data-role="button" data-inline="true" data-icon="plus" data-mini="true">${ButtonUpload}</a>
</div>
</div> </div>
<div id="imagesContainer" style="display: none;"> <div id="imagesContainer" style="display: none;">
<div data-role="collapsible" data-mini="true" data-collapsed="false" class="imageEditorCollapsible" data-content-theme="false"> <h1>${HeaderImages}</h1>
<h3>${HeaderImages}</h3> <div id="images">
<div id="images">
</div>
</div> </div>
<br />
</div> </div>
<div id="backdropsContainer" style="display: none;"> <div id="backdropsContainer" style="display: none;">
<div data-role="collapsible" data-mini="true" data-collapsed="false" class="imageEditorCollapsible" data-content-theme="false"> <h1>${HeaderBackdrops}</h1>
<h3>${HeaderBackdrops}</h3> <div id="backdrops">
<div id="backdrops">
</div>
</div> </div>
<br />
</div> </div>
<div id="screenshotsContainer" style="display: none;"> <div id="screenshotsContainer" style="display: none;">
<div data-role="collapsible" data-mini="true" data-collapsed="false" class="imageEditorCollapsible" data-content-theme="false"> <h1>${Screenshots}</h1>
<h3>${Screenshots}</h3> <div id="screenshots">
<div id="screenshots">
</div>
</div> </div>
</div> </div>

43
dashboard-ui/scripts/edititemimages.js
View file

@ -288,7 +288,9 @@
html += '<div class="editorTile imageEditorTile">'; html += '<div class="editorTile imageEditorTile">';
html += '<div style="height:144px;vertical-align:top;background-repeat:no-repeat;background-size:contain;background-image:url(\'' + LibraryBrowser.getImageUrl(currentItem, image.ImageType, image.ImageIndex, { height: 144 }) + '\');"></div>'; var height = 150;
html += '<div style="height:' + height + 'px;vertical-align:top;background-repeat:no-repeat;background-position:center center;background-size:contain;background-image:url(\'' + LibraryBrowser.getImageUrl(currentItem, image.ImageType, image.ImageIndex, { height: height }) + '\');"></div>';
html += '<div>'; html += '<div>';
@ -303,22 +305,22 @@
if (image.ImageType == "Backdrop" || image.ImageType == "Screenshot") { if (image.ImageType == "Backdrop" || image.ImageType == "Screenshot") {
if (i > 0) { if (i > 0) {
html += '<button type="button" data-icon="arrow-l" data-mini="true" data-inline="true" data-iconpos="notext" onclick="EditItemImagesPage.moveImage(\'' + image.ImageType + '\', ' + image.ImageIndex + ', ' + (i - 1) + ');" style="margin-bottom:0;">' + Globalize.translate('ButtonMoveLeft') + '</button>'; html += '<paper-icon-button icon="chevron-left" onclick="EditItemImagesPage.moveImage(\'' + image.ImageType + '\', ' + image.ImageIndex + ', ' + (i - 1) + ');" title="' + Globalize.translate('ButtonMoveLeft') + '"></paper-icon-button>';
} else { } else {
html += '<button type="button" data-icon="arrow-l" data-mini="true" data-inline="true" data-iconpos="notext" style="margin-bottom:0;" disabled>' + Globalize.translate('ButtonMoveLeft') + '</button>'; html += '<paper-icon-button icon="chevron-left" disabled title="' + Globalize.translate('ButtonMoveLeft') + '"></paper-icon-button>';
} }
if (i < length - 1) { if (i < length - 1) {
html += '<button type="button" data-icon="arrow-r" data-mini="true" data-inline="true" data-iconpos="notext" onclick="EditItemImagesPage.moveImage(\'' + image.ImageType + '\', ' + image.ImageIndex + ', ' + (i + 1) + ');" style="margin-bottom:0;">' + Globalize.translate('ButtonMoveRight') + '</button>'; html += '<paper-icon-button icon="chevron-right" onclick="EditItemImagesPage.moveImage(\'' + image.ImageType + '\', ' + image.ImageIndex + ', ' + (i + 1) + ');" title="' + Globalize.translate('ButtonMoveRight') + '"></paper-icon-button>';
} else { } else {
html += '<button type="button" data-icon="arrow-r" data-mini="true" data-inline="true" data-iconpos="notext" style="margin-bottom:0;" disabled>' + Globalize.translate('ButtonMoveRight') + '</button>'; html += '<paper-icon-button icon="chevron-right" disabled title="' + Globalize.translate('ButtonMoveRight') + '"></paper-icon-button>';
} }
} }
html += '<button type="button" data-icon="delete" data-mini="true" data-inline="true" data-iconpos="notext" onclick="EditItemImagesPage.deleteImage(\'' + image.ImageType + '\', ' + (image.ImageIndex != null ? image.ImageIndex : "null") + ');" style="margin-bottom:0;">' + Globalize.translate('Delete') + '</button>'; html += '<paper-icon-button icon="delete" onclick="EditItemImagesPage.deleteImage(\'' + image.ImageType + '\', ' + (image.ImageIndex != null ? image.ImageIndex : "null") + ');" title="' + Globalize.translate('Delete') + '"></paper-icon-button>';
if (imageProviders.length) { if (imageProviders.length) {
html += '<button type="button" data-icon="cloud" data-mini="true" data-inline="true" data-iconpos="notext" onclick="EditItemImagesPage.showDownloadMenu(\'' + image.ImageType + '\');" style="margin-bottom:0;">' + Globalize.translate('ButtonBrowseOnlineImages') + '</button>'; html += '<paper-icon-button icon="cloud" onclick="EditItemImagesPage.showDownloadMenu(\'' + image.ImageType + '\');" title="' + Globalize.translate('ButtonBrowseOnlineImages') + '"></paper-icon-button>';
} }
html += '</p>'; html += '</p>';
@ -508,7 +510,11 @@
browsableImageStartIndex = 0; browsableImageStartIndex = 0;
browsableImageType = type; browsableImageType = type;
$('.lnkBrowseImages', $.mobile.activePage).trigger('click'); var page = $.mobile.activePage;
selectedProvider = null;
$('.popupDownload', page).popup('open');
reloadBrowsableImages(page);
}; };
} }
@ -533,15 +539,6 @@
} }
}); });
$('.lnkBrowseImages', page).on('click', function () {
selectedProvider = null;
$('.popupDownload', page).popup('open');
reloadBrowsableImages(page);
});
$('#selectBrowsableImageType', page).on('change', function () { $('#selectBrowsableImageType', page).on('change', function () {
browsableImageType = this.value; browsableImageType = this.value;
@ -568,6 +565,18 @@
$('.uploadItemImageForm').off('submit', onSubmit).on('submit', onSubmit); $('.uploadItemImageForm').off('submit', onSubmit).on('submit', onSubmit);
$('.btnOpenUploadMenu', page).on('click', function() {
$('#popupUpload', page).popup('open');
});
$('.btnBrowseAllImages', page).on('click', function () {
selectedProvider = null;
browsableImageType = 'Primary';
$('.popupDownload', page).popup('open');
reloadBrowsableImages(page);
});
}).on('pageshowready', "#editItemImagesPage", function () { }).on('pageshowready', "#editItemImagesPage", function () {

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

@ -617,8 +617,6 @@ var Dashboard = {
$(document.body).append(html); $(document.body).append(html);
document.body.classList.add('bodyWithPopupOpen');
// This timeout is obviously messy but it's unclear how to determine when the webcomponent is ready for use // This timeout is obviously messy but it's unclear how to determine when the webcomponent is ready for use
// element onload never fires // element onload never fires
setTimeout(function () { setTimeout(function () {
@ -629,7 +627,6 @@ var Dashboard = {
$(dlg).on('iron-overlay-closed', function (e) { $(dlg).on('iron-overlay-closed', function (e) {
var confirmed = this.closingReason.confirmed; var confirmed = this.closingReason.confirmed;
this.parentNode.removeChild(this); this.parentNode.removeChild(this);
document.body.classList.remove('bodyWithPopupOpen');
if (callback) { if (callback) {
callback(confirmed); callback(confirmed);

1
dashboard-ui/scripts/tvpeople.js
View file

@ -160,6 +160,7 @@
} }
LibraryBrowser.loadSavedQueryValues(getSavedQueryKey(), query); LibraryBrowser.loadSavedQueryValues(getSavedQueryKey(), query);
query.SortBy = "SortName";
reloadItems(this); reloadItems(this);

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

@ -88,6 +88,7 @@ See [iron-iconset](#iron-iconset) and [iron-iconset-svg](#iron-iconset-svg) for
<g id="search"><path d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z" /></g> <g id="search"><path d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z" /></g>
<g id="menu"><path d="M3 18h18v-2H3v2zm0-5h18v-2H3v2zm0-7v2h18V6H3z" /></g> <g id="menu"><path d="M3 18h18v-2H3v2zm0-5h18v-2H3v2zm0-7v2h18V6H3z" /></g>
<g id="chevron-left"><path d="M15.41 7.41L14 6l-6 6 6 6 1.41-1.41L10.83 12z" /></g> <g id="chevron-left"><path d="M15.41 7.41L14 6l-6 6 6 6 1.41-1.41L10.83 12z" /></g>
<g id="chevron-right"><path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z" /></g>
<g id="pause"><path d="M6 19h4V5H6v14zm8-14v14h4V5h-4z" /></g> <g id="pause"><path d="M6 19h4V5H6v14zm8-14v14h4V5h-4z" /></g>
<g id="stop"><path d="M6 6h12v12H6z" /></g> <g id="stop"><path d="M6 6h12v12H6z" /></g>
<g id="skip-next"><path d="M6 18l8.5-6L6 6v12zM16 6v12h2V6h-2z" /></g> <g id="skip-next"><path d="M6 18l8.5-6L6 6v12zM16 6v12h2V6h-2z" /></g>

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

@ -6735,6 +6735,8 @@ this._removeChildren();
</script> </script>
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:400,300,300italic,400italic,500,500italic,700,700italic">
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto+Mono:400,700">
<style is="custom-style"> <style is="custom-style">
:root { :root {
@ -6751,7 +6753,7 @@ this._removeChildren();
}; };
--paper-font-common-code: { --paper-font-common-code: {
font-family: 'Inconsolata', 'Consolas', 'Source Code Pro', 'Monaco', 'Menlo', monospace; font-family: 'Roboto Mono', 'Consolas', 'Menlo', monospace;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
}; };
@ -6939,7 +6941,7 @@ this._removeChildren();
--paper-font-code2: { --paper-font-code2: {
/* @apply(--paper-font-common-code); */ /* @apply(--paper-font-common-code); */
font-family: 'Inconsolata', 'Consolas', 'Source Code Pro', 'Monaco', 'Menlo', monospace; font-family: 'Roboto Mono', 'Consolas', 'Menlo', monospace;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
font-size: 14px; font-size: 14px;
@ -6949,7 +6951,7 @@ this._removeChildren();
--paper-font-code1: { --paper-font-code1: {
/* @apply(--paper-font-common-code); */ /* @apply(--paper-font-common-code); */
font-family: 'Inconsolata', 'Consolas', 'Source Code Pro', 'Monaco', 'Menlo', monospace; font-family: 'Roboto Mono', 'Consolas', 'Menlo', monospace;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
font-size: 14px; font-size: 14px;
@ -17297,6 +17299,7 @@ paper-ripple {
<g id="search"><path d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"></path></g> <g id="search"><path d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"></path></g>
<g id="menu"><path d="M3 18h18v-2H3v2zm0-5h18v-2H3v2zm0-7v2h18V6H3z"></path></g> <g id="menu"><path d="M3 18h18v-2H3v2zm0-5h18v-2H3v2zm0-7v2h18V6H3z"></path></g>
<g id="chevron-left"><path d="M15.41 7.41L14 6l-6 6 6 6 1.41-1.41L10.83 12z"></path></g> <g id="chevron-left"><path d="M15.41 7.41L14 6l-6 6 6 6 1.41-1.41L10.83 12z"></path></g>
<g id="chevron-right"><path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z"></path></g>
<g id="pause"><path d="M6 19h4V5H6v14zm8-14v14h4V5h-4z"></path></g> <g id="pause"><path d="M6 19h4V5H6v14zm8-14v14h4V5h-4z"></path></g>
<g id="stop"><path d="M6 6h12v12H6z"></path></g> <g id="stop"><path d="M6 6h12v12H6z"></path></g>
<g id="skip-next"><path d="M6 18l8.5-6L6 6v12zM16 6v12h2V6h-2z"></path></g> <g id="skip-next"><path d="M6 18l8.5-6L6 6v12zM16 6v12h2V6h-2z"></path></g>