From d67f77d98651a8e6fc8a16a452e3c39137b42fd1 Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Thu, 18 Feb 2016 02:27:16 +0000 Subject: [PATCH] Beautified Styling for migration screen. Sanitized loading screen messaging --- configs/client-default.js | 6 ++++++ configs/standalone.js | 4 ++++ .../images/loadingbgrepeat.png | Bin 0 -> 934 bytes .../images/loadingbgrepeat_dark.png | Bin 0 -> 944 bytes plugins/c9.ide.layout.classic/loading-flat.css | 12 +++++------- plugins/c9.ide.server/views/flat-load-screen.html | 14 +------------- 6 files changed, 16 insertions(+), 20 deletions(-) create mode 100644 plugins/c9.ide.layout.classic/images/loadingbgrepeat.png create mode 100644 plugins/c9.ide.layout.classic/images/loadingbgrepeat_dark.png diff --git a/configs/client-default.js b/configs/client-default.js index b3379962..c9e560eb 100644 --- a/configs/client-default.js +++ b/configs/client-default.js @@ -164,6 +164,12 @@ module.exports = function(options) { "plugins/c9.ide.editors/pane", "plugins/c9.ide.editors/undomanager", + { + packagePath: "plugins/c9.ide.restore/restore", + staticPrefix: staticPrefix + "/plugins/c9.ide.layout.classic", + ideBaseUrl: options.ideBaseUrl + }, + "plugins/c9.ide.newresource/newresource", "plugins/c9.ide.newresource/open", "plugins/c9.ide.undo/undo", diff --git a/configs/standalone.js b/configs/standalone.js index bb6f596e..500e16b6 100644 --- a/configs/standalone.js +++ b/configs/standalone.js @@ -194,6 +194,10 @@ module.exports = function(config, optimist) { "./c9.vfs.server/statics", "./c9.analytics/mock_analytics", "./c9.metrics/mock_metrics", + { + packagePath: "./c9.graceful-shutdown/graceful-shutdown", + shutdown_grace_period: 100 + }, "./c9.ide.experiment/mock_experiment", { packagePath: "./c9.vfs.server/vfs.connect.standalone", diff --git a/plugins/c9.ide.layout.classic/images/loadingbgrepeat.png b/plugins/c9.ide.layout.classic/images/loadingbgrepeat.png new file mode 100644 index 0000000000000000000000000000000000000000..36bf5231af84462fc4ea1364e2467c0502193b89 GIT binary patch literal 934 zcmaJ=J#W)M7&de%l`1M&fa&BifJFR})E9D!i5xqnmT(j$k;ur!z9d#^pE+NM6EUDN zvG6k(`2!5FBJm5D_y>$IfXX?IQwD-%`|e&n&+~rXn@;=j{@$HENs{*66Q?WIE8;uY zy(<2L-)G;%a+|jXyhlfTjv0}xfDQ?8BRnQuf`i5L&!jF%J9oqWfDgPU$fuElbBvNj ziC{}oy^$r@pArs+WE{q({Qbj68H9l;KQ%nfOKdU;PnL}ImhHa3ocgsuZaf0@3<-gV za165OG)_@w$}3$Y_PJS=!3x5srhF09!0P~;G6D>xQt~xj2M{XykpZFp0F*VotZL$g zCH)8)5S6Q7{m8-_3r48x9It(elPOO)Pmrq4=W}IVQ79X$daYK=HOl3ZK$Ox&%yCwV z)5Ai+A*s*8goiW+xgs9Y88>AS=|u`rvXPC`b(uuL)C?!8u4s8m1<>>U4~?P?I^|t* z8Sg)Z)BYkMYL}#R#(dGZ(P8c?K{g|pQ`V>Sw5VcdLOD$*Gy!%Gf_onJ!#FqGUokun zxpB&I>=V~9Wuc*jVSuWlx|ZcM?UwdX*IP!j3ZZ2|quI2eWy7O_>rj6dk(d|U;F4=^ z<>tc>CBm~qSonej$Baf`l{5;s$5Pv>x8?@hW3je!RS}GuxAw1A7bY=3`F1n7;;7CSid(K@^|Pciwf{&r3&-jyR4hITu!!t+&{BeD^l{ z4}Pt`vE?DP2egOBbm0-i837(4;6&a8b&(e=UwuXmj=OUj_6Ky}zR-Le@m`MMvnXL~ zj%%D}iRaG{1tT;GV;%ndcnv`q=BpH-TynINHyQamR-+K_11VkMUJe#m*E{oKA59%$^D!yPhA$x#7u{;kud= zr__smp7VDtijvE||#j+1_1s05uxAw1A7bZ48`F20J?64nw z6tj6JY_Lh`46sW99n0uvUq_wGOEek|x$m3JrXtDmI(+{?{siwI54kt`y|-Vkf1Kub M$g$hjhvsno8yIOKt^fc4 literal 0 HcmV?d00001 diff --git a/plugins/c9.ide.layout.classic/loading-flat.css b/plugins/c9.ide.layout.classic/loading-flat.css index ec126a23..4fda746c 100644 --- a/plugins/c9.ide.layout.classic/loading-flat.css +++ b/plugins/c9.ide.layout.classic/loading-flat.css @@ -1,12 +1,10 @@ BODY.loading{ - 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+ */ + background: url(images/loadingbgrepeat.png); + background-size: 1px 8px; } BODY.loading.dark{ - background: -moz-linear-gradient(top, rgba(37,37,37,1) 0%, rgba(35,35,35,1) 100%); /* FF3.6-15 */ - background: -webkit-linear-gradient(top, rgba(37,37,37,1) 0%,rgba(35,35,35,1) 100%); /* Chrome10-25,Safari5.1-6 */ - background: linear-gradient(to bottom, rgba(37,37,37,1) 0%,rgba(35,35,35,1) 100%); /* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */ + background: url(images/loadingbgrepeat_dark.png); + background-size: 1px 8px; } #loadingide { @@ -24,7 +22,7 @@ BODY.loading.dark{ -webkit-font-smoothing: antialiased !important; -moz-osx-font-smoothing: grayscale !important; } -#loadingide.dark { +#loadingide.dark, .dark #loadingide{ background-image: url(images/c9-logo-white.png); } diff --git a/plugins/c9.ide.server/views/flat-load-screen.html b/plugins/c9.ide.server/views/flat-load-screen.html index f59a85e1..6c361a61 100644 --- a/plugins/c9.ide.server/views/flat-load-screen.html +++ b/plugins/c9.ide.server/views/flat-load-screen.html @@ -19,24 +19,12 @@ "It's better up here.", "Happy coding!", "Everything as you left it.", - "Give some love to your colleague on the left!", "Thank you Ada Lovelace!", - "Feel the power of a full IDE — in the cloud.", - "Code for the cloud, in the cloud", - "Out with the old, in with the new", "POST /desktop/era", - "#OnCloud9", - "I ❤ Cloud9", - "My life. My code. My Cloud9.", - "For the love of code", - "Get Your Code On", - "Skip the hazing, love the coding", - "Stop cursing, start coding", - "GET /this/workspace#loaded", "Use our Vim mode for extra addictive effect!", "Not your grandmother's IDE", "Now made with 20% more cloud!", - "Literally makes your laptop cooler", + "Makes your laptop cooler" ]; var idx = Math.floor(Math.random() * messages.length);