summaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
Diffstat (limited to 'views')
-rw-r--r--views/controls/editor/media-drawer.ejs3
-rw-r--r--views/docs.ejs2
-rwxr-xr-xviews/home.ejs9
-rw-r--r--views/profile.ejs20
-rw-r--r--views/projects/layouts-modal.ejs23
-rw-r--r--views/projects/list-projects.ejs36
-rw-r--r--views/staff/projects/show.ejs13
7 files changed, 70 insertions, 36 deletions
diff --git a/views/controls/editor/media-drawer.ejs b/views/controls/editor/media-drawer.ejs
index 10a160e..d800426 100644
--- a/views/controls/editor/media-drawer.ejs
+++ b/views/controls/editor/media-drawer.ejs
@@ -6,7 +6,7 @@
<input type="file" accept="image/*" class="file" multiple>
</form>
<small>~ or ~</small><br>
- <input type="text" placeholder="Enter Vimeo or YouTube Link" class="url">
+ <input type="text" placeholder="Enter Vimeo or YouTube or image link" class="url">
</span>
<div class="ants">
@@ -20,6 +20,7 @@
<h3 class="editBtn warn" id="deleteMedia"></h3>
<div class="myMedia">
+ <div class="noMedia">You have no media yet. Upload some!</div>
</div>
<div class="foundMedia">
diff --git a/views/docs.ejs b/views/docs.ejs
index 5662133..665190d 100644
--- a/views/docs.ejs
+++ b/views/docs.ejs
@@ -8,8 +8,6 @@
<div class="rapper page docs">
[[ include partials/header ]]
- <br clear="all">
-
[[ if (! isNew) { ]]
<h1>[[- doc.displayName ]]</h1>
diff --git a/views/home.ejs b/views/home.ejs
index 51d5a92..16b00e7 100755
--- a/views/home.ejs
+++ b/views/home.ejs
@@ -10,7 +10,7 @@
</script>
</head>
<body class="loading">
- <div class="rapper page">
+ <div class="rapper page home">
[[ include partials/header ]]
<div class="hero" style="background-image:url(https://s3.amazonaws.com/luckyplop/6450f5b88c5c043a4551eff8902b1728f813bd66.jpg)">
@@ -23,7 +23,7 @@
</div>
</div>
- <h1>Whats VValls For?</h1>
+ <h1>What's VValls For?</h1>
<div class="projectList about">
<div class="item wow bounceInLeft">
@@ -62,10 +62,9 @@
</div>
<h1>Room Showcase</h1>
- <img src="https://s3.amazonaws.com/uploads.hipchat.com/14935/55226/twq38ErgSnriaOq/vvalls-thumbnail-options2.gif" style="border-top:1px solid;width:100%">
- <!--
+
[[ include projects/list-projects ]]
- -->
+
<a href="#loadmore" class="viewMore btn">View More</a>
[[ include partials/confirm-modal ]]
diff --git a/views/profile.ejs b/views/profile.ejs
index d977844..5ff2eb0 100644
--- a/views/profile.ejs
+++ b/views/profile.ejs
@@ -41,7 +41,7 @@
[[ } ]]
</div>
</div>
- </div>
+
[[ if (projects.length) { ]]
<h1>[[- profile.username ]] has [[- projects.length ]] project[[- projects.length != 1 ? "s" : "" ]]</h1>
@@ -50,11 +50,23 @@
<a href="#" class="viewMore btn">view more</a>
[[ } else { ]]
+
<h1>Welcome to VVALLS</h1>
- <br><br>
- You don't have any projects yet. To get started click "New Project" up at the top of the screen.
+ <div class="projectList about">
+ <h2>
+ VValls lets you create awesome 3D rooms.
+ </h2>
+
+ <h2>
+ You don't have any projects yet.
+ </h2>
+ <h2>
+ <a href="#"class="btn" data-role="new-project-modal">Create a New Project</a>
+ </h2>
+
+ </div>
[[ } ]]
-
+ </div>
[[ include partials/edit-profile ]]
[[ include projects/layouts-modal ]]
[[ include projects/edit-project ]]
diff --git a/views/projects/layouts-modal.ejs b/views/projects/layouts-modal.ejs
index 24a83b7..6f60d81 100644
--- a/views/projects/layouts-modal.ejs
+++ b/views/projects/layouts-modal.ejs
@@ -3,14 +3,17 @@
<div class="box">
<div class="templates">
- <h1>Edit Room Layouts</h1>
+ <h2>Edit Room Layouts</h2>
+ <div class="templates-list">
+ </div>
+ <form>
+ <input data-role="create-new-layout" class="button_text" type="submit" value="New Layout">
+ </form>
</div>
<div class="no-templates">
There are no room layouts available. Please <a href="/layout/new">create a new one.</a>
</div>
- <form>
- <input data-role="create-new-layout" class="button_text" type="submit" value="New Layout">
- </form>
+
</div>
</div>
@@ -19,7 +22,9 @@
<div class="box">
<div class="templates">
- <h1>Your Projects</h1>
+ <h2>Your Projects</h2>
+ <div class="templates-list">
+ </div>
</div>
<div class="no-templates">
</div>
@@ -33,8 +38,14 @@
<span class="close">X</span>
<div class="box">
- <h2>Choose Room Template</h2>
<div class="templates">
+ <h2>Select a Room Template</h2>
+
+ <div class="templates-list">
+ </div>
+ <form>
+ <input data-role="create-new-layout" class="button_text" type="submit" value="or make your own template">
+ </form>
</div>
<div class="no-templates">
There are no room layouts available. Please <a href="/layout/new">create a new one.</a>
diff --git a/views/projects/list-projects.ejs b/views/projects/list-projects.ejs
index a12f237..c47dee0 100644
--- a/views/projects/list-projects.ejs
+++ b/views/projects/list-projects.ejs
@@ -4,31 +4,31 @@
[[ projects.forEach(function(project, i) { ]]
- <span class="room">
- <span class="images">
- <img src="[[- project.photo ]]">
+ [[ if (String(user._id) == String(project.user_id)) { ]]
+ <a href="/project/[[- project.slug ]]/edit">
+ [[ } else { ]]
+ <a href="/project/[[- project.slug ]]" class="roomName">
+ [[ } ]]
+
+ <span class="room" style="background-color: rgb([[- project.color ]]);">
+ <span class="mask" style="background-image: url([[- project.photo ]]);">
+ </span>
+ <span class="images" data-mediaCount="[[- Math.min(project.media.length, 4) ]]">
[[ mediaCount = 0 ]]
[[ project.media.some(function(media){ ]]
[[ if (media.media.type != "image") { return false } ]]
- [[ if (++mediaCount > 3) { return true } ]]
- <img src="[[- media.media.url ]]">
+ [[ if (++mediaCount > 4) { return true } ]]
+ <div style="background-image:url([[- media.media.url ]])"></div>
[[ }) ]]
</span>
-
- <div class="holder">
- [[ if (String(user._id) == String(project.user_id)) { ]]
- <a href="/project/[[- project.slug ]]/edit">
- [[- project.name ]]<br>
- [[- project.date ]]
- </a>
- [[ } else { ]]
- <a href="/project/[[- project.slug ]]" class="roomName">
- [[- project.name ]]<br>
- [[- project.date ]]
- [[ } ]]
- </div>
</span>
+ <label>
+ [[- project.name ]]<br>
+ Created &ndash; [[- project.date ]]
+ </label>
+
+ </a>
[[ }) ]]
</div>
diff --git a/views/staff/projects/show.ejs b/views/staff/projects/show.ejs
index 687f0c2..1034b31 100644
--- a/views/staff/projects/show.ejs
+++ b/views/staff/projects/show.ejs
@@ -41,8 +41,21 @@
"[[- project.description ]]"
</td>
</tr>
+ <tr>
+ <th>
+ featured?
+ </th>
+ <td id="isFeaturedProject">
+ [[- project.featured ? "yes" : "no" ]]
+ </td>
+ </tr>
</table>
+ <br><br>
+ <div id="actions">
+ <button id="toggle-featured" data-featured="[[- !! project.featured ]]">Feature this Project</button>
+ </div>
+
<br>
<br>
<table id="iframe-embed" class="projectList">
generated by cgit v1.2.3-70-g09d2 (git 2.51.0) at 2025-12-25 12:05:30 +0000