summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xpublic/assets/stylesheets/app.css12
-rw-r--r--server/lib/middleware.js2
-rw-r--r--views/projects/list-projects.ejs9
3 files changed, 13 insertions, 10 deletions
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 8508cf7..36cccef 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -230,6 +230,12 @@ iframe.embed {
color:white;
}
+#projectList .editBtn {
+ position: absolute;
+ right: 10px;
+ top: 10px;
+}
+
/*
.room1 {
position: relative;
@@ -240,12 +246,6 @@ iframe.embed {
background-image:url(https://s3.amazonaws.com/luckyplop/fd4ebe8a7a4246c8273fc999fb1ef0d6a8260b8c.png);
}
-.room1 .editBtn {
- position: absolute;
- right: 10px;
- top: 10px;
-}
-
.room1 form textarea {
width: 226px;
}
diff --git a/server/lib/middleware.js b/server/lib/middleware.js
index aec54ad..27b9c04 100644
--- a/server/lib/middleware.js
+++ b/server/lib/middleware.js
@@ -36,7 +36,7 @@ var middleware = {
ensureLocals: function (req, res, next) {
res.locals.token = req.csrfToken();
res.locals.logged_in = req.isAuthenticated()
- res.locals.user = req.user || {}
+ res.locals.user = req.user || { id: undefined }
res.locals.config = config
res.locals.profile = null
res.locals.opt = {}
diff --git a/views/projects/list-projects.ejs b/views/projects/list-projects.ejs
index d2c0447..c78bf9f 100644
--- a/views/projects/list-projects.ejs
+++ b/views/projects/list-projects.ejs
@@ -14,10 +14,13 @@
<td class="border room1">
[[ } ]]
<iframe src="/project/[[- project.slug ]]/view?noui=1&mute=1" class="embed"></iframe>
- [[ if (profile && profile._id == project.user_id) { ]]
- <div class="editBtn">edit</div>
+ [[ if (String(user._id) == String(project.user_id)) { ]]
+ <a href="/project/[[- project.slug ]]/edit"><div class="editBtn">edit</div></a>
[[ } ]]
- <a href="/project/[[- project.slug ]]" class="roomName">[[- project.name ]]<br>[[- project.date ]]</a>
+ <a href="/project/[[- project.slug ]]" class="roomName">
+ [[- project.name ]]<br>
+ [[- project.date ]]
+ </a>
</td>
[[ }) ]]