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

Begin refactoring story lists to order list, remove separate rank div

Browse Source
This commit is contained in:
Nathan Leniz
2015-03-08 12:32:35 +09:00
parent c8a9f6f810
commit 1edc1aa3cf
3 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
controllers/story.js
View File

@ -10,7 +10,7 @@ var R = require('ramda'),
secrets = require('../config/secrets'); secrets = require('../config/secrets');
exports.hotJSON = function(req, res, next) { exports.hotJSON = function(req, res, next) {
var story = Story.find({}).sort({'rank': -1}); var story = Story.find({}).sort({'rank': -1, 'timePosted': -1});
story.exec(function(err, stories) { story.exec(function(err, stories) {
if (err) { if (err) {
throw err; throw err;

5
public/css/main.less
View File

@ -805,6 +805,11 @@ iframe.iphone {
padding: 15px 0 15px 0; padding: 15px 0 15px 0;
} }
.img-news {
width: 50px;
height: 50px;
}
//uncomment this to see the dimensions of all elements outlined in red //uncomment this to see the dimensions of all elements outlined in red
//* { //* {
// border-color: red; // border-color: red;

47
views/stories/hot-stories.jade
View File

@ -1,5 +1,5 @@
h3 .col-xs-12
ul#story-list.story-list ol#story-list.story-list
script(src="https://cdn.jsdelivr.net/ramda/0.10.0/ramda.min.js") script(src="https://cdn.jsdelivr.net/ramda/0.10.0/ramda.min.js")
script. script.
@ -17,31 +17,30 @@ h3
var linkedName = getLinkedName(data[i].storyLink); var linkedName = getLinkedName(data[i].storyLink);
var rank = data[i].rank; var rank = data[i].rank;
$(li).html("<div class='row text-left'>" + $(li)
"<div class='col-xs-3 col-sm-1'>" + .html(
"<div class='positive-5'>" + "<div class='col-xs-12 text-left'>" +
"<span>" + rank + "</span>" + "<div class='col-xs-2 col-sm-1'>" +
"</div>" + "<img src='" + data[i].author.picture + "' class='img-news'/>" +
"</div>" +
"<div class='col-xs-10 col-sm-11'>" +
"<div class='row'>" +
"<div class='col-xs-12'>" +
"<a href='/stories/" + linkedName + "'>"
+ data[i].storyLink +
"</a>" +
"</div>" + "</div>" +
"<div class='col-xs-2 col-sm-1'>" + "<div class='col-xs-12'>" +
"<img src='" + data[i].author.picture + "' class='img-responsive'/>" + "<span>" +
"</div>" + rank + " points, posted " +
"<div class='col-xs-7 col-sm-10'>" + moment(data[i].timePosted).fromNow() +
"<div class='row'>" + " by <a href='/" + data[i].author.username + "'>@" + data[i].author.username + "</a> " +
"<div class='col-xs-12'>" + "</span>" +
"<a href='/stories/" + linkedName + "'>"
+ data[i].storyLink +
"</a>" +
"</div>" +
"<div class='col-xs-12'>" +
"<span>Posted " +
moment(data[i].timePosted).fromNow() +
" by <a href='/" + data[i].author.username + "'>@" + data[i].author.username + "</a> " +
"</div>" +
"</div>" +
"</div>" + "</div>" +
"</div>" + "</div>" +
"</li>"); "</div>" +
"</div>"
);
$(li).appendTo($('#story-list')); $(li).appendTo($('#story-list'));
} }
}); });