diff --git a/controllers/story.js b/controllers/story.js index aedd263cc3..0730a6d9c5 100755 --- a/controllers/story.js +++ b/controllers/story.js @@ -131,13 +131,13 @@ exports.returnIndividualStory = function(req, res, next) { msg: "404: We couldn't find a story with that name. Please double check the name." }); - return res.redirect('/stories/'); + return res.redirect('/news/'); } story = story.pop(); var dashedNameFull = story.storyLink.toLowerCase().replace(/\s/g, '-'); if (dashedNameFull !== dashedName) { - return res.redirect('../stories/' + dashedNameFull); + return res.redirect('../news/' + dashedNameFull); } var userVoted = false; @@ -285,7 +285,7 @@ exports.newStory = function(req, res, next) { }); return res.json({ alreadyPosted: true, - storyURL: '/stories/' + story.pop().storyLink + storyURL: '/news/' + story.pop().storyLink }); } resources.getURLTitle(url, processResponse); @@ -535,7 +535,7 @@ exports.storySubmission = function(req, res, next) { text: [ 'Just a quick heads-up: ' + data.author.username + ' replied to you on Camper News.', 'You can keep this conversation going.', - 'Just head back to the discussion here: http://freecodecamp.com/stories/' + data.originalStoryLink, + 'Just head back to the discussion here: http://freecodecamp.com/news/' + data.originalStoryLink, '- the Free Code Camp Volunteer Team' ].join('\n') }; diff --git a/public/css/main.less b/public/css/main.less index b6051ad93b..8c9d5cff95 100644 --- a/public/css/main.less +++ b/public/css/main.less @@ -96,6 +96,10 @@ h1, h2, h3, h4, h5, h6, p, li { height: 100px; } +.darker-background { + background-color: #dedede; +} + /**/ .btn-cta { diff --git a/public/js/main.js b/public/js/main.js index 01fc2de12e..d763e733a2 100644 --- a/public/js/main.js +++ b/public/js/main.js @@ -265,7 +265,7 @@ $(document).ready(function() { $('#story-submit').bind('click', storySubmitButtonHandler); }) .done(function (data, textStatus, xhr) { - window.location = '/stories/' + JSON.parse(data).storyLink; + window.location = '/news/' + JSON.parse(data).storyLink; }); }; diff --git a/views/stories/comments.jade b/views/stories/comments.jade index 425d52890d..f24917c86f 100755 --- a/views/stories/comments.jade +++ b/views/stories/comments.jade @@ -96,6 +96,7 @@ $('#comment-to-comment-textinput').keyup(function (e) { if (e.which === 13 || e === 13) { $('#submit-comment-to-comment').click(); + $('#submit-comment-to-edit').click(); } var text_length = $('#comment-to-comment-textinput').val().length; var text_remaining = text_max - text_length; diff --git a/views/stories/news-nav.jade b/views/stories/news-nav.jade index 4750a2fb01..6e45a3e8df 100644 --- a/views/stories/news-nav.jade +++ b/views/stories/news-nav.jade @@ -1,20 +1,16 @@ - - -.panel.shadow - .panel-body - .col-xs-12.col-sm-9 - .input-group - input#searchArea.big-text-field.field-responsive.form-control(type='text', placeholder='Search our links') - span.input-group-btn - button#searchbutton.btn.btn-big.btn-primary.btn-responsive(type='button') Search - .visible-xs - .button-spacer - .col-xs-12.col-sm-3 - span - a.btn.btn-primary.btn-big.btn-block.btn-responsive(href='/stories/submit' class="#{ page === 'hot' ? '' : 'hidden' }") Submit - span - a.btn.btn-success.btn-big.btn-block.btn-responsive(href='/news/' class="#{ (page !== 'hot') ? '' : 'hidden' }") All - +.row + .col-xs-12.col-sm-9 + .input-group + input#searchArea.big-text-field.field-responsive.form-control(type='text', placeholder='Search our links') + span.input-group-btn + button#searchbutton.btn.btn-big.btn-primary.btn-responsive(type='button') Search + .visible-xs + .button-spacer + .col-xs-12.col-sm-3 + span + a.btn.btn-primary.btn-big.btn-block.btn-responsive(href='/stories/submit' class="#{ page === 'hot' ? '' : 'hidden' }") Submit + span + a.btn.btn-success.btn-big.btn-block.btn-responsive(href='/news/' class="#{ (page !== 'hot') ? '' : 'hidden' }") All .spacer #search-results .spacer