summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorryderr <r@okfoc.us>2014-09-29 18:18:47 -0400
committerryderr <r@okfoc.us>2014-09-29 18:18:47 -0400
commit58f4c20ce5d6c7a8bf01d48bbd0741e65a5be025 (patch)
tree40d12db116ad48feded18f47f7d8453d525fc0f5
parent22ab941f4630f545cc7d0475611d056372fcad10 (diff)
parentcc5393678f3acd8ff16af6863a903b1064502895 (diff)
Merge branch 'master' of github.com:okfocus/vvalls
-rw-r--r--public/assets/javascripts/ui/site/ProjectList.js4
-rw-r--r--views/projects/list-projects.ejs8
2 files changed, 2 insertions, 10 deletions
diff --git a/public/assets/javascripts/ui/site/ProjectList.js b/public/assets/javascripts/ui/site/ProjectList.js
index ee1b89f..993d805 100644
--- a/public/assets/javascripts/ui/site/ProjectList.js
+++ b/public/assets/javascripts/ui/site/ProjectList.js
@@ -4,8 +4,8 @@ var ProjectList = View.extend({
el: ".projectList",
events: {
- "mouseenter td.border": 'spinOn',
- "mouseleave td.border": 'spinOff',
+ "mouseenter .room": 'spinOn',
+ "mouseleave .room": 'spinOff',
},
initialize: function(){
diff --git a/views/projects/list-projects.ejs b/views/projects/list-projects.ejs
index 3801e30..537d409 100644
--- a/views/projects/list-projects.ejs
+++ b/views/projects/list-projects.ejs
@@ -4,15 +4,7 @@
[[ projects.forEach(function(project, i) { ]]
- [[ if (i % 4 == 1) { ]]
-
- [[ } ]]
-
- [[ if (i == 0) { ]]
- <span class="room">
- [[ } else { ]]
<span class="room">
- [[ } ]]
<iframe src="/project/[[- project.slug ]]/view?noui=1&mute=1" class="embed"></iframe>
[[ if (String(user._id) == String(project.user_id)) { ]]
<a href="/project/[[- project.slug ]]/edit"><div class="editBtn">edit</div></a>