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 detail page layout

Browse source
This commit is contained in:
Luke Pulverenti 2015-09-01 22:56:19 -04:00
parent 3c6094599e
commit 28adb1bc8d
3 changed files with 25 additions and 15 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"
} }

8
dashboard-ui/css/librarybrowser.css
View file

@ -439,9 +439,8 @@ span.itemCommunityRating:not(:empty) + .userDataIcons {
} }
.detailNameContainer { .detailNameContainer {
position: absolute; margin-top: -120px;
bottom: 15px; height: 110px;
margin-bottom: 0;
} }
.desktopMiscInfoContainer { .desktopMiscInfoContainer {
@ -595,7 +594,8 @@ span.itemCommunityRating:not(:empty) + .userDataIcons {
} }
.detailNameContainer { .detailNameContainer {
position: static; margin-top: auto;
height: auto;
} }
.itemBackdropContent { .itemBackdropContent {

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

@ -2167,26 +2167,36 @@ var AppInfo = {};
var mainDrawerPanelContent = document.querySelector('.mainDrawerPanelContent'); var mainDrawerPanelContent = document.querySelector('.mainDrawerPanelContent');
if (mainDrawerPanelContent) { if (mainDrawerPanelContent) {
var newHtml = mainDrawerPanelContent.innerHTML.substring(4); var newHtml = mainDrawerPanelContent.innerHTML.substring(4);
newHtml = newHtml.substring(0, newHtml.length - 3); newHtml = newHtml.substring(0, newHtml.length - 3);
var srch = 'data-require='; var srch = 'data-require=';
var index = newHtml.indexOf(srch); var index = newHtml.indexOf(srch);
var depends;
if (index != -1) { if (index != -1) {
var requireAttribute = newHtml.substring(index + srch.length + 1); var requireAttribute = newHtml.substring(index + srch.length + 1);
requireAttribute = requireAttribute.substring(0, requireAttribute.indexOf('"')); requireAttribute = requireAttribute.substring(0, requireAttribute.indexOf('"'));
var depends = requireAttribute.split(','); depends = requireAttribute.split(',');
require(depends, function () {
mainDrawerPanelContent.innerHTML = Globalize.translateDocument(newHtml, 'html');
onAppReady(deferred);
});
return;
} }
depends = depends || [];
if (newHtml.indexOf('type-interior') != -1) {
depends.push('jqmicons');
depends.push('jqmpopup');
}
require(depends, function () {
// Don't like having to use jQuery here, but it takes care of making sure that embedded script executes
$(mainDrawerPanelContent).html(Globalize.translateDocument(newHtml, 'html'));
onAppReady(deferred);
});
return;
} }
onAppReady(deferred); onAppReady(deferred);