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

fix merge conflict

Browse source
This commit is contained in:
Luke Pulverenti 2015-11-26 23:54:00 -05:00
parent 0e5a6ff87d
commit eb54892a07
1 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -104,7 +104,7 @@
html += '<div style="background:rgba(0,0,0,.90);top: 0;left: 0;right: 0;bottom: 0;position: fixed;z-index:1098;font-size:14px;">'; html += '<div style="background:rgba(0,0,0,.90);top: 0;left: 0;right: 0;bottom: 0;position: fixed;z-index:1098;font-size:14px;">';
html += '<div class="readOnlyContent" style="margin:20px auto 0;color:#fff;padding:1em;">'; html += '<div class="readOnlyContent" style="margin:20px auto 0;color:#fff;padding:1em;">';
html += '<h1>' + Globalize.translate('HeaderEmbyPremiere') + '</h1>'; html += '<h1>' + Globalize.translate('HeaderTryEmbyPremiere') + '</h1>';
html += '<p>' + Globalize.translate('MessageDidYouKnowCinemaMode') + '</p>'; html += '<p>' + Globalize.translate('MessageDidYouKnowCinemaMode') + '</p>';
html += '<p>' + Globalize.translate('MessageDidYouKnowCinemaMode2') + '</p>'; html += '<p>' + Globalize.translate('MessageDidYouKnowCinemaMode2') + '</p>';
@ -224,12 +224,7 @@
var url = "http://mb3admin.com/admin/service/user/getPayPalEmail?id=" + pkg.owner; var url = "http://mb3admin.com/admin/service/user/getPayPalEmail?id=" + pkg.owner;
fetch(url, { mode: 'no-cors' }).then(function (response) { $.getJSON(url).done(function (dev) {
return response.json();
}).then(function (dev) {
if (dev.payPalEmail) { if (dev.payPalEmail) {
$('#payPalEmail', page).val(dev.payPalEmail); $('#payPalEmail', page).val(dev.payPalEmail);