Commit 2a039f08 authored by Maxim Kadushkin's avatar Maxim Kadushkin

optimized logo showing

parent 826e7e5e
...@@ -6,9 +6,6 @@ ...@@ -6,9 +6,6 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=IE8"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=IE8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no"> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
<link rel="icon" href="resources/img/favicon.ico" type="image/x-icon"> <link rel="icon" href="resources/img/favicon.ico" type="image/x-icon">
<!-- debug begin -->
<link rel="stylesheet/less" type="text/css" href="resources/less/app.less" />
<!-- debug end -->
<!-- splash --> <!-- splash -->
...@@ -178,8 +175,7 @@ ...@@ -178,8 +175,7 @@
100% { top:100px; background: #55bce6; } 100% { top:100px; background: #55bce6; }
} }
</style> </style>
</head>
<body>
<script> <script>
var userAgent = navigator.userAgent.toLowerCase(), var userAgent = navigator.userAgent.toLowerCase(),
check = function(regex){ return regex.test(userAgent); }, check = function(regex){ return regex.test(userAgent); },
...@@ -187,13 +183,15 @@ ...@@ -187,13 +183,15 @@
if (!check(/opera/) && (check(/msie/) || check(/trident/))) { if (!check(/opera/) && (check(/msie/) || check(/trident/))) {
var m = /msie (\d+\.\d+)/.exec(userAgent); var m = /msie (\d+\.\d+)/.exec(userAgent);
if (m && parseFloat(m[1]) < 9.0) { if (m && parseFloat(m[1]) < 9.0) {
document.write('<div class="app-error-panel">' + document.write(
'<div class="message-block">' + '<div class="app-error-panel">' +
'<div class="message-inner">' + '<div class="message-block">' +
'<div class="title">Your browser is not supported.</div>' + '<div class="message-inner">' +
'<div class="text">Sorry, Document Editor is currently only supported in the latest versions of the Chrome, Firefox, Safari or Internet Explorer web browsers.</div>' + '<div class="title">Your browser is not supported.</div>' +
'</div>' + '<div class="text">Sorry, Document Editor is currently only supported in the latest versions of the Chrome, Firefox, Safari or Internet Explorer web browsers.</div>' +
'</div></div>'); '</div>' +
'</div>' +
'</div>');
stopLoading = true; stopLoading = true;
} }
} }
...@@ -238,23 +236,28 @@ ...@@ -238,23 +236,28 @@
else if ( lang == 'sl') loading = 'Nalaganje...'; else if ( lang == 'sl') loading = 'Nalaganje...';
else if ( lang == 'tr') loading = 'Yükleniyor...'; else if ( lang == 'tr') loading = 'Yükleniyor...';
if (!stopLoading) if ( !stopLoading )
document.write( document.write(
'<div id="loading-mask" class="loadmask">' + '<div id="loading-mask" class="loadmask">' +
'<div class="loader-page" style="margin-bottom: ' + margin + 'px;' + ((logo!==null) ? 'height: auto;' : '') + '">' + '<div class="loader-page" style="margin-bottom: ' + margin + 'px;' + ((logo!==null) ? 'height: auto;' : '') + '">' +
((logo!==null) ? logo : ((logo!==null) ? logo :
'<div class="loader-page-romb">' + '<div class="loader-page-romb">' +
'<div class="romb" id="blue"></div>' + '<div class="romb" id="blue"></div>' +
'<div class="romb" id="green"></div>' + '<div class="romb" id="green"></div>' +
'<div class="romb" id="red"></div>' + '<div class="romb" id="red"></div>' +
'</div>') + '</div>') +
'</div>' + '</div>' +
'<div class="loader-page-text">' + customer + '<div class="loader-page-text">' + customer +
'<div class="loader-page-text-loading">' + loading + '</div>' + '<div class="loader-page-text-loading">' + loading + '</div>' +
'</div>' + '</div>' +
'</div>'); '</div>');
</script> </script>
<!-- debug begin -->
<link rel="stylesheet/less" type="text/css" href="resources/less/app.less" />
<!-- debug end -->
</head>
<body>
<div id="viewport"></div> <div id="viewport"></div>
<!-- debug begin --> <!-- debug begin -->
......
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
<meta name="description" content="" /> <meta name="description" content="" />
<meta name="keywords" content="" /> <meta name="keywords" content="" />
<link rel="icon" href="resources/img/favicon.ico" type="image/x-icon" /> <link rel="icon" href="resources/img/favicon.ico" type="image/x-icon" />
<link rel="stylesheet" type="text/css" href="../../../apps/documenteditor/main/resources/css/app.css">
<!-- splash --> <!-- splash -->
...@@ -177,8 +176,6 @@ ...@@ -177,8 +176,6 @@
100% { top:100px; background: #55bce6; } 100% { top:100px; background: #55bce6; }
} }
</style> </style>
</head>
<body>
<script> <script>
var userAgent = navigator.userAgent.toLowerCase(), var userAgent = navigator.userAgent.toLowerCase(),
...@@ -238,22 +235,28 @@ ...@@ -238,22 +235,28 @@
else if ( lang == 'sl') loading = 'Nalaganje...'; else if ( lang == 'sl') loading = 'Nalaganje...';
else if ( lang == 'tr') loading = 'Yükleniyor...'; else if ( lang == 'tr') loading = 'Yükleniyor...';
if (!stopLoading) if ( !stopLoading )
document.write( document.write(
'<div id="loading-mask" class="loadmask">' + '<div id="loading-mask" class="loadmask">' +
'<div class="loader-page" style="margin-bottom: ' + margin + 'px;' + ((logo!==null) ? 'height: auto;' : '') + '">' + '<div class="loader-page" style="margin-bottom: ' + margin + 'px;' + ((logo!==null) ? 'height: auto;' : '') + '">' +
((logo!==null) ? logo : ((logo!==null) ? logo :
'<div class="loader-page-romb">' + '<div class="loader-page-romb">' +
'<div class="romb" id="blue"></div>' + '<div class="romb" id="blue"></div>' +
'<div class="romb" id="green"></div>' + '<div class="romb" id="green"></div>' +
'<div class="romb" id="red"></div>' + '<div class="romb" id="red"></div>' +
'</div>') + '</div>') +
'</div>' + '</div>' +
'<div class="loader-page-text">' + customer + '<div class="loader-page-text">' + customer +
'<div class="loader-page-text-loading">' + loading + '</div>' + '<div class="loader-page-text-loading">' + loading + '</div>' +
'</div>' + '</div>' +
'</div>'); '</div>');
</script>
<link rel="stylesheet" type="text/css" href="../../../apps/documenteditor/main/resources/css/app.css">
</head>
<body>
<script>
window.requireTimeourError = function(){ window.requireTimeourError = function(){
var reqerr; var reqerr;
......
...@@ -6,12 +6,8 @@ ...@@ -6,12 +6,8 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=IE8"/> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=IE8"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no"> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
<link rel="icon" href="resources/img/favicon.ico" type="image/x-icon" /> <link rel="icon" href="resources/img/favicon.ico" type="image/x-icon" />
<!-- debug begin -->
<link rel="stylesheet/less" type="text/css" href="resources/less/app.less" />
<!-- debug end -->
<!-- splash --> <!-- splash -->
<style type="text/css"> <style type="text/css">
.loadmask { .loadmask {
left: 0; left: 0;
...@@ -178,8 +174,6 @@ ...@@ -178,8 +174,6 @@
100% { top:100px; background: #55bce6; } 100% { top:100px; background: #55bce6; }
} }
</style> </style>
</head>
<body>
<script> <script>
var userAgent = navigator.userAgent.toLowerCase(), var userAgent = navigator.userAgent.toLowerCase(),
...@@ -188,13 +182,15 @@ ...@@ -188,13 +182,15 @@
if (!check(/opera/) && (check(/msie/) || check(/trident/))) { if (!check(/opera/) && (check(/msie/) || check(/trident/))) {
var m = /msie (\d+\.\d+)/.exec(userAgent); var m = /msie (\d+\.\d+)/.exec(userAgent);
if (m && parseFloat(m[1]) < 9.0) { if (m && parseFloat(m[1]) < 9.0) {
document.write('<div class="app-error-panel">' + document.write(
'<div class="message-block">' + '<div class="app-error-panel">' +
'<div class="message-inner">' + '<div class="message-block">' +
'<div class="title">Your browser is not supported.</div>' + '<div class="message-inner">' +
'<div class="text">Sorry, Presentation Editor is currently only supported in the latest versions of the Chrome, Firefox, Safari or Internet Explorer web browsers.</div>' + '<div class="title">Your browser is not supported.</div>' +
'</div>' + '<div class="text">Sorry, Presentation Editor is currently only supported in the latest versions of the Chrome, Firefox, Safari or Internet Explorer web browsers.</div>' +
'</div></div>'); '</div>' +
'</div>' +
'</div>');
stopLoading = true; stopLoading = true;
} }
} }
...@@ -239,9 +235,9 @@ ...@@ -239,9 +235,9 @@
else if ( lang == 'sl') loading = 'Nalaganje...'; else if ( lang == 'sl') loading = 'Nalaganje...';
else if ( lang == 'tr') loading = 'Yükleniyor...'; else if ( lang == 'tr') loading = 'Yükleniyor...';
if (!stopLoading) if ( !stopLoading )
document.write( document.write(
'<div id="loading-mask" class="loadmask">' + '<div id="loading-mask" class="loadmask">' +
'<div class="loader-page" style="margin-bottom: ' + margin + 'px;' + ((logo!==null) ? 'height: auto;' : '') + '">' + '<div class="loader-page" style="margin-bottom: ' + margin + 'px;' + ((logo!==null) ? 'height: auto;' : '') + '">' +
((logo!==null) ? logo : ((logo!==null) ? logo :
'<div class="loader-page-romb">' + '<div class="loader-page-romb">' +
...@@ -251,11 +247,16 @@ ...@@ -251,11 +247,16 @@
'</div>') + '</div>') +
'</div>' + '</div>' +
'<div class="loader-page-text">' + customer + '<div class="loader-page-text">' + customer +
'<div class="loader-page-text-loading">' + loading + '</div>' + '<div class="loader-page-text-loading">' + loading + '</div>' +
'</div>' + '</div>' +
'</div>'); '</div>');
</script> </script>
<!-- debug begin -->
<link rel="stylesheet/less" type="text/css" href="resources/less/app.less" />
<!-- debug end -->
</head>
<body>
<div id="viewport"></div> <div id="viewport"></div>
<script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script> <script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script>
...@@ -264,7 +265,7 @@ ...@@ -264,7 +265,7 @@
<script type="text/javascript"> <script type="text/javascript">
window.g_debug_mode = true; window.g_debug_mode = true;
</script> </script>
<!-- debug begin --> <!-- debug begin -->
<script type="text/javascript">var less=less||{};less.env='development';</script> <script type="text/javascript">var less=less||{};less.env='development';</script>
<script src="../../../vendor/less/dist/less-2.7.1.js" type="text/javascript"></script> <script src="../../../vendor/less/dist/less-2.7.1.js" type="text/javascript"></script>
......
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
<meta name="description" content="" /> <meta name="description" content="" />
<meta name="keywords" content="" /> <meta name="keywords" content="" />
<link rel="icon" href="resources/img/favicon.ico" type="image/x-icon" /> <link rel="icon" href="resources/img/favicon.ico" type="image/x-icon" />
<link rel="stylesheet" type="text/css" href="../../../apps/presentationeditor/main/resources/css/app.css">
<!-- splash --> <!-- splash -->
...@@ -177,6 +176,83 @@ ...@@ -177,6 +176,83 @@
100% { top:100px; background: #55bce6; } 100% { top:100px; background: #55bce6; }
} }
</style> </style>
<script>
var userAgent = navigator.userAgent.toLowerCase(),
check = function(regex){ return regex.test(userAgent); },
stopLoading = false;
if (!check(/opera/) && (check(/msie/) || check(/trident/))) {
var m = /msie (\d+\.\d+)/.exec(userAgent);
if (m && parseFloat(m[1]) < 9.0) {
document.write('<div class="app-error-panel">' +
'<div class="message-block">' +
'<div class="message-inner">' +
'<div class="title">Your browser is not supported.</div>' +
'<div class="text">Sorry, Presentation Editor is currently only supported in the latest versions of the Chrome, Firefox, Safari or Internet Explorer web browsers.</div>' +
'</div>' +
'</div></div>');
stopLoading = true;
}
}
function getUrlParams() {
var e,
a = /\+/g, // Regex for replacing addition symbol with a space
r = /([^&=]+)=?([^&]*)/g,
d = function (s) { return decodeURIComponent(s.replace(a, " ")); },
q = window.location.search.substring(1),
urlParams = {};
while (e = r.exec(q))
urlParams[d(e[1])] = d(e[2]);
return urlParams;
}
function encodeUrlParam(str) {
return str.replace(/&/g, '&amp;')
.replace(/"/g, '&quot;')
.replace(/'/g, '&#39;')
.replace(/</g, '&lt;')
.replace(/>/g, '&gt;');
}
var params = getUrlParams(),
lang = (params["lang"] || 'en').split("-")[0],
customer = params["customer"] ? ('<div class="loader-page-text-customer">' + encodeUrlParam(params["customer"]) + '</div>') : '',
margin = (customer !== '') ? 50 : 20,
loading = 'Loading...',
logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null;
window.frameEditorId = params["frameEditorId"];
if ( lang == 'de') loading = 'Ladevorgang...';
else if ( lang == 'es') loading = 'Cargando...';
else if ( lang == 'fr') loading = 'Chargement en cours...';
else if ( lang == 'it') loading = 'Caricamento in corso...';
else if ( lang == 'pt') loading = 'Carregando...';
else if ( lang == 'ru') loading = 'Загрузка...';
else if ( lang == 'sl') loading = 'Nalaganje...';
else if ( lang == 'tr') loading = 'Yükleniyor...';
if (!stopLoading)
document.write(
'<div id="loading-mask" class="loadmask">' +
'<div class="loader-page" style="margin-bottom: ' + margin + 'px;' + ((logo!==null) ? 'height: auto;' : '') + '">' +
((logo!==null) ? logo :
'<div class="loader-page-romb">' +
'<div class="romb" id="blue"></div>' +
'<div class="romb" id="green"></div>' +
'<div class="romb" id="red"></div>' +
'</div>') +
'</div>' +
'<div class="loader-page-text">' + customer +
'<div class="loader-page-text-loading">' + loading + '</div>' +
'</div>' +
'</div>');
</script>
<link rel="stylesheet" type="text/css" href="../../../apps/presentationeditor/main/resources/css/app.css">
</head> </head>
<body> <body>
......
...@@ -6,14 +6,7 @@ ...@@ -6,14 +6,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=IE8"/> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=IE8"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no"> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
<link rel="stylesheet" type="text/css" href="../../../../sdkjs/cell/css/main.css"/> <!-- splash -->
<!-- debug begin -->
<link rel="stylesheet/less" type="text/css" href="resources/less/app.less" />
<!-- debug end -->
<!-- splash -->
<style type="text/css"> <style type="text/css">
.loadmask { .loadmask {
left: 0; left: 0;
...@@ -180,8 +173,6 @@ ...@@ -180,8 +173,6 @@
100% { top:100px; background: #55bce6; } 100% { top:100px; background: #55bce6; }
} }
</style> </style>
</head>
<body>
<script> <script>
var userAgent = navigator.userAgent.toLowerCase(), var userAgent = navigator.userAgent.toLowerCase(),
...@@ -190,13 +181,15 @@ ...@@ -190,13 +181,15 @@
if (!check(/opera/) && (check(/msie/) || check(/trident/))) { if (!check(/opera/) && (check(/msie/) || check(/trident/))) {
var m = /msie (\d+\.\d+)/.exec(userAgent); var m = /msie (\d+\.\d+)/.exec(userAgent);
if (m && parseFloat(m[1]) < 9.0) { if (m && parseFloat(m[1]) < 9.0) {
document.write('<div class="app-error-panel">' + document.write(
'<div class="message-block">' + '<div class="app-error-panel">' +
'<div class="message-inner">' + '<div class="message-block">' +
'<div class="title">Your browser is not supported.</div>' + '<div class="message-inner">' +
'<div class="text">Sorry, Spreadsheet Editor is currently only supported in the latest versions of the Chrome, Firefox, Safari or Internet Explorer web browsers.</div>' + '<div class="title">Your browser is not supported.</div>' +
'</div>' + '<div class="text">Sorry, Spreadsheet Editor is currently only supported in the latest versions of the Chrome, Firefox, Safari or Internet Explorer web browsers.</div>' +
'</div></div>'); '</div>' +
'</div>' +
'</div>');
stopLoading = true; stopLoading = true;
} }
} }
...@@ -242,28 +235,36 @@ ...@@ -242,28 +235,36 @@
else if ( lang == 'tr') loading = 'Yükleniyor...'; else if ( lang == 'tr') loading = 'Yükleniyor...';
if (!stopLoading) if (!stopLoading)
document.write( document.write(
'<div id="loading-mask" class="loadmask">' + '<div id="loading-mask" class="loadmask">' +
'<div class="loader-page" style="margin-bottom: ' + margin + 'px;' + ((logo!==null) ? 'height: auto;' : '') + '">' + '<div class="loader-page" style="margin-bottom: ' + margin + 'px;' + ((logo!==null) ? 'height: auto;' : '') + '">' +
((logo!==null) ? logo : ((logo!==null) ? logo :
'<div class="loader-page-romb">' + '<div class="loader-page-romb">' +
'<div class="romb" id="blue"></div>' + '<div class="romb" id="blue"></div>' +
'<div class="romb" id="green"></div>' + '<div class="romb" id="green"></div>' +
'<div class="romb" id="red"></div>' + '<div class="romb" id="red"></div>' +
'</div>') + '</div>') +
'</div>' + '</div>' +
'<div class="loader-page-text">' + customer + '<div class="loader-page-text">' + customer +
'<div class="loader-page-text-loading">' + loading + '</div>' + '<div class="loader-page-text-loading">' + loading + '</div>' +
'</div>' + '</div>' +
'</div>'); '</div>');
</script> </script>
<link rel="stylesheet" type="text/css" href="../../../../sdkjs/cell/css/main.css"/>
<!-- debug begin -->
<link rel="stylesheet/less" type="text/css" href="resources/less/app.less" />
<!-- debug end -->
</head>
<body>
<div id="viewport"></div> <div id="viewport"></div>
<script type="text/javascript"> <script type="text/javascript">
window.g_debug_mode = true; window.g_debug_mode = true;
</script> </script>
<!-- debug begin --> <!-- debug begin -->
<script type="text/javascript">var less=less||{};less.env='development';</script> <script type="text/javascript">var less=less||{};less.env='development';</script>
<script src="../../../vendor/less/dist/less-2.7.1.js" type="text/javascript"></script> <script src="../../../vendor/less/dist/less-2.7.1.js" type="text/javascript"></script>
......
...@@ -8,11 +8,7 @@ ...@@ -8,11 +8,7 @@
<meta name="keywords" content="" /> <meta name="keywords" content="" />
<link rel="icon" href="resources/img/favicon.ico" type="image/x-icon" /> <link rel="icon" href="resources/img/favicon.ico" type="image/x-icon" />
<link rel="stylesheet" type="text/css" href="../../../../sdkjs/cell/css/main.css"/> <!-- splash -->
<link rel="stylesheet" type="text/css" href="../../../apps/spreadsheeteditor/main/resources/css/app.css">
<!-- splash -->
<style type="text/css"> <style type="text/css">
.loadmask { .loadmask {
left: 0; left: 0;
...@@ -179,8 +175,7 @@ ...@@ -179,8 +175,7 @@
100% { top:100px; background: #55bce6; } 100% { top:100px; background: #55bce6; }
} }
</style> </style>
</head>
<body>
<script> <script>
var userAgent = navigator.userAgent.toLowerCase(), var userAgent = navigator.userAgent.toLowerCase(),
check = function(regex){ return regex.test(userAgent); }, check = function(regex){ return regex.test(userAgent); },
...@@ -240,21 +235,27 @@ ...@@ -240,21 +235,27 @@
else if ( lang == 'tr') loading = 'Yükleniyor...'; else if ( lang == 'tr') loading = 'Yükleniyor...';
if (!stopLoading) if (!stopLoading)
document.write( document.write(
'<div id="loading-mask" class="loadmask">' + '<div id="loading-mask" class="loadmask">' +
'<div class="loader-page" style="margin-bottom: ' + margin + 'px;' + ((logo!==null) ? 'height: auto;' : '') + '">' + '<div class="loader-page" style="margin-bottom: ' + margin + 'px;' + ((logo!==null) ? 'height: auto;' : '') + '">' +
((logo!==null) ? logo : ((logo!==null) ? logo :
'<div class="loader-page-romb">' + '<div class="loader-page-romb">' +
'<div class="romb" id="blue"></div>' + '<div class="romb" id="blue"></div>' +
'<div class="romb" id="green"></div>' + '<div class="romb" id="green"></div>' +
'<div class="romb" id="red"></div>' + '<div class="romb" id="red"></div>' +
'</div>') + '</div>') +
'</div>' + '</div>' +
'<div class="loader-page-text">' + customer + '<div class="loader-page-text">' + customer +
'<div class="loader-page-text-loading">' + loading + '</div>' + '<div class="loader-page-text-loading">' + loading + '</div>' +
'</div>' + '</div>' +
'</div>'); '</div>');
</script>
<link rel="stylesheet" type="text/css" href="../../../../sdkjs/cell/css/main.css"/>
<link rel="stylesheet" type="text/css" href="../../../apps/spreadsheeteditor/main/resources/css/app.css">
</head>
<body>
<script>
window.requireTimeourError = function(){ window.requireTimeourError = function(){
var reqerr; var reqerr;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment