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

remove format indicators (temporarily)

Browse source
This commit is contained in:
Luke Pulverenti 2014-03-13 15:08:17 -04:00
parent 2a8d8037f4
commit df515330ba
6 changed files with 8 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -87,7 +87,7 @@
} }
.selectedViewLink { .selectedViewLink {
color: #fff; color: #fff!important;
} }
.selectedViewIndicator { .selectedViewIndicator {
@ -675,7 +675,7 @@ a.itemTag:hover {
display: none; display: none;
} }
.desktopViewMenuLink { .desktopViewMenuLink:not(.selectedViewLink) {
display: none; display: none;
} }

3
dashboard-ui/css/mediaplayer.css
View file

@ -90,7 +90,6 @@
.itemVideo { .itemVideo {
z-index: 99998; z-index: 99998;
background: #000; background: #000;
border: 1px solid #444;
width: 320px; width: 320px;
margin: 20px; margin: 20px;
position: fixed; position: fixed;
@ -128,7 +127,7 @@
z-index: 99997; z-index: 99997;
background: #1d1d1d; background: #1d1d1d;
position: fixed; position: fixed;
border: 1px solid green; border: 1px solid #333;
top: 50%; top: 50%;
left: 50%; left: 50%;
margin-left: -170px; margin-left: -170px;

9
dashboard-ui/scripts/librarybrowser.js
View file

@ -461,13 +461,6 @@
} }
} }
var enableRibbons = false;
var user = Dashboard.getCurrentUser().done(function (data) {
if (data.Configuration) {
enableRibbons = data.Configuration.DisplayMovieFormatRibbons;
}
});
for (var i = 0, length = items.length; i < length; i++) { for (var i = 0, length = items.length; i < length; i++) {
var item = items[i]; var item = items[i];
@ -672,7 +665,7 @@
html += '<a data-itemid="' + item.Id + '" class="' + cssClass + '" href="' + LibraryBrowser.getHref(item, options.context) + '">'; html += '<a data-itemid="' + item.Id + '" class="' + cssClass + '" href="' + LibraryBrowser.getHref(item, options.context) + '">';
// Ribbon // Ribbon
if (item.MediaType == "Video" && enableRibbons) { if (item.MediaType == "Video" && item.Video3DFormat) {
// This would be much better if specified in the json payload // This would be much better if specified in the json payload
// Another nice thing to have in the payload would be 720 vs 1080 // Another nice thing to have in the payload would be 720 vs 1080
// Then, rather than "HD" it could display the specific HD format // Then, rather than "HD" it could display the specific HD format

8
dashboard-ui/scripts/librarymenu.js
View file

@ -92,9 +92,9 @@
html += '<a class="viewMenuLink viewMenuTextLink desktopViewMenuLink' + (view == 'games' ? selectedCssClass : '') + '" href="gamesrecommended.html">' + (view == 'games' ? selectedHtml : '') + '<span class="viewName">Games</span></a>'; html += '<a class="viewMenuLink viewMenuTextLink desktopViewMenuLink' + (view == 'games' ? selectedCssClass : '') + '" href="gamesrecommended.html">' + (view == 'games' ? selectedHtml : '') + '<span class="viewName">Games</span></a>';
} }
if (counts.BoxSetCount) { //if (counts.BoxSetCount) {
html += '<a class="viewMenuLink viewMenuTextLink desktopViewMenuLink' + (view == 'boxsets' ? selectedCssClass : '') + '" href="collections.html">' + (view == 'boxsets' ? selectedHtml : '') + '<span class="viewName">Collections</span></a>'; html += '<a class="viewMenuLink viewMenuTextLink desktopViewMenuLink' + (view == 'boxsets' ? selectedCssClass : '') + '" href="collections.html">' + (view == 'boxsets' ? selectedHtml : '') + '<span class="viewName">Collections</span></a>';
} //}
$('.viewMenuRemoteControlButton', page).before(html); $('.viewMenuRemoteControlButton', page).before(html);
} }
@ -148,9 +148,9 @@
html += '<li><a class="libraryPanelLink" href="gamesrecommended.html">Games</a></li>'; html += '<li><a class="libraryPanelLink" href="gamesrecommended.html">Games</a></li>';
} }
if (counts.BoxSetCount) { //if (counts.BoxSetCount) {
html += '<li><a class="libraryPanelLink" href="collections.html">Collections</a></li>'; html += '<li><a class="libraryPanelLink" href="collections.html">Collections</a></li>';
} //}
html += '</ul>'; html += '</ul>';
html += '</div>'; html += '</div>';

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

@ -27,8 +27,6 @@
$('#chkManageLiveTv', page).checked(user.Configuration.EnableLiveTvManagement || false).checkboxradio("refresh"); $('#chkManageLiveTv', page).checked(user.Configuration.EnableLiveTvManagement || false).checkboxradio("refresh");
$('#chkEnableLiveTvAccess', page).checked(user.Configuration.EnableLiveTvAccess || false).checkboxradio("refresh"); $('#chkEnableLiveTvAccess', page).checked(user.Configuration.EnableLiveTvAccess || false).checkboxradio("refresh");
$('#chkDisplayMovieFormatRibbons', page).checked(user.Configuration.DisplayMovieFormatRibbons || false).checkboxradio("refresh");
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
} }
@ -61,7 +59,6 @@
user.Configuration.EnableLiveTvManagement = $('#chkManageLiveTv', page).checked(); user.Configuration.EnableLiveTvManagement = $('#chkManageLiveTv', page).checked();
user.Configuration.EnableMediaPlayback = $('#chkEnableMediaPlayback', page).checked(); user.Configuration.EnableMediaPlayback = $('#chkEnableMediaPlayback', page).checked();
user.Configuration.EnableLiveTvAccess = $('#chkEnableLiveTvAccess', page).checked(); user.Configuration.EnableLiveTvAccess = $('#chkEnableLiveTvAccess', page).checked();
user.Configuration.DisplayMovieFormatRibbons = $('#chkDisplayMovieFormatRibbons', page).checked();
var userId = getParameterByName("userId"); var userId = getParameterByName("userId");

4
dashboard-ui/useredit.html
View file

@ -44,10 +44,6 @@
<input type="checkbox" id="chkEnableRemoteControlOtherUsers" name="chkEnableRemoteControlOtherUsers" data-mini="true" /> <input type="checkbox" id="chkEnableRemoteControlOtherUsers" name="chkEnableRemoteControlOtherUsers" data-mini="true" />
<label for="chkEnableRemoteControlOtherUsers">Allow this user to remote control other users</label> <label for="chkEnableRemoteControlOtherUsers">Allow this user to remote control other users</label>
</div> </div>
<div>
<input type="checkbox" id="chkDisplayMovieFormatRibbons" name="chkDisplayMovieFormatRibbons" data-mini="true" />
<label for="chkDisplayMovieFormatRibbons">Display movie format ribbons</label>
</div>
<br /> <br />
</div> </div>
<div id="accessControlDiv" style="display: none" data-role="collapsible"> <div id="accessControlDiv" style="display: none" data-role="collapsible">