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 collapsibles

Browse source
This commit is contained in:
Luke Pulverenti 2016-04-09 16:20:19 -04:00
parent f719c43d23
commit dfa0fdb33e
7 changed files with 48 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -32,14 +32,14 @@
"web-component-tester": "^4.0.0",
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
},
"homepage": "https://github.com/polymerelements/iron-icon",
"homepage": "https://github.com/PolymerElements/iron-icon",
"_release": "1.0.8",
"_resolution": {
"type": "version",
"tag": "v1.0.8",
"commit": "f36b38928849ef3853db727faa8c9ef104d611eb"
},
"_source": "git://github.com/polymerelements/iron-icon.git",
"_source": "git://github.com/PolymerElements/iron-icon.git",
"_target": "^1.0.0",
"_originalSource": "polymerelements/iron-icon"
"_originalSource": "PolymerElements/iron-icon"
}

4
dashboard-ui/bower_components/paper-behaviors/.bower.json vendored
View file

@ -45,7 +45,7 @@
"tag": "v1.0.11",
"commit": "e3c1ab0c72905b58fb4d9adc2921ea73b5c085a5"
},
"_source": "git://github.com/PolymerElements/paper-behaviors.git",
"_source": "git://github.com/polymerelements/paper-behaviors.git",
"_target": "^1.0.0",
"_originalSource": "PolymerElements/paper-behaviors"
"_originalSource": "polymerelements/paper-behaviors"
}

6
dashboard-ui/bower_components/paper-ripple/.bower.json vendored
View file

@ -32,14 +32,14 @@
"iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0"
},
"ignore": [],
"homepage": "https://github.com/PolymerElements/paper-ripple",
"homepage": "https://github.com/polymerelements/paper-ripple",
"_release": "1.0.5",
"_resolution": {
"type": "version",
"tag": "v1.0.5",
"commit": "d72e7a9a8ab518b901ed18dde492df3b87a93be5"
},
"_source": "git://github.com/PolymerElements/paper-ripple.git",
"_source": "git://github.com/polymerelements/paper-ripple.git",
"_target": "^1.0.0",
"_originalSource": "PolymerElements/paper-ripple"
"_originalSource": "polymerelements/paper-ripple"
}

9
dashboard-ui/metadataimages.html
View file

@ -1,4 +1,4 @@
<div id="metadataImagesConfigurationPage" data-role="page" class="page type-interior metadataConfigurationPage" data-require="jqmcollapsible,scripts/metadataimagespage,jqmcheckbox,paper-checkbox,paper-input">
<div id="metadataImagesConfigurationPage" data-role="page" class="page type-interior metadataConfigurationPage" data-require="emby-collapsible,scripts/metadataimagespage,jqmcheckbox,paper-checkbox,paper-input">
<div data-role="content">
@ -21,9 +21,7 @@
<div class="imageFetchers" style="margin-bottom: 2em;">
</div>
<div data-role="collapsible">
<h2>${HeaderImageSettings}</h2>
<div>
<emby-collapsible title="${HeaderImageSettings}">
<br />
<div class="backdropFields" style="margin-bottom: 2em; display: none;">
<div>
@ -59,8 +57,7 @@
<paper-checkbox class="imageType hide" data-imagetype="Menu">${OptionDownloadMenuImage}</paper-checkbox>
<paper-checkbox class="imageType hide" data-imagetype="Thumb">${OptionDownloadThumbImage}</paper-checkbox>
</div>
</div>
</div>
</emby-collapsible>
<br />
<br />

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

@ -127,10 +127,10 @@
.replace("{1}", humane_elapsed(task.LastExecutionResult.StartTimeUtc, task.LastExecutionResult.EndTimeUtc));
if (task.LastExecutionResult.Status == "Failed") {
html += " <span style='color:#FF0000;'>" + Globalize.translate('LabelFailed') + "</span>";
html += " <span style='color:#FF0000;'>(" + Globalize.translate('LabelFailed') + ")</span>";
}
else if (task.LastExecutionResult.Status == "Cancelled") {
html += " <span style='color:#0026FF;'>" + Globalize.translate('LabelCancelled') + "</span>";
html += " <span style='color:#0026FF;'>(" + Globalize.translate('LabelCancelled') + ")</span>";
}
else if (task.LastExecutionResult.Status == "Aborted") {
html += " <span style='color:#FF0000;'>" + Globalize.translate('LabelAbortedByServerShutdown') + "</span>";

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

@ -44,7 +44,7 @@
}
else if (hint.Type == "Series") {
return [Globalize.translate('LabelSeries')];
return [Globalize.translate('Series')];
}
else if (hint.Type == "BoxSet") {

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

@ -59,10 +59,10 @@
var lastResult = task.LastExecutionResult ? task.LastExecutionResult.Status : '';
if (lastResult == "Failed") {
options.lastResultElem.html('<span style="color:#FF0000;">' + Globalize.translate('LabelFailed') + '</span>');
options.lastResultElem.html('<span style="color:#FF0000;">(' + Globalize.translate('LabelFailed') + ')</span>');
}
else if (lastResult == "Cancelled") {
options.lastResultElem.html('<span style="color:#0026FF;">' + Globalize.translate('LabelCancelled') + '</span>');
options.lastResultElem.html('<span style="color:#0026FF;">(' + Globalize.translate('LabelCancelled') + ')</span>');
}
else if (lastResult == "Aborted") {
options.lastResultElem.html('<span style="color:#FF0000;">' + Globalize.translate('LabelAbortedByServerShutdown') + '</span>');