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 translations

Browse source
This commit is contained in:
Luke Pulverenti 2015-05-16 23:17:23 -04:00
parent 89e0515a15
commit 0a670a4635
15 changed files with 57 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

5
dashboard-ui/css/card.css
View file

@ -307,14 +307,11 @@
} }
} }
@media all and (min-width: 400px) { @media all and (min-width: 500px) {
.smallBackdropCard { .smallBackdropCard {
width: 33.3%; width: 33.3%;
} }
}
@media all and (min-width: 500px) {
.squareCard { .squareCard {
width: 33.3%; width: 33.3%;

20
dashboard-ui/css/livetv.css
View file

@ -1,8 +1,26 @@
.tvGuideHeader.headroom--unpinned { .tvGuideHeader {
white-space: nowrap;
position: fixed;
top: 98px;
left: 0;
z-index: 100;
max-width: 100%;
}
.bottomSecondaryNav .tvGuideHeader {
top: 48px;
}
.tvGuideHeader.headroom--unpinned {
-webkit-transform: translateY(-98px); -webkit-transform: translateY(-98px);
transform: translateY(-98px); transform: translateY(-98px);
} }
.bottomSecondaryNav .tvGuideHeader.headroom--unpinned {
-webkit-transform: translateY(-48px);
transform: translateY(-48px);
}
.tvProgramSectionHeader { .tvProgramSectionHeader {
margin: 0; margin: 0;
} }

2
dashboard-ui/livetvguide.html
View file

@ -16,7 +16,7 @@
<div data-role="content" style="padding-top: 5px;padding-left:0!important;padding-right:0!important;"> <div data-role="content" style="padding-top: 5px;padding-left:0!important;padding-right:0!important;">
<div class="tvGuide"> <div class="tvGuide">
<div style="white-space: nowrap;position:fixed;top:98px;left:0;z-index:100; max-width: 100%;" class="tvGuideHeader"> <div class="tvGuideHeader">
<div class="channelTimeslotHeader"> <div class="channelTimeslotHeader">
<div class="timeslotHeaderInner"> <div class="timeslotHeaderInner">
<a href="#popupConfig" data-rel="popup" class="accentButton" style="display:block;padding-left:5px;"><i class="fa fa-calendar"></i><span class="currentDate"></span></a> <a href="#popupConfig" data-rel="popup" class="accentButton" style="display:block;padding-left:5px;"><i class="fa fa-calendar"></i><span class="currentDate"></span></a>

2
dashboard-ui/musicalbumartists.html
View file

@ -28,7 +28,7 @@
</div> </div>
</div> </div>
</div> </div>
<div id="items" class="itemsContainer paddedItemsContainer"></div> <div id="items" class="itemsContainer paddedItemsContainer" style="text-align:center;"></div>
</div> </div>
<div data-role="panel" class="viewPanel" data-theme="a" data-position="right" data-display="overlay" data-position-fixed="true"> <div data-role="panel" class="viewPanel" data-theme="a" data-position="right" data-display="overlay" data-position-fixed="true">

2
dashboard-ui/musicartists.html
View file

@ -28,7 +28,7 @@
</div> </div>
</div> </div>
</div> </div>
<div id="items" class="itemsContainer paddedItemsContainer"></div> <div id="items" class="itemsContainer paddedItemsContainer" style="text-align:center;"></div>
</div> </div>
<div data-role="panel" class="viewPanel" data-theme="a" data-position="right" data-display="overlay" data-position-fixed="true"> <div data-role="panel" class="viewPanel" data-theme="a" data-position="right" data-display="overlay" data-position-fixed="true">
<form> <form>

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

@ -41,7 +41,7 @@
Dashboard.serverAddress(apiClient.serverAddress()); Dashboard.serverAddress(apiClient.serverAddress());
Dashboard.setCurrentUser(apiClient.getCurrentUserId(), apiClient.accessToken()); Dashboard.setCurrentUser(apiClient.getCurrentUserId(), apiClient.accessToken());
window.location = 'index.html'; window.location.href = 'index.html';
} }
break; break;
case MediaBrowser.ConnectionState.ServerSignIn: case MediaBrowser.ConnectionState.ServerSignIn:

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

@ -17,7 +17,7 @@
callback: function () { callback: function () {
window.location = 'login.html'; window.location.href = 'login.html';
} }
}); });
return; return;

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

