milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

change header icons to jqm buttons

Browse source
This commit is contained in:
Luke Pulverenti 2013-12-27 12:12:23 -05:00
parent 68ab3acc3e
commit 946f2ff98e
4 changed files with 44 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -26,6 +26,7 @@
z-index: 1000; z-index: 1000;
top: 0; top: 0;
border-bottom: 1px solid #111; border-bottom: 1px solid #111;
padding-left: 10px;
} }
.viewMenuLink { .viewMenuLink {
@ -502,6 +503,13 @@ a.itemTag:hover {
max-width: 100%; max-width: 100%;
} }
@media all and (max-width: 550px) {
.desktopViewMenuLink {
display: none;
}
}
@media all and (min-width: 600px) { @media all and (min-width: 600px) {
.inlineDetailSection:not(.hide) { .inlineDetailSection:not(.hide) {
display: inline-block; display: inline-block;
@ -522,6 +530,10 @@ a.itemTag:hover {
@media all and (max-width: 750px) { @media all and (max-width: 750px) {
.editorMenuLink {
display: none;
}
.itemBackdrop { .itemBackdrop {
background-image: none!important; background-image: none!important;
height: auto; height: auto;

1
dashboard-ui/css/search.css
View file

@ -47,6 +47,7 @@
overflow: hidden; overflow: hidden;
font-size: 12px; font-size: 12px;
color: #fff; color: #fff;
font-weight: normal !important;
} }
.searchHintSecondaryText { .searchHintSecondaryText {

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

@ -2382,12 +2382,12 @@
var html = '<div class="viewMenuBar">'; var html = '<div class="viewMenuBar">';
html += '<a class="viewMenuLink homeMenuLink" href="index.html" title="Home"><img src="css/images/mblogoicon.png" alt="Home" /></a>'; html += '<a data-role="button" href="index.html" data-icon="bars" data-iconpos="notext" data-inline="true" title="Menu">Menu</a>';
html += '<a class="viewMenuLink viewMenuImageLink remoteControlMenuLink" href="#" onclick="RemoteControl.showMenu();" title="Remote Control"><img src="css/images/remote.png" alt="Remote Control" /></a>'; html += '<button class="viewMenuRemoteControlButton" onclick="RemoteControl.showMenu();" type="button" data-icon="remote" data-inline="true" data-iconpos="notext" title="Remote Control">Remote Control</button>';
if (user.Configuration.IsAdministrator) { if (user.Configuration.IsAdministrator) {
html += '<a class="viewMenuLink viewMenuImageLink editorMenuLink" href="edititemmetadata.html" title="Metadata Manager"><img src="css/images/editor.png" alt=""Metadata Manager" /></a>'; html += '<a class="editorMenuLink" href="edititemmetadata.html" data-role="button" data-icon="edit" data-inline="true" data-iconpos="notext" title="Metadata Manager">Metadata Manager</a>';
} }
html += '<div class="viewMenuSecondary">'; html += '<div class="viewMenuSecondary">';
@ -2421,7 +2421,7 @@
$(page).prepend(html); $(page).prepend(html);
Search.onSearchRendered($('.viewMenuBar', page).trigger('create')); $('.viewMenuBar', page).trigger('create');
} }
function insertViews(page, user, counts, liveTvServices) { function insertViews(page, user, counts, liveTvServices) {
@ -2435,26 +2435,26 @@
if (counts.MovieCount || counts.TrailerCount) { if (counts.MovieCount || counts.TrailerCount) {
html += '<a class="viewMenuLink viewMenuTextLink' + (view == 'movies' ? selectedCssClass : '') + '" href="moviesrecommended.html">' + (view == 'movies' ? selectedHtml : '') + '<span class="viewName">Movies</span></a>'; html += '<a class="viewMenuLink viewMenuTextLink desktopViewMenuLink' + (view == 'movies' ? selectedCssClass : '') + '" href="moviesrecommended.html">' + (view == 'movies' ? selectedHtml : '') + '<span class="viewName">Movies</span></a>';
} }
if (counts.EpisodeCount || counts.SeriesCount) { if (counts.EpisodeCount || counts.SeriesCount) {
html += '<a class="viewMenuLink viewMenuTextLink' + (view == 'tv' ? selectedCssClass : '') + '" href="tvrecommended.html">' + (view == 'tv' ? selectedHtml : '') + '<span class="viewName">TV</span></a>'; html += '<a class="viewMenuLink viewMenuTextLink desktopViewMenuLink' + (view == 'tv' ? selectedCssClass : '') + '" href="tvrecommended.html">' + (view == 'tv' ? selectedHtml : '') + '<span class="viewName">TV</span></a>';
} }
if (liveTvServices.length) { if (liveTvServices.length) {
html += '<a class="viewMenuLink viewMenuTextLink' + (view == 'livetv' ? selectedCssClass : '') + '" href="livetvchannels.html">' + (view == 'livetv' ? selectedHtml : '') + '<span class="viewName">Live TV</span></a>'; html += '<a class="viewMenuLink viewMenuTextLink desktopViewMenuLink' + (view == 'livetv' ? selectedCssClass : '') + '" href="livetvchannels.html">' + (view == 'livetv' ? selectedHtml : '') + '<span class="viewName">Live TV</span></a>';
} }
if (counts.SongCount || counts.MusicVideoCount) { if (counts.SongCount || counts.MusicVideoCount) {
html += '<a class="viewMenuLink viewMenuTextLink' + (view == 'music' ? selectedCssClass : '') + '" href="musicrecommended.html">' + (view == 'music' ? selectedHtml : '') + '<span class="viewName">Music</span></a>'; html += '<a class="viewMenuLink viewMenuTextLink desktopViewMenuLink' + (view == 'music' ? selectedCssClass : '') + '" href="musicrecommended.html">' + (view == 'music' ? selectedHtml : '') + '<span class="viewName">Music</span></a>';
} }
if (counts.GameCount) { if (counts.GameCount) {
html += '<a class="viewMenuLink viewMenuTextLink' + (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>';
} }
$('.homeMenuLink', page).after(html); $('.viewMenuRemoteControlButton', page).before(html);
} }
$(document).on('pagebeforeshow', ".libraryPage", function () { $(document).on('pagebeforeshow', ".libraryPage", function () {

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

@ -181,6 +181,10 @@
html += '<div class="searchHintSecondaryText">' + text + '</div>'; html += '<div class="searchHintSecondaryText">' + text + '</div>';
} }
else if (hint.ProductionYear && hint.MediaType != "Audio" && hint.Type != "Episode") {
html += '<div class="searchHintSecondaryText">' + hint.ProductionYear + '</div>';
}
else if (hint.RunTimeTicks) { else if (hint.RunTimeTicks) {
html += '<div class="searchHintSecondaryText">' + Dashboard.getDisplayTime(hint.RunTimeTicks) + '</div>'; html += '<div class="searchHintSecondaryText">' + Dashboard.getDisplayTime(hint.RunTimeTicks) + '</div>';
} }
@ -251,25 +255,8 @@
} }
}); });
}
$('#searchHints', page).on("keydown", '.searchHint', function (e) {
return panel;
}
function search() {
var self = this;
self.showSearchPanel = function (page) {
var panel = getSearchPanel(page);
$(panel).panel('toggle');
};
self.onSearchRendered = function (parentElem) {
$('#searchHints', parentElem).on("keydown", '.searchHint', function (e) {
// Down // Down
if (e.keyCode == 40) { if (e.keyCode == 40) {
@ -290,12 +277,25 @@
if (prev) { if (prev) {
prev.focus(); prev.focus();
} else { } else {
$('#txtSearch', parentElem)[0].focus(); $('#txtSearch', page)[0].focus();
} }
return false; return false;
} }
}); });
}
return panel;
}
function search() {
var self = this;
self.showSearchPanel = function (page) {
var panel = getSearchPanel(page);
$(panel).panel('toggle');
}; };
} }
@ -304,6 +304,7 @@
$(document).on('pagehide', ".libraryPage", function () { $(document).on('pagehide', ".libraryPage", function () {
$('#txtSearch', this).val(''); $('#txtSearch', this).val('');
$('#searchHints', this).empty();
}); });