Mwalker has submitted this change and it was merged.
Change subject: bit of junk discovered during rebase
......................................................................
bit of junk discovered during rebase
Change-Id: Ie97db7e8de2ab55d49eb886112725404e51f23bc
---
A public/views/templates/config.jade
R public/views/templates/index.jade
R public/views/templates/layout.jade
R public/views/templates/library.jade
R public/views/templates/tests.jade
M public/views/view.js
M server.js
7 files changed, 6 insertions(+), 1 deletion(-)
Approvals:
Mwalker: Looks good to me, approved
jenkins-bot: Verified
diff --git a/public/views/templates/config.jade
b/public/views/templates/config.jade
new file mode 100644
index 0000000..cd19a81
--- /dev/null
+++ b/public/views/templates/config.jade
@@ -0,0 +1,3 @@
+script(data-main="javascripts/config", src='javascripts/require.js')
+
+h1 configuration page!
\ No newline at end of file
diff --git a/public/views/index.jade b/public/views/templates/index.jade
similarity index 100%
rename from public/views/index.jade
rename to public/views/templates/index.jade
diff --git a/public/views/layout.jade b/public/views/templates/layout.jade
similarity index 100%
rename from public/views/layout.jade
rename to public/views/templates/layout.jade
diff --git a/public/views/library.jade b/public/views/templates/library.jade
similarity index 100%
rename from public/views/library.jade
rename to public/views/templates/library.jade
diff --git a/public/views/tests.jade b/public/views/templates/tests.jade
similarity index 100%
rename from public/views/tests.jade
rename to public/views/templates/tests.jade
diff --git a/public/views/view.js b/public/views/view.js
index ce0875f..06edb53 100644
--- a/public/views/view.js
+++ b/public/views/view.js
@@ -5,6 +5,7 @@
'models/model',
'text!templates/main.html'],
function($, _, Backbone, model, template){
+
var View = Backbone.View.extend({
el: 'body',
initialize: function(){
@@ -19,4 +20,5 @@
});
return new View();
+
});
diff --git a/server.js b/server.js
index fb39778..89c39c0 100644
--- a/server.js
+++ b/server.js
@@ -29,7 +29,7 @@
}
app.configure(function(){
- app.set( 'views', __dirname + '/public/views' );
+ app.set( 'views', __dirname + '/public/views/templates' );
app.set( 'view engine', 'jade' );
app.set( 'view options', { pretty: true } );
app.use( express.bodyParser() );
--
To view, visit https://gerrit.wikimedia.org/r/134861
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie97db7e8de2ab55d49eb886112725404e51f23bc
Gerrit-PatchSet: 3
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ssmith <ssm...@wikimedia.org>
Gerrit-Reviewer: Mwalker <mwal...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
