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

updated image magick

Browse source
This commit is contained in:
Luke Pulverenti 2015-04-11 17:34:05 -04:00
parent 1205b29a61
commit 16c69c903b
4 changed files with 16 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

6
dashboard-ui/css/librarymenu.css
View file

@ -3,7 +3,7 @@
} }
.libraryPage:not(.metadataEditorPage):not(.noSecondaryNavPage) { .libraryPage:not(.metadataEditorPage):not(.noSecondaryNavPage) {
padding-top: 98px !important; padding-top: 99px !important;
} }
.libraryMenuDivider { .libraryMenuDivider {
@ -121,7 +121,7 @@
} }
.libraryViewNav { .libraryViewNav {
height: 48px; height: 49px;
overflow: hidden; overflow: hidden;
position: fixed; position: fixed;
right: 0; right: 0;
@ -129,7 +129,7 @@
top: 50px; top: 50px;
z-index: 999; z-index: 999;
text-align: center; text-align: center;
font-size: 14px; font-size: 15px;
white-space: nowrap; white-space: nowrap;
padding: 0 0 0; padding: 0 0 0;
overflow-x: scroll; overflow-x: scroll;

7
dashboard-ui/livetvsettings.html
View file

@ -29,6 +29,13 @@
<option value="5">5</option> <option value="5">5</option>
<option value="6">6</option> <option value="6">6</option>
<option value="7">7</option> <option value="7">7</option>
<option value="8">8</option>
<option value="9">9</option>
<option value="10">10</option>
<option value="11">11</option>
<option value="12">12</option>
<option value="13">13</option>
<option value="14">14</option>
</select> </select>
<div class="fieldDescription">${LabelNumberOfGuideDaysHelp}</div> <div class="fieldDescription">${LabelNumberOfGuideDaysHelp}</div>
</li> </li>

4
dashboard-ui/mypreferenceswebclient.html
View file

@ -33,7 +33,6 @@
<option value="librarytiles">${OptionMyMedia}</option> <option value="librarytiles">${OptionMyMedia}</option>
<option value="smalllibrarytiles">${OptionMyMediaSmall}</option> <option value="smalllibrarytiles">${OptionMyMediaSmall}</option>
<option value="librarybuttons">${OptionMyMediaButtons}</option> <option value="librarybuttons">${OptionMyMediaButtons}</option>
<option value="folders">${OptionLibraryFolders}</option>
<option value="resume">${OptionResumablemedia}</option> <option value="resume">${OptionResumablemedia}</option>
</select> </select>
</div> </div>
@ -48,7 +47,6 @@
<option value="librarytiles">${OptionMyMedia}</option> <option value="librarytiles">${OptionMyMedia}</option>
<option value="smalllibrarytiles">${OptionMyMediaSmall}</option> <option value="smalllibrarytiles">${OptionMyMediaSmall}</option>
<option value="librarybuttons">${OptionMyMediaButtons}</option> <option value="librarybuttons">${OptionMyMediaButtons}</option>
<option value="folders">${OptionLibraryFolders}</option>
<option value="resume">${OptionResumablemedia}</option> <option value="resume">${OptionResumablemedia}</option>
<option value="none">${OptionNone}</option> <option value="none">${OptionNone}</option>
</select> </select>
@ -64,7 +62,6 @@
<option value="librarytiles">${OptionMyMedia}</option> <option value="librarytiles">${OptionMyMedia}</option>
<option value="smalllibrarytiles">${OptionMyMediaSmall}</option> <option value="smalllibrarytiles">${OptionMyMediaSmall}</option>
<option value="librarybuttons">${OptionMyMediaButtons}</option> <option value="librarybuttons">${OptionMyMediaButtons}</option>
<option value="folders">${OptionLibraryFolders}</option>
<option value="resume">${OptionResumablemedia}</option> <option value="resume">${OptionResumablemedia}</option>
<option value="none">${OptionNone}</option> <option value="none">${OptionNone}</option>
</select> </select>
@ -80,7 +77,6 @@
<option value="librarytiles">${OptionMyMedia}</option> <option value="librarytiles">${OptionMyMedia}</option>
<option value="smalllibrarytiles">${OptionMyMediaSmall}</option> <option value="smalllibrarytiles">${OptionMyMediaSmall}</option>
<option value="librarybuttons">${OptionMyMediaButtons}</option> <option value="librarybuttons">${OptionMyMediaButtons}</option>
<option value="folders">${OptionLibraryFolders}</option>
<option value="resume">${OptionResumablemedia}</option> <option value="resume">${OptionResumablemedia}</option>
<option value="none">${OptionNone}</option> <option value="none">${OptionNone}</option>
</select> </select>

48
dashboard-ui/scripts/indexpage.js
View file

@ -240,43 +240,6 @@
}); });
} }
function loadLibraryFolders(elem, userId, shape, index) {
ApiClient.getItems(userId, {
SortBy: "SortName",
ImageTypeLimit: 1
}).done(function (result) {
var html = '';
var items = result.Items;
for (var i = 0, length = items.length; i < length; i++) {
items[i].url = 'itemlist.html?parentid=' + items[i].Id;
}
if (items.length) {
html += '<h1 class="listHeader">' + Globalize.translate('HeaderLibraryFolders') + '</h1>';
html += '<div>';
html += LibraryBrowser.getPosterViewHtml({
items: items,
shape: shape,
showTitle: true,
centerText: true,
lazy: true
});
html += '</div>';
}
$(elem).html(html).lazyChildren();
handleLibraryLinkNavigations(elem);
});
}
function loadResume(elem, userId) { function loadResume(elem, userId) {
var screenWidth = $(window).width(); var screenWidth = $(window).width();
@ -453,7 +416,6 @@
loadRecentlyAdded: loadRecentlyAdded, loadRecentlyAdded: loadRecentlyAdded,
loadLatestChannelMedia: loadLatestChannelMedia, loadLatestChannelMedia: loadLatestChannelMedia,
loadLibraryTiles: loadLibraryTiles, loadLibraryTiles: loadLibraryTiles,
loadLibraryFolders: loadLibraryFolders,
loadResume: loadResume, loadResume: loadResume,
loadLatestChannelItems: loadLatestChannelItems, loadLatestChannelItems: loadLatestChannelItems,
loadLatestLiveTvRecordings: loadLatestLiveTvRecordings, loadLatestLiveTvRecordings: loadLatestLiveTvRecordings,
@ -488,6 +450,10 @@
var section = displayPreferences.CustomPrefs['home' + index] || getDefaultSection(index); var section = displayPreferences.CustomPrefs['home' + index] || getDefaultSection(index);
if (section == 'folders') {
section = 'librarytiles-automobile';
}
var showLibraryTileNames = displayPreferences.CustomPrefs.enableLibraryTileNames != '0'; var showLibraryTileNames = displayPreferences.CustomPrefs.enableLibraryTileNames != '0';
var elem = $('.section' + index, page); var elem = $('.section' + index, page);
@ -517,11 +483,7 @@
else if (section == 'latesttvrecordings') { else if (section == 'latesttvrecordings') {
Sections.loadLatestLiveTvRecordings(elem, userId); Sections.loadLatestLiveTvRecordings(elem, userId);
} }
else if (section == 'latestchannelmedia') {
else if (section == 'folders') {
Sections.loadLibraryFolders(elem, userId, 'backdrop', index);
} else if (section == 'latestchannelmedia') {
Sections.loadLatestChannelMedia(elem, userId); Sections.loadLatestChannelMedia(elem, userId);
} else { } else {