Allow for different loading screens, configured via the settings plugin.

pull/223/head
Ruben Daniels 2015-11-13 01:15:22 +00:00
rodzic 60a644ceef
commit 286b903694
6 zmienionych plików z 98 dodań i 46 usunięć

Plik binarny nie jest wyświetlany.

Po

Szerokość:  |  Wysokość:  |  Rozmiar: 20 KiB

Plik binarny nie jest wyświetlany.

Po

Szerokość:  |  Wysokość:  |  Rozmiar: 86 KiB

Plik binarny nie jest wyświetlany.

Po

Szerokość:  |  Wysokość:  |  Rozmiar: 19 KiB

Plik binarny nie jest wyświetlany.

Po

Szerokość:  |  Wysokość:  |  Rozmiar: 37 KiB

Wyświetl plik

@ -1,8 +1,13 @@
HTML{
background: -moz-linear-gradient(top, rgba(255,255,255,1) 0%, rgba(251,251,251,1) 100%); /* FF3.6-15 */
background: -webkit-linear-gradient(top, rgba(255,255,255,1) 0%,rgba(251,251,251,1) 100%); /* Chrome10-25,Safari5.1-6 */
background: linear-gradient(to bottom, rgba(255,255,255,1) 0%,rgba(251,251,251,1) 100%); /* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */
}
#loadingide { #loadingide {
background-image: url(images/loading-logo.png); background-image: url(images/c9-logo-blue.png);
background-repeat: no-repeat; background-repeat: no-repeat;
background-color: #222222; background-position: 50% 30%;
background-position: 50% 40%;
font-style: normal; font-style: normal;
height: 100%; height: 100%;
width: 100%; width: 100%;
@ -14,10 +19,18 @@
-webkit-font-smoothing: antialiased !important; -webkit-font-smoothing: antialiased !important;
-moz-osx-font-smoothing: grayscale !important; -moz-osx-font-smoothing: grayscale !important;
} }
#loadingide.dark {
background-image: url(images/c9-logo-white.png);
/*background-color: #222222;*/
}
@media print, (-o-min-device-pixel-ratio: 5/4), (-webkit-min-device-pixel-ratio: 1.25), (min-resolution: 1.25dppx) { @media print, (-o-min-device-pixel-ratio: 5/4), (-webkit-min-device-pixel-ratio: 1.25), (min-resolution: 1.25dppx) {
#loadingide { #loadingide {
background-image: url(images/loading-logo@2x.png); background-image: url(images/c9-logo-blue@2x.png);
background-size: 514px 431px; background-size: 300px 279px;
}
#loadingide.dark {
background-image: url(images/c9-logo-white@2x.png);
} }
} }
@ -44,28 +57,35 @@
#loadingide .footer { #loadingide .footer {
font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
font-size: 11px; font-size: 11px;
text-shadow: 0 1px 0 #000; color: #333;
filter: dropshadow(color=#000, offx=0, offy=1);
color: #818181;
position:absolute; position:absolute;
bottom:5px; bottom:5px;
right:10px; right:10px;
text-align: right; text-align: right;
margin: 0; margin: 0;
} }
#loadingide .footer, .footer > a:link, a:visited, a:active { #loadingide.dark .footer {
color: #909090; color: #818181;
}
#loadingide .footer,
#loadingide .footer > a:link,
#loadingide .footer > a:visited,
#loadingide .footer > a:active {
color: #333;
text-decoration: none; text-decoration: none;
} }
#loadingide.dark .footer,
#loadingide.dark .footer > a:link,
#loadingide.dark .footer > a:visited,
#loadingide.dark .footer > a:active {
color: #909090;
}
#loadingide .footer > a:hover { #loadingide .footer > a:hover {
color: #f1f1f1; color: #444;
text-decoration: underline; text-decoration: underline;
} }
#loadingide #dots { #loadingide.dark .footer > a:hover {
width: 30px; color: #f1f1f1;
display: inline-block;
text-align: left;
margin-right: -30px;
} }
#errorMessage { #errorMessage {
display: block; display: block;
@ -86,3 +106,38 @@
color: #720c10; color: #720c10;
text-decoration: underline; text-decoration: underline;
} }
.status {
position: absolute;
left: 50%;
margin-left: -100px;
width: 200px;
text-align: center;
top: 57%;
margin-top: 200px;
}
.cool-message {
display: block;
font-family: Arial;
font-size: 30px;
color: #A7A7A7;
white-space: nowrap;
position: absolute;
top: 30%;
left: 50%;
width: 1000px;
text-align: center;
margin-left: -500px;
margin-top: 250px;
}
.spinner {
background: url(images/running_flat_light@2x.png);
background-size: 300px 20px;
animation: rotation 0.6s infinite steps(16);
width: 20px;
height: 20px;
background-repeat: no-repeat;
display: inline-block;
}

