diff options
| -rwxr-xr-x | public/assets/stylesheets/app.css | 6 | ||||
| -rw-r--r-- | public/assets/stylesheets/staff.css | 2 | ||||
| -rw-r--r-- | server/lib/api/projects.js | 19 | ||||
| -rw-r--r-- | server/lib/util.js | 2 |
4 files changed, 20 insertions, 9 deletions
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index d6a231f..57cb8fc 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -502,6 +502,12 @@ iframe.embed { margin: 0 auto; display: block; } +.docs a { + border-bottom: 1px dashed; +} +.docs #header a, .docs .footer a { + border-bottom: 0; +} .docs .options { margin: 50px auto 0 auto; diff --git a/public/assets/stylesheets/staff.css b/public/assets/stylesheets/staff.css index c75a9b1..720eb0a 100644 --- a/public/assets/stylesheets/staff.css +++ b/public/assets/stylesheets/staff.css @@ -65,9 +65,11 @@ hr { font-size: 15px; } .staff .body a { + border-bottom: 1px dotted; } .staff .editLinks a { color: #00f; + border-bottom: 1px solid; } #iframe-embed, #iframe-embed tr, #iframe-embed td { width: 79vw; diff --git a/server/lib/api/projects.js b/server/lib/api/projects.js index 61a6e10..5bd3d0f 100644 --- a/server/lib/api/projects.js +++ b/server/lib/api/projects.js @@ -67,14 +67,6 @@ var projects = { return docs.create(req, res) } - var data = util.cleanQuery(req.body) - - // data.user_id = req.user._id - data.name = util.sanitize(data.name) - data.slug = util.slugify(data.name) - data.description = util.sanitize(data.description) - data.updated_at = new Date () - if (req.files.thumbnail) { upload.put("projects", req.files.thumbnail, { unacceptable: function(err){ @@ -93,6 +85,17 @@ var projects = { function done() { Project.findOne({ _id: _id }, function(err, doc){ if (err || ! doc) { return res.json({ error: err }) } + + var data = util.cleanQuery(req.body) + + // data.user_id = req.user._id + data.name = util.sanitize(data.name) + if (data.name != doc.name) { + data.slug = util.slugify(data.name) + } + data.description = util.sanitize(data.description) + data.updated_at = new Date () + _.extend(doc, data) doc.rooms = JSON.parse(data.rooms) diff --git a/server/lib/util.js b/server/lib/util.js index 791d3e2..2841cc5 100644 --- a/server/lib/util.js +++ b/server/lib/util.js @@ -13,7 +13,7 @@ var util = {} util.trim = function (s){ return (s || "").replace(whitespaceHead,"").replace(whitespaceTail,"") } util.slugify = function (s){ - return (s || "").toLowerCase().replace(whitespace,"-").replace(nonAlphanumerics, '-').replace(consecutiveDashes,"-") + return (s + "-" + (+new Date) || "").toLowerCase().replace(whitespace,"-").replace(nonAlphanumerics, '-').replace(consecutiveDashes,"-") } util.sanitize = function (s){ return (s || "").replace(entities, "") |