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

finish paper-fab removal

Browse source
This commit is contained in:
Luke Pulverenti 2016-08-05 16:34:56 -04:00
parent e00fbec2a8
commit 0b0248cd60
4 changed files with 48 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

16
dashboard-ui/components/medialibrarycreator/medialibrarycreator.js
View file

@ -1,4 +1,4 @@
define(['dialogHelper', 'jQuery', 'emby-input', 'emby-select', 'paper-fab', 'paper-item-body', 'paper-icon-item', 'paper-icon-button-light'], function (dialogHelper, $) { define(['dialogHelper', 'jQuery', 'emby-input', 'emby-select', 'paper-icon-button-light', 'listViewStyle'], function (dialogHelper, $) {
var currentDeferred; var currentDeferred;
var hasChanges; var hasChanges;
@ -116,17 +116,17 @@
var html = ''; var html = '';
html += '<paper-icon-item role="menuitem" class="lnkPath">'; html += '<div class="listItem lnkPath">';
html += '<paper-fab mini style="background:#52B54B;" icon="folder" item-icon></paper-fab>'; html += '<i class="listItemIcon md-icon">folder</i>';
html += '<paper-item-body>'; html += '<div class="listItemBody">';
html += path; html += '<div class="listItemBodyText">' + path + '</div>';
html += '</paper-item-body>'; html += '</div>';
html += '<button is="paper-icon-button-light"" class="btnRemovePath" data-index="' + index + '"><iron-icon icon="remove-circle"></iron-icon></button>'; html += '<button is="paper-icon-button-light"" class="btnRemovePath" data-index="' + index + '"><i class="md-icon">remove_circle</i></button>';
html += '</paper-icon-item>'; html += '</div>';
return html; return html;
} }

56
dashboard-ui/components/medialibrarycreator/medialibrarycreator.template.html
View file

@ -1,33 +1,37 @@
<div class="dialogHeader" style="margin:0 0 2em;"> <div class="dialogHeader">
<button is="paper-icon-button-light" class="btnCancel" tabindex="-1"><iron-icon icon="arrow-back"></iron-icon></button> <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>
<div class="dialogHeaderTitle"> <div class="dialogHeaderTitle">
${ButtonAddMediaLibrary} ${ButtonAddMediaLibrary}
</div> </div>
</div> </div>
<form style="margin:auto;"> <div class="dialogContent smoothScrollY" style="padding-top:2em;">
<div id="fldCollectionType" class="selectContainer"> <div class="dialogContentInner dialog-content-centered">
<select is="emby-select" id="selectCollectionType" data-mini="true" required="required" label="${LabelContentType}"></select> <form style="margin:auto;">
<div class="collectionTypeFieldDescription fieldDescription"> <div id="fldCollectionType" class="selectContainer">
</div> <select is="emby-select" id="selectCollectionType" data-mini="true" required="required" label="${LabelContentType}"></select>
</div> <div class="collectionTypeFieldDescription fieldDescription">
<div class="inputContainer"> </div>
<input is="emby-input" type="text" id="txtValue" required="required" label="${LabelDisplayName}" /> </div>
</div> <div class="inputContainer">
<div> <input is="emby-input" type="text" id="txtValue" required="required" label="${LabelDisplayName}" />
<h1 style="display:inline-block;vertical-align:middle;">${HeadersFolders}</h1> </div>
<button is="emby-button" type="button" class="raised btnAddFolder submit mini" style="margin-left:1em;" title="${ButtonAdd}"> <div>
<i class="md-icon">add</i> <h1 style="display:inline-block;vertical-align:middle;">${HeadersFolders}</h1>
<span>${ButtonAdd}</span> <button is="emby-button" type="button" class="raised btnAddFolder submit mini" style="margin-left:1em;" title="${ButtonAdd}">
</button> <i class="md-icon">add</i>
</div> <span>${ButtonAdd}</span>
<div class="paperList folderList hide" style="padding: .7em 0;"></div> </button>
</div>
<div class="paperList folderList hide" style="padding: .7em 0;"></div>
<br /> <br />
<div> <div>
<button is="emby-button" type="submit" class="raised submit block"> <button is="emby-button" type="submit" class="raised submit block">
<i class="md-icon">check</i> <i class="md-icon">check</i>
<span>${ButtonOk}</span> <span>${ButtonOk}</span>
</button> </button>
</div>
</form>
</div> </div>
</form> </div>

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

@ -65,32 +65,32 @@
function getSubscriptionBenefitHtml(item) { function getSubscriptionBenefitHtml(item) {
var html = ''; var html = '';
html += '<paper-icon-item>'; html += '<div class="listItem">';
html += '<paper-fab mini style="background-color:#52B54B;" icon="' + item.icon + '" item-icon></paper-fab>'; html += '<i class="listItemIcon md-icon">' + item.icon + '</i>';
html += '<paper-item-body three-line>'; html += '<div class="listItemBody two-line">';
html += '<a class="clearLink" href="https://emby.media/premiere" target="_blank">'; html += '<a class="clearLink" href="https://emby.media/premiere" target="_blank">';
html += '<div>'; html += '<h3 class="listItemBodyText">';
html += item.name; html += item.name;
html += '</div>'; html += '</h3>';
html += '<div secondary style="white-space:normal;">'; html += '<div class="listItemBodyText secondary" style="white-space:normal;">';
html += item.text; html += item.text;
html += '</div>'; html += '</div>';
html += '</a>'; html += '</a>';
html += '</paper-item-body>'; html += '</div>';
html += '</paper-icon-item>'; html += '</div>';
return html; return html;
} }
function showPlaybackOverlay(resolve, reject) { function showPlaybackOverlay(resolve, reject) {
require(['dialogHelper', 'paper-fab', 'paper-item-body', 'paper-icon-item', 'emby-button'], function (dialogHelper) { require(['dialogHelper', 'listViewStyle', 'emby-button'], function (dialogHelper) {
var dlg = dialogHelper.createDialog({ var dlg = dialogHelper.createDialog({
size: 'fullscreen-border', size: 'fullscreen-border',
@ -103,7 +103,7 @@
var html = ''; var html = '';
html += '<h2 class="dialogHeader">'; html += '<h2 class="dialogHeader">';
html += '<paper-fab icon="arrow-back" mini class="btnCancelSupporterInfo" tabindex="-1"></paper-fab>'; html += '<button is="emby-button" type="button" class="fab mini btnCancelSupporterInfo" tabindex="-1"><i class="md-icon">arrow_back</i></button>';
html += '</h2>'; html += '</h2>';
html += '<div class="readOnlyContent" style="margin:0 auto 0;color:#fff;padding:1em;">'; html += '<div class="readOnlyContent" style="margin:0 auto 0;color:#fff;padding:1em;">';

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

@ -1513,7 +1513,6 @@ var AppInfo = {};
define("paper-textarea", ['webcomponentsjs', "html!" + bowerPath + "/paper-input/paper-textarea.html"]); define("paper-textarea", ['webcomponentsjs', "html!" + bowerPath + "/paper-input/paper-textarea.html"]);
define("paper-item", ["html!" + bowerPath + "/paper-item/paper-item.html"]); define("paper-item", ["html!" + bowerPath + "/paper-item/paper-item.html"]);
define("paper-checkbox", ["html!" + bowerPath + "/paper-checkbox/paper-checkbox.html"]); define("paper-checkbox", ["html!" + bowerPath + "/paper-checkbox/paper-checkbox.html"]);
define("paper-fab", ["emby-icons", "html!" + bowerPath + "/paper-fab/paper-fab.html"]);
define("paper-progress", ["html!" + bowerPath + "/paper-progress/paper-progress.html"]); define("paper-progress", ["html!" + bowerPath + "/paper-progress/paper-progress.html"]);
define("paper-input", ['webcomponentsjs', "html!" + bowerPath + "/paper-input/paper-input.html"]); define("paper-input", ['webcomponentsjs', "html!" + bowerPath + "/paper-input/paper-input.html"]);
define("paper-icon-item", ['webcomponentsjs', "html!" + bowerPath + "/paper-item/paper-icon-item.html"]); define("paper-icon-item", ['webcomponentsjs', "html!" + bowerPath + "/paper-item/paper-icon-item.html"]);