Skip to content

Commit

Permalink
Add shutdown screen
Browse files Browse the repository at this point in the history
  • Loading branch information
Lionel Laské committed Sep 13, 2014
1 parent af5ca97 commit ce360a5
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 1 deletion.
16 changes: 16 additions & 0 deletions css/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,22 @@ input {
background-color: white;
}

.shutdownscreen {
position: absolute;
background-color: black;
top: 0px;
left: 0px;
width: 100%;
height: 100%;
text-align: center;
visibility: hidden;
}

.shutdownimage {
max-width: 99%;
max-height: 99%;
}

.sugarizer-canvas {
}

Expand Down
Binary file modified icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/uiwarning.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,11 @@
<!-- The content of the desktop goes inside the canvas -->
<div id="canvas" class="sugarizer-canvas">
</div>

<!-- Shutdown screen -->
<div id="shutdown" class="shutdownscreen">
<img src="images/uiwarning.png" class="shutdownimage"/>
</div>
</body>

</html>
3 changes: 3 additions & 0 deletions lib/util.js
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,9 @@ define(["webL10n"], function (l10n) {

// Quit application
util.quitApp = function() {
document.getElementById("toolbar").style.visibility = "hidden";
document.getElementById("canvas").style.visibility = "hidden";
document.getElementById("shutdown").style.visibility = "visible";
window.close();
window.open('', '_self', ''); // HACK: Not allowed on all browsers
window.close();
Expand Down
Binary file added res/icon/android/icon-144-xxhdpi.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/icon/android/icon-192-xxxhdpi.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion server/sugarizer.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ var express = require('express'),
settings = require('./settings'),
activities = require('./routes/activities'),
journal = require('./routes/journal'),
users = require('./routes/users');
users = require('./routes/users'),
presence = require('./presence');


Expand Down

0 comments on commit ce360a5

Please sign in to comment.