@ -89,7 +89,7 @@
html += '<a data-itemid="' + item.Id + '" class="' + cssClass + '" href="' + href + '">'; html += '<a data-itemid="' + item.Id + '" class="' + cssClass + '" href="' + href + '">';
html += '<div class="cardBox" style="background-color:' + backgroundColor + ';margin:4px;border-radius:4px;">'; html += '<div class="cardBox" style="background-color:' + backgroundColor + ';margin:4px;border-radius:4px;">';
html += "<div class='cardText' style='padding:7px 10px;color:#fff;'>"; html += "<div class='cardText' style='padding:8px 10px;color:#fff;font-size:14px;'>";
html += '<i class="fa ' + icon + '"></i>'; html += '<i class="fa ' + icon + '"></i>';
html += '<span style="margin-left:.7em;">' + item.Name + '</span>'; html += '<span style="margin-left:.7em;">' + item.Name + '</span>';
html += "</div>"; html += "</div>";

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

@ -110,9 +110,9 @@
Dashboard.setCurrentUser(user.Id, result.AccessToken); Dashboard.setCurrentUser(user.Id, result.AccessToken);
if (user.Policy.IsAdministrator && !serverId) { if (user.Policy.IsAdministrator && !serverId) {
window.location = "dashboard.html?u=" + user.Id + '&t=' + result.AccessToken; window.location.href = "dashboard.html?u=" + user.Id + '&t=' + result.AccessToken;
} else { } else {
window.location = "index.html?u=" + user.Id + '&t=' + result.AccessToken; window.location.href = "index.html?u=" + user.Id + '&t=' + result.AccessToken;
} }
}).fail(function () { }).fail(function () {

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

@ -48,15 +48,6 @@
updateFilterControls(page); updateFilterControls(page);
var trigger = false; var trigger = false;
if (AppInfo.hasLowImageBandwidth) {
if (view == 'Thumb') {
view = 'ThumbCard';
}
else if (view == 'Poster') {
view = 'PosterCard';
}
}
if (view == "Thumb") { if (view == "Thumb") {
html = LibraryBrowser.getPosterViewHtml({ html = LibraryBrowser.getPosterViewHtml({
items: result.Items, items: result.Items,

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

@ -16,13 +16,13 @@
Dashboard.serverAddress(apiClient.serverAddress()); Dashboard.serverAddress(apiClient.serverAddress());
Dashboard.setCurrentUser(apiClient.getCurrentUserId(), apiClient.accessToken()); Dashboard.setCurrentUser(apiClient.getCurrentUserId(), apiClient.accessToken());
window.location = 'index.html'; window.location.href = 'index.html';
} }
break; break;
case MediaBrowser.ConnectionState.ServerSignIn: case MediaBrowser.ConnectionState.ServerSignIn:
{ {
if (Dashboard.isRunningInCordova()) { if (Dashboard.isRunningInCordova()) {
window.location = 'login.html?serverid=' + result.Servers[0].Id; window.location.href = 'login.html?serverid=' + result.Servers[0].Id;
} else { } else {
showServerConnectionFailure(); showServerConnectionFailure();
} }

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

@ -211,10 +211,10 @@ var Dashboard = {
'connectlogin.html'; 'connectlogin.html';
if (logoutWithServer === false) { if (logoutWithServer === false) {
window.location = loginPage; window.location.href = loginPage;
} else { } else {
ConnectionManager.logout().done(function () { ConnectionManager.logout().done(function () {
window.location = loginPage; window.location.href = loginPage;
}); });
} }
@ -668,7 +668,7 @@ var Dashboard = {
} }
if (isConnectMode) { if (isConnectMode) {
html += '<p><a data-mini="true" data-role="button" href="selectserver.html" data-icon="cloud" data-ajax="false">' + Globalize.translate('ButtonSelectServer') + '</button></a>'; html += '<p><a data-mini="true" data-role="button" href="selectserver.html" data-icon="cloud">' + Globalize.translate('ButtonSelectServer') + '</button></a>';
} }
html += '<p><button data-mini="true" type="button" onclick="Dashboard.logout();" data-icon="lock">' + Globalize.translate('ButtonSignOut') + '</button></p>'; html += '<p><button data-mini="true" type="button" onclick="Dashboard.logout();" data-icon="lock">' + Globalize.translate('ButtonSignOut') + '</button></p>';
@ -1507,7 +1507,6 @@ var AppInfo = {};
AppInfo.enableHeaderImages = true; AppInfo.enableHeaderImages = true;
AppInfo.enableMovieHomeSuggestions = true; AppInfo.enableMovieHomeSuggestions = true;
AppInfo.enableAppStorePolicy = isCordova; AppInfo.enableAppStorePolicy = isCordova;
if ($.browser.safari) { if ($.browser.safari) {
@ -1524,6 +1523,7 @@ var AppInfo = {};
AppInfo.enableDetailsMenuImages = false; AppInfo.enableDetailsMenuImages = false;
AppInfo.enableHeaderImages = false; AppInfo.enableHeaderImages = false;
AppInfo.enableMovieHomeSuggestions = false; AppInfo.enableMovieHomeSuggestions = false;
AppInfo.enableLargeCardMargin = true;
} }
} }
else { else {
@ -1643,7 +1643,7 @@ var AppInfo = {};
initFastClick(); initFastClick();
} }
if (AppInfo.hasLowImageBandwidth) { if (AppInfo.enableLargeCardMargin) {
$(document.body).addClass('largeCardMargin'); $(document.body).addClass('largeCardMargin');
} }
@ -1679,6 +1679,10 @@ var AppInfo = {};
$(document.body).addClass('movieTrailersTabDisabled'); $(document.body).addClass('movieTrailersTabDisabled');
} }
if (AppInfo.enableBottomTabs) {
$(document.body).addClass('bottomSecondaryNav');
}
if (Dashboard.isRunningInCordova()) { if (Dashboard.isRunningInCordova()) {
$(document).addClass('nativeApp'); $(document).addClass('nativeApp');
} }

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

@ -43,15 +43,6 @@
updateFilterControls(page); updateFilterControls(page);
if (AppInfo.hasLowImageBandwidth) {
if (view == 'Thumb') {
view = 'ThumbCard';
}
else if (view == 'Poster') {
view = 'PosterCard';
}
}
if (view == "Thumb") { if (view == "Thumb") {
html = LibraryBrowser.getPosterViewHtml({ html = LibraryBrowser.getPosterViewHtml({

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

@ -141,6 +141,10 @@
}).get(); }).get();
// Legacy
user.Policy.BlockedChannels = null;
user.Policy.BlockedMediaFolders = null;
ApiClient.updateUserPolicy(user.Id, user.Policy).done(function () { ApiClient.updateUserPolicy(user.Id, user.Policy).done(function () {
onSaveComplete(page); onSaveComplete(page);
}); });

17
dashboard-ui/thirdparty/cordova/serverdiscovery.js vendored
View file

@ -14,6 +14,15 @@
return String.fromCharCode.apply(null, new Uint16Array(buf)); return String.fromCharCode.apply(null, new Uint16Array(buf));
} }
function getResultCode(result) {
if (result != null && result.resultCode != null) {
return result.resultCode;
}
return result;
}
function findServersInternal(timeoutMs) { function findServersInternal(timeoutMs) {
var deferred = DeferredBuilder.Deferred(); var deferred = DeferredBuilder.Deferred();
@ -36,6 +45,8 @@
function startTimer() { function startTimer() {
console.log('starting udp receive timer with timeout ms: ' + timeoutMs);
timeout = setTimeout(function () { timeout = setTimeout(function () {
isTimedOut = true; isTimedOut = true;
@ -83,9 +94,9 @@
console.log('chrome.sockets.udp.bind'); console.log('chrome.sockets.udp.bind');
chrome.sockets.udp.bind(createInfo.socketId, '0.0.0.0', port, function (result) { chrome.sockets.udp.bind(createInfo.socketId, '0.0.0.0', 0, function (result) {
if (result != 0) { if (getResultCode(result) != 0) {
console.log('bind fail: ' + result); console.log('bind fail: ' + result);
deferred.resolveWith(null, [servers]); deferred.resolveWith(null, [servers]);
chrome.sockets.udp.close(createInfo.socketId); chrome.sockets.udp.close(createInfo.socketId);
@ -97,7 +108,7 @@
console.log('chrome.sockets.udp.send'); console.log('chrome.sockets.udp.send');
chrome.sockets.udp.send(createInfo.socketId, data, '255.255.255.255', port, function (result) { chrome.sockets.udp.send(createInfo.socketId, data, '255.255.255.255', port, function (result) {
if (result != 0) { if (getResultCode(result) != 0) {
console.log('send fail: ' + result); console.log('send fail: ' + result);
deferred.resolveWith(null, [servers]); deferred.resolveWith(null, [servers]);
chrome.sockets.udp.close(createInfo.socketId); chrome.sockets.udp.close(createInfo.socketId);