milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki 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

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

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

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

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

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

@ -89,7 +89,7 @@
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='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 += '<span style="margin-left:.7em;">' + item.Name + '</span>';
html += "</div>";

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

@ -110,9 +110,9 @@
Dashboard.setCurrentUser(user.Id, result.AccessToken);
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 {
window.location = "index.html?u=" + user.Id + '&t=' + result.AccessToken;
window.location.href = "index.html?u=" + user.Id + '&t=' + result.AccessToken;
}
}).fail(function () {

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

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

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

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

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

@ -211,10 +211,10 @@ var Dashboard = {
'connectlogin.html';
if (logoutWithServer === false) {
window.location = loginPage;
window.location.href = loginPage;
} else {
ConnectionManager.logout().done(function () {
window.location = loginPage;
window.location.href = loginPage;
});
}
@ -668,7 +668,7 @@ var Dashboard = {
}
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>';
@ -1507,7 +1507,6 @@ var AppInfo = {};
AppInfo.enableHeaderImages = true;
AppInfo.enableMovieHomeSuggestions = true;
AppInfo.enableAppStorePolicy = isCordova;
if ($.browser.safari) {
@ -1524,6 +1523,7 @@ var AppInfo = {};
AppInfo.enableDetailsMenuImages = false;
AppInfo.enableHeaderImages = false;
AppInfo.enableMovieHomeSuggestions = false;
AppInfo.enableLargeCardMargin = true;
}
}
else {
@ -1643,7 +1643,7 @@ var AppInfo = {};
initFastClick();
}
if (AppInfo.hasLowImageBandwidth) {
if (AppInfo.enableLargeCardMargin) {
$(document.body).addClass('largeCardMargin');
}
@ -1679,6 +1679,10 @@ var AppInfo = {};
$(document.body).addClass('movieTrailersTabDisabled');
}
if (AppInfo.enableBottomTabs) {
$(document.body).addClass('bottomSecondaryNav');
}
if (Dashboard.isRunningInCordova()) {
$(document).addClass('nativeApp');
}

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

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

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

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