From cccacd39a49f48a9aefe39e0e0bb33529ca80410 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Thu, 4 Sep 2014 18:03:07 -0400 Subject: media list --- server/lib/views/staff.js | 5 +++-- views/staff/_media.ejs | 38 +++++++++++++++++++++++++++++++++++++- views/staff/media/show.ejs | 2 +- 3 files changed, 41 insertions(+), 4 deletions(-) diff --git a/server/lib/views/staff.js b/server/lib/views/staff.js index b9fe78a..a9d85ba 100644 --- a/server/lib/views/staff.js +++ b/server/lib/views/staff.js @@ -164,7 +164,7 @@ var staff = module.exports = { ensureSingleMedia: function(req, res, next){ var id = req.params.id if (id) { - Media.findOne({ _id: id }, function (err, id) { + Media.findOne({ _id: id }, function (err, media) { if (media) { res.locals.media = req.method == "GET" ? staff.helpers.media(media) : media } @@ -270,6 +270,7 @@ var staff = module.exports = { media = media.toObject() media.date = moment( media.updated_at || media.created_at ).format("M/DD/YYYY H:MM") media.user = {} + media.shortUrl = media.url.replace(/^http.:\/\//,"") return media } }, @@ -422,7 +423,7 @@ var staff = module.exports = { res.render('staff/media/index') }, show: function(req, res){ - if (res.locals.project) { + if (res.locals.media) { res.render('staff/media/show', { mediaJSON: util.escape( JSON.stringify( res.locals.media ) ), mediaUserJSON: util.escape( JSON.stringify( res.locals.mediaUser ) ), diff --git a/views/staff/_media.ejs b/views/staff/_media.ejs index 27949aa..19e9d0b 100644 --- a/views/staff/_media.ejs +++ b/views/staff/_media.ejs @@ -1 +1,37 @@ -media \ No newline at end of file + +[[ media.forEach(function(media){ ]] + + + + + + + + + +[[ }) ]] +
+ [[- media.user.username ]] + + [[- media.date ]] + + [[- media.width ]]x[[- media.height ]] + + [[- media.type ]] + + [[- media.token ]] + + [[- media.shortUrl ]] +
+ + \ No newline at end of file diff --git a/views/staff/media/show.ejs b/views/staff/media/show.ejs index 43afe14..8257307 100644 --- a/views/staff/media/show.ejs +++ b/views/staff/media/show.ejs @@ -1,6 +1,6 @@ [[ include ../_header ]] -

Media [[- media.type ]]

+

Media: [[- media.type ]]