diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-07-17 14:36:31 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-07-17 14:36:31 -0400 |
| commit | 82b91286f9ccaa97c82730d17e15569aa982e04b (patch) | |
| tree | 8a62b65c2e6f49c1052c8a978cb837942d8b8292 /views | |
| parent | c175b8b78cad5424f81370e721277b18af6aff92 (diff) | |
| parent | aa42a633820d42fc2bc8d18d499eec559f2c43b7 (diff) | |
merge
Diffstat (limited to 'views')
| -rwxr-xr-x | views/home.ejs | 22 | ||||
| -rw-r--r-- | views/profile.ejs | 4 | ||||
| -rw-r--r-- | views/projects/list-projects.ejs | 11 |
3 files changed, 13 insertions, 24 deletions
diff --git a/views/home.ejs b/views/home.ejs index 45a6e6f..8b83a8f 100755 --- a/views/home.ejs +++ b/views/home.ejs @@ -24,27 +24,7 @@ <h1>Room Showcase</h1> - <table class="showcase"> - [[ include projects/list-projects ]] - - - <tr> - <td class="border room1"> - <a href="/" class="roomName">Pace Gallery • 7.1.14</a> - </td> - <td class="room1"> - <a href="/" class="roomName">Pace Gallery • 7.1.14</a> - </td> - </tr> - <tr class="room1"> - <td class="border room1"> - <a href="/" class="roomName">Pace Gallery • 7.1.14</a> - </td> - <td class="room1"> - <a href="/" class="roomName">Pace Gallery • 7.1.14</a> - </td> - </tr> - </table> + [[ include projects/list-projects ]] <a href="#loadmore" class="viewMore">View More</a> diff --git a/views/profile.ejs b/views/profile.ejs index 7bdbd51..8dd3c6d 100644 --- a/views/profile.ejs +++ b/views/profile.ejs @@ -38,6 +38,10 @@ </td> </tr> </table> + + [[ if (projects.length) { ]] + <h1>[[- profile.username ]] has [[- projects.length ]] project[[- projects.length != 1 ? "s" : "" ]]</h1> + [[ } ]] [[ include projects/list-projects ]] diff --git a/views/projects/list-projects.ejs b/views/projects/list-projects.ejs index 205e778..3c71823 100644 --- a/views/projects/list-projects.ejs +++ b/views/projects/list-projects.ejs @@ -1,17 +1,22 @@ [[ if (projects.length) { ]] - <h1>[[- profile.username ]] has [[- projects.length ]] project[[- projects.length != 1 ? "s" : "" ]]</h1> - + <table> <tr> [[ projects.forEach(function(project, i) { ]] + [[ if (i % 4 == 1) { ]] + </tr><tr> + [[ } ]] <td class="border room1"> + [[ if (i == 0) { ]] <iframe src="/project/[[- project.slug ]]/view?noui=1&mute=1" class="embed"></iframe> - [[ if (profile._id == project.user_id) { ]] + [[ } ]] + [[ if (profile && profile._id == project.user_id) { ]] <div class="editBtn">edit</div> [[ } ]] <a href="/project/[[- project.slug ]]" class="roomName">[[- project.name ]]<br>[[- project.date ]]</a> </td> + [[ }) ]] </tr> |