Wyświetl plik

@ -16,39 +16,35 @@
window.isLocalVersion = nRequire ? true : false; window.isLocalVersion = nRequire ? true : false;
window.require = undefined; window.require = undefined;
</script> </script>
<link rel="stylesheet" type="text/css" href="/static/plugins/c9.ide.layout.classic/loading.css" />
<link rel="shortcut icon" type="image/x-icon" href="favicon.ico" /> <link rel="shortcut icon" type="image/x-icon" href="favicon.ico" />
<link rel="icon" type="image/x-icon" href="favicon.ico" /> <link rel="icon" type="image/x-icon" href="favicon.ico" />
</head> </head>
<body> <body>
<div id="loadingide"> <%
<div id="content" class="loading-progress"> var plugins = architectConfig;
<div id="progress-msg"> var theme = "flat-light", html;
Loading your workspace <span id="dots"></span> plugins.some(function(n){
</div> if (n.packagePath == "plugins/c9.core/settings") {
<div class="loading-seperator"></div> if (n.html) html = n.html;
<div class="loading-msg">It will be just as you left it</div>
<div class="ui-progress-bar ui-container" id="progress_bar"> try { var settings = JSON.parse(n.settings.user); }
<div class="ui-progress" style="width: 7%;"> catch(e) { return; }
<span class="ui-label" style="display:none;"></span>
</div>
</div>
</div>
<div class="footer">
<a href="https://docs.c9.io">Documentation</a> |
<a href="http://status.c9.io">Server Status</a> |
<a href="http://support.c9.io">Support</a>
</div>
</div>
<script type="text/javascript"> theme = settings.general["@skin"];
var dots = document.getElementById("dots"); return true;
var cnt = 0; }
window.dotsAnim = setInterval(function () { });
dots.textContent = "...".slice(0, (++cnt)%4);
}, 500); if (!html) {
</script> var isDark = theme.indexOf("dark") > -1;
%><% include ../../c9.ide.server/views/basic-loading.html %><%
}
else {
%><div id="loadingide" class="<%-: theme + (isDark ? " dark" : "") %>">
<%-: html %>
</div><%
}
%>
<% if (packed) { %> <% if (packed) { %>
<script src="/static/<%=version%>/config/<%=configName%>.js"></script> <script src="/static/<%=version%>/config/<%=configName%>.js"></script>
@ -58,7 +54,7 @@
<% } %> <% } %>
<script> <script>
var plugins = <%-: architectConfig | JSONToJS %>; var plugins = <%-: architectConfig | JSONToJS %>;
var start = Date.now(); var start = Date.now();
<% if (packed) { %> <% if (packed) { %>
require.MODULE_LOAD_URL = "/static/standalone/modules" require.MODULE_LOAD_URL = "/static/standalone/modules"
@ -68,6 +64,7 @@
nativeRequire("nw.gui").Window.get().show(); nativeRequire("nw.gui").Window.get().show();
require(["lib/architect/architect"], function (architect) { require(["lib/architect/architect"], function (architect) {
return; // DO NOT COMMIT
plugins.push({ plugins.push({
consumes: [], consumes: [],
provides: ["auth.bootstrap"], provides: ["auth.bootstrap"],