gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make reply button consistent with discuss button throughout camper news

Browse Source
This commit is contained in:
Michael Q Larson
2015-03-10 10:22:20 -07:00
parent 526d874d1b
commit 09f7be37ee
4 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
controllers/story.js
View File

@ -57,24 +57,28 @@ exports.recentJSON = function(req, res, next) {
exports.hot = function(req, res) { exports.hot = function(req, res) {
res.render('stories/index', { res.render('stories/index', {
title: 'Hot stories currently trending on Camper News',
page: 'hot' page: 'hot'
}); });
}; };
exports.submitNew = function(req, res) { exports.submitNew = function(req, res) {
res.render('stories/index', { res.render('stories/index', {
title: 'Submit a new story to Camper News',
page: 'submit' page: 'submit'
}); });
}; };
exports.search = function(req, res) { exports.search = function(req, res) {
res.render('stories/index', { res.render('stories/index', {
title: 'Search the archives of Camper News',
page: 'search' page: 'search'
}); });
}; };
exports.recent = function(req, res) { exports.recent = function(req, res) {
res.render('stories/index', { res.render('stories/index', {
title: 'Recently submitted stories on Camper News',
page: 'recent' page: 'recent'
}); });
}; };
@ -98,6 +102,7 @@ exports.preSubmit = function(req, res) {
var image = data.image || ''; var image = data.image || '';
var description = data.description || ''; var description = data.description || '';
return res.render('stories/index', { return res.render('stories/index', {
title: "Confirm your Camper News story submission",
page: 'storySubmission', page: 'storySubmission',
storyURL: data.url, storyURL: data.url,
storyTitle: title, storyTitle: title,

4
views/stories/comments.jade
View File

@ -34,9 +34,9 @@
'<p>' + commentDetails.body + '</p>' + '<p>' + commentDetails.body + '</p>' +
'<h6>' + '<h6>' +
'<div class="clearfix comment-a-comment negative-15">' + '<div class="clearfix comment-a-comment negative-15">' +
"<a class='btn btn-no-shadow btn-primary btn-xs btn-primary-ghost' id='" + commentDetails._id + "'>Reply</a> · " +
"commented " + moment(commentDetails.commentOn).fromNow() + " by " + "commented " + moment(commentDetails.commentOn).fromNow() + " by " +
"<a href='/" + commentDetails.author.username + "'>@" + commentDetails.author.username + "</a> · " + "<a href='/" + commentDetails.author.username + "'>@" + commentDetails.author.username + "</a>" +
"<a id='" + commentDetails._id + "'>Reply</a>" +
'</div>' + '</div>' +
'</h6>' + '</h6>' +
'</div>' + '</div>' +

1
views/stories/new-stories.jade
View File

@ -40,7 +40,6 @@
"<div class='col-xs-12'>" + "<div class='col-xs-12'>" +
"<span>" + "<span>" +
"<a class='btn btn-no-shadow btn-primary btn-xs btn-primary-ghost' href='/stories/" + linkedName + "'>discuss</a> · " + "<a class='btn btn-no-shadow btn-primary btn-xs btn-primary-ghost' href='/stories/" + linkedName + "'>discuss</a> · " +
"<button class='btn btn-no-shadow btn-primary btn-xs btn-primary-ghost' id='#upvote'>upvote</a></button> · " +
rank + (rank > 1 ? " points" : " point") + " · posted " + rank + (rank > 1 ? " points" : " point") + " · posted " +
moment(data[i].timePosted).fromNow() + moment(data[i].timePosted).fromNow() +
" by <a href='/" + data[i].author.username + "'>@" + data[i].author.username + "</a> " +"</a> " + " by <a href='/" + data[i].author.username + "'>@" + data[i].author.username + "</a> " +"</a> " +

6
views/stories/show.jade
View File

@ -36,11 +36,13 @@
.col-xs-12 .col-xs-12
h4= description h4= description
.negative-5 .negative-5
a#reply-to-main-post.btn.btn-no-shadow.btn-primary.btn-xs.btn-primary-ghost Reply
| &thinsp;·&thinsp;
span Posted #{timeAgo} span Posted #{timeAgo}
span &thinsp;by&thinsp; span &thinsp;by&thinsp;
a(href="/" + author.username) @#{author.username} a(href="/" + author.username) @#{author.username}
| &nbsp;·&nbsp;
a#reply-to-main-post Reply
.col-xs-12#reply-area .col-xs-12#reply-area
.hidden-element#initial-comment-submit .hidden-element#initial-comment-submit
form.form-horizontal.control-label-story-submission form.form-horizontal.control-label-story-submission