diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-10-21 14:45:20 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-10-21 14:45:20 -0400 |
| commit | 1aa0ee55d0d9893bdaecd5d18b30b01a9927b2c4 (patch) | |
| tree | 987a7958fd83a084b7ca6c23e18aed5d88a6b088 | |
| parent | d80ba1570ecf6e5fdb16d24c6f0ad189492a8bd8 (diff) | |
sort
| -rw-r--r-- | public/assets/javascripts/ui/editor/EditorSettings.js | 2 | ||||
| -rw-r--r-- | server/lib/views/staff.js | 8 | ||||
| -rw-r--r-- | views/staff/users/media.ejs | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js index 240f713..430acc7 100644 --- a/public/assets/javascripts/ui/editor/EditorSettings.js +++ b/public/assets/javascripts/ui/editor/EditorSettings.js @@ -62,7 +62,7 @@ var EditorSettings = FormView.extend({ } if (data.isNew) { - this.$name.val( "Untitled Room" ) + this.$name.val( "Untitled" ) } else { this.thumbnailIsStale() diff --git a/server/lib/views/staff.js b/server/lib/views/staff.js index da09d83..49f492b 100644 --- a/server/lib/views/staff.js +++ b/server/lib/views/staff.js @@ -73,11 +73,11 @@ var staff = module.exports = { paginationInfo.sort = req.query.sort paginationInfo.sortOptions = ["date", "name"] switch (req.query.sort) { + default: case 'date': - sort = {'created_at': -1} + sort = {'updated_at': -1} break case 'name': - default: paginationInfo.sort = "name" sort = {'slug': 1} break @@ -288,14 +288,14 @@ var staff = module.exports = { project: function(project){ project = project.toObject() - project.date = moment( project.updated_at || project.created_at ).format("M/DD/YYYY H:MM") + project.date = moment( project.updated_at || project.created_at ).format("M/DD/YYYY hh:mm a") project.user = {} return project }, media: function(media){ media = media.toObject() - media.date = moment( media.updated_at || media.created_at ).format("M/DD/YYYY H:MM") + media.date = moment( media.updated_at || media.created_at ).format("M/DD/YYYY hh:mm a") media.user = {} media.shortUrl = media.url.replace(/^http.:\/\//,"") return media diff --git a/views/staff/users/media.ejs b/views/staff/users/media.ejs index a44ad6a..c1097dd 100644 --- a/views/staff/users/media.ejs +++ b/views/staff/users/media.ejs @@ -1,6 +1,6 @@ [[ include ../_header ]] - <h1>User Media</h1> + <h1>User Media: [[- profile.username ]]</h1> <nav> <a href="/staff">home</a> |