From f95c41e8a92f34f192ffad6c33ad46f7b9f1d546 Mon Sep 17 00:00:00 2001 From: benweet Date: Thu, 24 Oct 2013 22:03:24 +0100 Subject: [PATCH] Removed views folder --- public/cache.manifest | 2 +- {views => public}/error_404.html | 0 {views => public}/index.html | 0 public/res-min/main.js | 23 ++++++++++++++++------- public/res-min/themes/blue-gray.css | 6 ++++-- public/res-min/themes/default.css | 6 ++++-- public/res-min/themes/night.css | 6 ++++-- public/res-min/themes/school.css | 6 ++++-- {views => public}/viewer.html | 0 server.js | 17 +++-------------- 10 files changed, 36 insertions(+), 30 deletions(-) rename {views => public}/error_404.html (100%) rename {views => public}/index.html (100%) rename {views => public}/viewer.html (100%) diff --git a/public/cache.manifest b/public/cache.manifest index 02727eb7..764f065b 100644 --- a/public/cache.manifest +++ b/public/cache.manifest @@ -1,5 +1,5 @@ CACHE MANIFEST -#Date Tue Oct 22 2013 23:31:27 +#Date Thu Oct 24 2013 21:59:15 CACHE: res/worker.js diff --git a/views/error_404.html b/public/error_404.html similarity index 100% rename from views/error_404.html rename to public/error_404.html diff --git a/views/index.html b/public/index.html similarity index 100% rename from views/index.html rename to public/index.html diff --git a/public/res-min/main.js b/public/res-min/main.js index b14e7199..e6c9d86e 100644 --- a/public/res-min/main.js +++ b/public/res-min/main.js @@ -15431,13 +15431,22 @@ define("config", function() {}), define("storage", [ "underscore", "utils" ], fu t.removeIndexFromArray(this.fileIndex + ".publish", e.publishIndex), delete this.publishLocations[e.publishIndex], localStorage.removeItem(e.publishIndex); }, i.prototype.composeTitle = function() { - var t = [], n = e.values(this.syncLocations), i = e.values(this.publishLocations), o = n.concat(i); + var t = [], n = e.values(this.syncLocations), i = []; + e.chain(n).sortBy(function(e) { + return e.provider.providerId; + }).each(function(e) { + var t = "icon-provider-" + e.provider.providerId; + e.isRealtime === !0 && (t += " realtime"), i.push(''); + }), 0 !== i.length && (t.push(''), + t = t.concat(i), t.push("")); + var o = e.values(this.publishLocations), r = []; return e.chain(o).sortBy(function(e) { return e.provider.providerId; }).each(function(e) { - var n = "icon-provider-" + e.provider.providerId; - e.isRealtime === !0 && (n += " realtime"), t.push(''); - }), t.push(" "), t.push(this.title), t.join(""); + var t = "icon-provider-" + e.provider.providerId; + e.isRealtime === !0 && (t += " realtime"), r.push(''); + }), 0 !== r.length && (t.push(''), + t = t.concat(r), t.push("")), t.push(" "), t.push(this.title), t.join(""); }, i; }), define("fileSystem", [ "underscore", "utils", "classes/FileDescriptor", "storage" ], function(e, t, n) { var i = {}; @@ -20851,7 +20860,7 @@ if (hljs.LANGUAGES.glsl = function(e) { }, r.onCreateButton = function() { var t = n("button", { "class": "btn btn-success button-publish", - title: "Publish this document" + title: "Publish document" }, n("i", { "class": "icon-share" })); @@ -20870,7 +20879,7 @@ if (hljs.LANGUAGES.glsl = function(e) { a = e, h(); }, r.onPublishRemoved = h, r.onNewPublishSuccess = h, r; }), define("text!html/buttonShare.html", [], function() { - return '\n\n'; + return '\n\n'; }), define("text!html/buttonShareLocation.html", [], function() { return '
\n \n
\n'; }), define("extensions/buttonShare", [ "jquery", "underscore", "classes/Extension", "text!html/buttonShare.html", "text!html/buttonShareLocation.html" ], function(e, t, n, i, o) { @@ -22499,7 +22508,7 @@ if (hljs.LANGUAGES.glsl = function(e) { }); }, r; }), define("text!html/bodyIndex.html", [], function() { - return '\n
\n
\n
\n
\n\n\n\n\n
\n \n \n
\n
\n
\n
\n
\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
\n
'; + return '\n
\n
\n
\n
\n\n\n\n\n
\n \n \n
\n
\n
\n
\n
\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
\n
'; }), define("text!html/bodyViewer.html", [], function() { return '\n\n
\n
\n
\n\n\n\n
\n \n \n
\n
\n
\n
\n
\n\n\n'; }), define("text!html/settingsTemplateTooltip.html", [], function() { diff --git a/public/res-min/themes/blue-gray.css b/public/res-min/themes/blue-gray.css index b782d66f..47aad9f6 100644 --- a/public/res-min/themes/blue-gray.css +++ b/public/res-min/themes/blue-gray.css @@ -1479,7 +1479,6 @@ a{-webkit-transition:background-color ease-in-out .15s,color ease-in-out .15s,bo .navbar .btn{height:38px} .navbar .btn-group>.btn.disabled *,.navbar .btn-group>.btn.blocked *,.navbar .btn-group>.btn[disabled] *{color:rgba(84,84,84,0.3)} .navbar .file-title-navbar{display:block;padding:4px 15px;font-size:20px;font-weight:200;color:#545454;max-width:280px;overflow:hidden;white-space:nowrap} -.navbar .file-title-navbar i{margin-right:6px} .navbar .input-file-title{margin-right:10px} .navbar .working-indicator{width:50px;height:17px;background-position:0 0;margin-top:12px} .navbar .working-indicator.show{background-image:url("../img/loader-default.gif")} @@ -1487,7 +1486,7 @@ a{-webkit-transition:background-color ease-in-out .15s,color ease-in-out .15s,bo .menu-panel .collapse-button i,.document-panel .collapse-button i{color:#666666;font-size:14px} .menu-panel.in .collapse-button,.document-panel.in .collapse-button{background-color:#f0f3f4} .menu-panel .panel-content,.document-panel .panel-content{-webkit-box-shadow:0 6px 12px rgba(0,0,0,0.175);box-shadow:0 6px 12px rgba(0,0,0,0.175);overflow:auto;padding-bottom:30px;height:100%} -.menu-panel .panel-content a>i,.document-panel .panel-content a>i{margin-right:3px;color:inherit} +.menu-panel .panel-content a>i,.document-panel .panel-content a>i{color:inherit} .menu-panel{width:280px !important;margin-left:-305px;-webkit-transition:margin-left ease-in-out .35s;transition:margin-left ease-in-out .35s} .menu-panel .sub-menu{background-color:#ffffff} .menu-panel.in{margin-left:0} @@ -1663,6 +1662,9 @@ div.dropdown-menu textarea{width:250px;height:150px;resize:none} .icon-provider-wordpress{background-position:-108px 0} .icon-provider-ssh{background-position:-126px 0} .icon-provider-gplus{background-position:-144px 0} +.title-icon-category{display:none} +.file-title-navbar .title-icon-category{display:inline-block;font-size:16px;opacity:0.1;margin-left:-8px;margin-right:-8px;margin-top:-2px;vertical-align:top} +.title-icon-container{display:inline-block;margin-right:10px} .picker-dialog{z-index:1050 !important} .picker-dialog-bg{z-index:1040 !important} .action-import-image-gplus{float:left} diff --git a/public/res-min/themes/default.css b/public/res-min/themes/default.css index 7777e4fa..b23db8eb 100644 --- a/public/res-min/themes/default.css +++ b/public/res-min/themes/default.css @@ -1479,7 +1479,6 @@ a{-webkit-transition:background-color ease-in-out .15s,color ease-in-out .15s,bo .navbar .btn{height:38px} .navbar .btn-group>.btn.disabled *,.navbar .btn-group>.btn.blocked *,.navbar .btn-group>.btn[disabled] *{color:rgba(84,84,84,0.3)} .navbar .file-title-navbar{display:block;padding:4px 15px;font-size:20px;font-weight:200;color:#545454;max-width:280px;overflow:hidden;white-space:nowrap} -.navbar .file-title-navbar i{margin-right:6px} .navbar .input-file-title{margin-right:10px} .navbar .working-indicator{width:50px;height:17px;background-position:0 0;margin-top:12px} .navbar .working-indicator.show{background-image:url("../img/loader-default.gif")} @@ -1487,7 +1486,7 @@ a{-webkit-transition:background-color ease-in-out .15s,color ease-in-out .15s,bo .menu-panel .collapse-button i,.document-panel .collapse-button i{color:#666666;font-size:14px} .menu-panel.in .collapse-button,.document-panel.in .collapse-button{background-color:#f1f1f1} .menu-panel .panel-content,.document-panel .panel-content{-webkit-box-shadow:0 6px 12px rgba(0,0,0,0.175);box-shadow:0 6px 12px rgba(0,0,0,0.175);overflow:auto;padding-bottom:30px;height:100%} -.menu-panel .panel-content a>i,.document-panel .panel-content a>i{margin-right:3px;color:inherit} +.menu-panel .panel-content a>i,.document-panel .panel-content a>i{color:inherit} .menu-panel{width:280px !important;margin-left:-305px;-webkit-transition:margin-left ease-in-out .35s;transition:margin-left ease-in-out .35s} .menu-panel .sub-menu{background-color:#ffffff} .menu-panel.in{margin-left:0} @@ -1663,6 +1662,9 @@ div.dropdown-menu textarea{width:250px;height:150px;resize:none} .icon-provider-wordpress{background-position:-108px 0} .icon-provider-ssh{background-position:-126px 0} .icon-provider-gplus{background-position:-144px 0} +.title-icon-category{display:none} +.file-title-navbar .title-icon-category{display:inline-block;font-size:16px;opacity:0.1;margin-left:-8px;margin-right:-8px;margin-top:-2px;vertical-align:top} +.title-icon-container{display:inline-block;margin-right:10px} .picker-dialog{z-index:1050 !important} .picker-dialog-bg{z-index:1040 !important} .action-import-image-gplus{float:left} diff --git a/public/res-min/themes/night.css b/public/res-min/themes/night.css index 4e3c3745..57a0a818 100644 --- a/public/res-min/themes/night.css +++ b/public/res-min/themes/night.css @@ -1479,7 +1479,6 @@ a{-webkit-transition:background-color ease-in-out .15s,color ease-in-out .15s,bo .navbar .btn{height:38px} .navbar .btn-group>.btn.disabled *,.navbar .btn-group>.btn.blocked *,.navbar .btn-group>.btn[disabled] *{color:rgba(222,222,222,0.3)} .navbar .file-title-navbar{display:block;padding:4px 15px;font-size:20px;font-weight:200;color:#dedede;max-width:280px;overflow:hidden;white-space:nowrap} -.navbar .file-title-navbar i{margin-right:6px} .navbar .input-file-title{margin-right:10px} .navbar .working-indicator{width:50px;height:17px;background-position:0 0;margin-top:12px} .navbar .working-indicator.show{background-image:url("../img/loader-default.gif")} @@ -1487,7 +1486,7 @@ a{-webkit-transition:background-color ease-in-out .15s,color ease-in-out .15s,bo .menu-panel .collapse-button i,.document-panel .collapse-button i{color:#777777;font-size:14px} .menu-panel.in .collapse-button,.document-panel.in .collapse-button{background-color:#565656} .menu-panel .panel-content,.document-panel .panel-content{-webkit-box-shadow:0 6px 12px rgba(0,0,0,0.175);box-shadow:0 6px 12px rgba(0,0,0,0.175);overflow:auto;padding-bottom:30px;height:100%} -.menu-panel .panel-content a>i,.document-panel .panel-content a>i{margin-right:3px;color:inherit} +.menu-panel .panel-content a>i,.document-panel .panel-content a>i{color:inherit} .menu-panel{width:280px !important;margin-left:-305px;-webkit-transition:margin-left ease-in-out .35s;transition:margin-left ease-in-out .35s} .menu-panel .sub-menu{background-color:#323232} .menu-panel.in{margin-left:0} @@ -1663,6 +1662,9 @@ div.dropdown-menu textarea{width:250px;height:150px;resize:none} .icon-provider-wordpress{background-position:-108px 0} .icon-provider-ssh{background-position:-126px 0} .icon-provider-gplus{background-position:-144px 0} +.title-icon-category{display:none} +.file-title-navbar .title-icon-category{display:inline-block;font-size:16px;opacity:0.1;margin-left:-8px;margin-right:-8px;margin-top:-2px;vertical-align:top} +.title-icon-container{display:inline-block;margin-right:10px} .picker-dialog{z-index:1050 !important} .picker-dialog-bg{z-index:1040 !important} .action-import-image-gplus{float:left} diff --git a/public/res-min/themes/school.css b/public/res-min/themes/school.css index aa89470c..465d3dec 100644 --- a/public/res-min/themes/school.css +++ b/public/res-min/themes/school.css @@ -1479,7 +1479,6 @@ a{-webkit-transition:background-color ease-in-out .15s,color ease-in-out .15s,bo .navbar .btn{height:38px} .navbar .btn-group>.btn.disabled *,.navbar .btn-group>.btn.blocked *,.navbar .btn-group>.btn[disabled] *{color:rgba(238,238,238,0.3)} .navbar .file-title-navbar{display:block;padding:4px 15px;font-size:20px;font-weight:200;color:#eeeeee;max-width:280px;overflow:hidden;white-space:nowrap} -.navbar .file-title-navbar i{margin-right:6px} .navbar .input-file-title{margin-right:10px} .navbar .working-indicator{width:50px;height:17px;background-position:0 0;margin-top:12px} .navbar .working-indicator.show{background-image:url("../img/loader-default.gif")} @@ -1487,7 +1486,7 @@ a{-webkit-transition:background-color ease-in-out .15s,color ease-in-out .15s,bo .menu-panel .collapse-button i,.document-panel .collapse-button i{color:#666666;font-size:14px} .menu-panel.in .collapse-button,.document-panel.in .collapse-button{background-color:#406b5b} .menu-panel .panel-content,.document-panel .panel-content{-webkit-box-shadow:0 6px 12px rgba(0,0,0,0.175);box-shadow:0 6px 12px rgba(0,0,0,0.175);overflow:auto;padding-bottom:30px;height:100%} -.menu-panel .panel-content a>i,.document-panel .panel-content a>i{margin-right:3px;color:inherit} +.menu-panel .panel-content a>i,.document-panel .panel-content a>i{color:inherit} .menu-panel{width:280px !important;margin-left:-305px;-webkit-transition:margin-left ease-in-out .35s;transition:margin-left ease-in-out .35s} .menu-panel .sub-menu{background-color:#ffffff} .menu-panel.in{margin-left:0} @@ -1663,6 +1662,9 @@ div.dropdown-menu textarea{width:250px;height:150px;resize:none} .icon-provider-wordpress{background-position:-108px 0} .icon-provider-ssh{background-position:-126px 0} .icon-provider-gplus{background-position:-144px 0} +.title-icon-category{display:none} +.file-title-navbar .title-icon-category{display:inline-block;font-size:16px;opacity:0.1;margin-left:-8px;margin-right:-8px;margin-top:-2px;vertical-align:top} +.title-icon-container{display:inline-block;margin-right:10px} .picker-dialog{z-index:1050 !important} .picker-dialog-bg{z-index:1040 !important} .action-import-image-gplus{float:left} diff --git a/views/viewer.html b/public/viewer.html similarity index 100% rename from views/viewer.html rename to public/viewer.html diff --git a/server.js b/server.js index 2708a71b..87088618 100644 --- a/server.js +++ b/server.js @@ -2,7 +2,7 @@ var express = require('express'); var app = express(); // Configure ejs engine -app.set('views', __dirname + '/views'); +app.set('views', __dirname + '/public'); app.engine('html', require('ejs').renderFile); // Force HTTPS on stackedit.io @@ -21,24 +21,13 @@ app.use(express.compress()); // Serve static resources app.use(express.static(__dirname + '/public')); -// Serve index.html -app.get('/', function (req, res) { - res.render('index.html'); -}); -app.get('/index.html', function (req, res) { - res.render('index.html'); -}); - -// Serve viewer.html +// Serve viewer.html in /viewer app.get('/viewer', function (req, res) { res.render('viewer.html'); }); -app.get('/viewer.html', function (req, res) { - res.render('viewer.html'); -}); // Error 404 -app.use(function(req, res, next){ +app.use(function(req, res, next) { res.status(404); res.render('error_404.html'); });