From 0276c6867e2062671151be6312b34f669344e424 Mon Sep 17 00:00:00 2001 From: Nathan Leniz Date: Fri, 6 Mar 2015 08:20:49 +0900 Subject: [PATCH] Display hot/recent/submit/search views correctly through index --- controllers/story.js | 4 ++-- views/stories/index.jade | 1 + views/stories/submit-story.jade | 7 ++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/controllers/story.js b/controllers/story.js index 485c2bcd10..98c7c2a1bd 100644 --- a/controllers/story.js +++ b/controllers/story.js @@ -33,13 +33,13 @@ exports.hot = function(req, res, next) { }; exports.submitNew = function(req,res, next) { - res.render('stories/submit-story', { + res.render('stories/index', { page: 'submit' }); }; exports.search = function(req, res, next) { - res.render('stories/search-stories', { + res.render('stories/index', { page: 'search' }); }; diff --git a/views/stories/index.jade b/views/stories/index.jade index 796ce74fa4..b42ff06b5a 100644 --- a/views/stories/index.jade +++ b/views/stories/index.jade @@ -7,6 +7,7 @@ block content .panel-heading.text-center Camper News .panel-body include ./news-nav + .spacer if (page === 'hot') include ./hot-stories if (page === 'recent') diff --git a/views/stories/submit-story.jade b/views/stories/submit-story.jade index 90ff56dcae..8b7ea0837f 100644 --- a/views/stories/submit-story.jade +++ b/views/stories/submit-story.jade @@ -1,4 +1,5 @@ -#story-submit.col-xs-12 +.spacer +.col-xs-12 form.form-horizontal.control-label-story-submission#story-submission-form .col-xs-2.img-story-post img.img-responsive(src='#{user.profile.picture}') @@ -13,6 +14,6 @@ label.control-label.control-label-story-submission(for='name') Title .col-xs-11 input.form-control(placeholder='Type a headline for your link here', name='Title') + .spacer .form-group - .btn.btn-large.btn-block.btn-primary#story-submit Submit -.spacer \ No newline at end of file + .btn.btn-big.btn-block.btn-primary#story-submit Submit \ No newline at end of file