summaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
Diffstat (limited to 'views')
-rw-r--r--views/controls/editor/light-control.ejs16
-rw-r--r--views/controls/editor/media-drawer.ejs4
-rw-r--r--views/controls/editor/media-editor.ejs4
-rw-r--r--views/controls/editor/settings.ejs10
-rw-r--r--views/controls/editor/toolbar.ejs2
-rw-r--r--views/controls/editor/wallpaper.ejs5
-rw-r--r--views/controls/reader/about-room.ejs8
-rwxr-xr-xviews/home.ejs19
-rw-r--r--views/partials/edit-profile.ejs5
-rw-r--r--views/partials/header.ejs2
-rw-r--r--views/partials/sign-in.ejs4
-rw-r--r--views/profile.ejs2
-rw-r--r--views/projects/layouts-modal.ejs5
-rw-r--r--views/projects/list-projects.ejs22
-rw-r--r--views/staff/projects/show.ejs1
15 files changed, 59 insertions, 50 deletions
diff --git a/views/controls/editor/light-control.ejs b/views/controls/editor/light-control.ejs
index a67df34..8b133a5 100644
--- a/views/controls/editor/light-control.ejs
+++ b/views/controls/editor/light-control.ejs
@@ -1,16 +1,26 @@
<div class="vvbox lightcontrol">
-
+ <div id="color-picker">
+ </div>
+
<div class="slider">
+ <h4>Brightness Control</h4>
<input type="range" min="0" max="110" value="0" id="brightness-control" />
- <h4>Brightness</h4>
</div>
<div class="color-swatches">
+ <span>
<div class="swatch" id="wall-color" data-mode="wall"></div><label>wall</label>
+ </span>
+ <span class="active">
<div class="swatch" id="floor-color" data-mode="floor"></div><label>floor</label>
+ </span>
+ <span>
<div class="swatch" id="ceiling-color" data-mode="ceiling"></div><label>ceiling</label>
- <br>
+ </span>
+ <span>
<div class="swatch" id="outline-color" data-mode="outline"></div><label>outlines</label>
+ </span>
+ <span>
</div>
<!--
diff --git a/views/controls/editor/media-drawer.ejs b/views/controls/editor/media-drawer.ejs
index 456699c..d73a3ef 100644
--- a/views/controls/editor/media-drawer.ejs
+++ b/views/controls/editor/media-drawer.ejs
@@ -16,8 +16,8 @@
<div class="mediaDrawer fixed animate mediaViewer">
<span class="close">X</span>
- <h2><a href="#" class="yourMedia active">Your Media</a> – <a href="#" class="foundToggle">Found Media</a></h2><br>
- <h3 class="editBtn" id="deleteMedia">delete media</h3>
+ <h2><a href="#" class="userToggle active">Your Media</a> – <a href="#" class="foundToggle">Found Media</a></h2><br>
+ <h3 class="editBtn warn" id="deleteMedia">delete media?</h3>
<div class="myMedia">
</div>
diff --git a/views/controls/editor/media-editor.ejs b/views/controls/editor/media-editor.ejs
index 7f8f299..000e8db 100644
--- a/views/controls/editor/media-editor.ejs
+++ b/views/controls/editor/media-editor.ejs
@@ -50,7 +50,7 @@
</select>
</div>
- <div class="setting subButtons">
- <a href="#" data-role="destroy-media">Delete</a>
+ <div class="setting">
+ <a href="#" class="warn btn" data-role="destroy-media">delete this media</a>
</div>
</div>
diff --git a/views/controls/editor/settings.ejs b/views/controls/editor/settings.ejs
index e4ec7ee..ed587fa 100644
--- a/views/controls/editor/settings.ejs
+++ b/views/controls/editor/settings.ejs
@@ -27,11 +27,11 @@
<div class="radio-group">
<input id="privacy_private" class="radio-group__option" type="radio" name="privacy" value="public" checked>
<label class="radio-group__label" for="privacy_private">
- Everyone
+ Public
</label>
<input id="privacy_public" class="radio-group__option" type="radio" name="privacy" value="private">
<label class="radio-group__label" for="privacy_public">
- Just for me
+ Private
</label>
</div>
</div>
@@ -39,8 +39,8 @@
<button data-role="save-project">Save</button>
</div>
<div class="setting subButtons">
- <a href="#" data-role="clear-project">Clear</a>
- <a href="#" data-role="clone-project">Clone</a>
- <a href="#" data-role="destroy-project">Delete</a>
+ <a href="#" data-role="clear-project" class="btn">Clear</a>
+ <a href="#" data-role="clone-project" class="btn">Clone</a>
+ <a href="#" data-role="destroy-project" class="btn warn">Delete Room</a>
</div>
</div>
diff --git a/views/controls/editor/toolbar.ejs b/views/controls/editor/toolbar.ejs
index e073df4..4abf780 100644
--- a/views/controls/editor/toolbar.ejs
+++ b/views/controls/editor/toolbar.ejs
@@ -17,7 +17,7 @@
class="icon-ios7-keypad-outline"></span>
<span
data-role='toggle-light-control'
- data-info="light control"
+ data-info="edit room colors"
class="icon-ios7-sunny-outline"></span>
<span
data-role='edit-wall-text'
diff --git a/views/controls/editor/wallpaper.ejs b/views/controls/editor/wallpaper.ejs
index 02ab16d..208dfff 100644
--- a/views/controls/editor/wallpaper.ejs
+++ b/views/controls/editor/wallpaper.ejs
@@ -1,8 +1,13 @@
<div class="vvbox wallpaper">
+
+ <!-- IF NO WALL PAPER -->
+ <span class="txt">Add custom wallpaper to walls. Begin by uploading a pattern. Or try this one -> </span>
+
<div class="swatches"></div>
<div class="wallpaperUpload">
<form>
+
<span class="icon-ios7-upload-outline upload-icon"></span>
<label>Upload wallpaper</label>
<input type="file" accept="image/*" class="file" multiple>
diff --git a/views/controls/reader/about-room.ejs b/views/controls/reader/about-room.ejs
index 2aa244b..e13f363 100644
--- a/views/controls/reader/about-room.ejs
+++ b/views/controls/reader/about-room.ejs
@@ -1,15 +1,17 @@
<div class="aboutRoom vvbox">
<h1>
- [[- name ]],<br>
+ [[- name ]],
<a href="[[- authorlink ]]">[[- author ]]</a>
</h1>
+ [[ if (description) { ]]
+ <span class="txt">[[- description ]]</span>
+ [[ } ]]
<h2>
Last modified [[- date ]]
[[ if (canEdit) { ]]
- &middot; <a href="[[- editlink ]]" class="editlink">Edit</a>
+ <a href="[[- editlink ]]" class="btn warn marg">Edit Room</a>
[[ } ]]
</h2>
- <span>[[- description ]]</span>
</div>
<div class="share">
diff --git a/views/home.ejs b/views/home.ejs
index 8b83a8f..e49dc4a 100755
--- a/views/home.ejs
+++ b/views/home.ejs
@@ -13,20 +13,21 @@
<div class="rapper page">
[[ include partials/header ]]
- <table class="demo">
- <tr>
- <td class="video" style="background-image:url(https://s3.amazonaws.com/luckyplop/6450f5b88c5c043a4551eff8902b1728f813bd66.jpg)">
- <span class="icon-ios7-play-outline"></span><br>
- <span class="videoTitle">Welcome to VVALLS</span>
- </td>
- </tr>
- </table>
+ <div class="hero" style="background-image:url(https://s3.amazonaws.com/luckyplop/6450f5b88c5c043a4551eff8902b1728f813bd66.jpg)">
+ <div class="holder">
+ <span class="circle">
+ <span class="videoTitle">Create 3D Rooms</span><br>
+ <span class="icon-ios7-play"></span><br>
+ <span class="videoTitle">Watch video.</span>
+ </span>
+ </div>
+ </div>
<h1>Room Showcase</h1>
[[ include projects/list-projects ]]
- <a href="#loadmore" class="viewMore">View More</a>
+ <a href="#loadmore" class="viewMore btn">View More</a>
[[ include partials/confirm-modal ]]
[[ include projects/layouts-modal ]]
diff --git a/views/partials/edit-profile.ejs b/views/partials/edit-profile.ejs
index 96e9da4..a39f856 100644
--- a/views/partials/edit-profile.ejs
+++ b/views/partials/edit-profile.ejs
@@ -61,8 +61,9 @@
</li>
<li class="section_break">
- <h3>Change Password</h3>
+ <h3 class="link">Change Password</h3>
</li>
+ <div class="hidden">
<li>
<label class="description" for="profile_old_password">Old Password:</label>
<div>
@@ -81,7 +82,7 @@
<input id="profile_new_password2" class="element text medium" type="password" maxlength="255">
</div>
</li>
-
+ </div>
<li class="buttons">
<input id="saveForm" class="button_text" type="submit" value="Submit" />
</li>
diff --git a/views/partials/header.ejs b/views/partials/header.ejs
index 6697aff..a48c5e1 100644
--- a/views/partials/header.ejs
+++ b/views/partials/header.ejs
@@ -14,7 +14,7 @@
<a href="/project" data-role="show-projects-modal" class="topLink">Projects</a>
[[ if (profile && String(user._id) == String(profile._id)) { ]]
- <a href="/profile" data-role="edit-profile-modal" class="topLink editProfile">Edit Profile <span class="icon-ios7-gear-outline"></span></a>
+ <a href="/profile" data-role="edit-profile-modal" class="topLink editProfile">Settings</a>
[[ } else if (! profile) { ]]
<a href="/profile" class="topLink">Profile</a>
[[ } ]]
diff --git a/views/partials/sign-in.ejs b/views/partials/sign-in.ejs
index 8268b2a..98f0acc 100644
--- a/views/partials/sign-in.ejs
+++ b/views/partials/sign-in.ejs
@@ -6,7 +6,7 @@
<form id="signIn" method="post">
<input type="hidden" name="_csrf" value="[[- token ]]">
<a href="/auth/facebook" class="facebook"><b class="icon-social-facebook"></b><span>Sign in with Facebook</span></a>
- <b class="signin-tagline">– or the ol' fashion way –</b>
+ <b class="signin-tagline">– or with your email –</b>
<li>
<label class="description" for="usernameInput">Username:</label>
<div>
@@ -39,7 +39,7 @@
<form id="signUp" method="post">
<input type="hidden" name="_csrf" value="[[- token ]]">
<a href="/auth/facebook" class="facebook"><b class="icon-social-facebook"></b><span>Sign up with Facebook</span></a>
- <b class="signin-tagline">– or the ol' fashion way –</b>
+ <b class="signin-tagline">– or with your email –</b>
<li>
<label class="description" for="usernameInput">Username:</label>
<div>
diff --git a/views/profile.ejs b/views/profile.ejs
index 8dd3c6d..ada3d52 100644
--- a/views/profile.ejs
+++ b/views/profile.ejs
@@ -45,7 +45,7 @@
[[ include projects/list-projects ]]
- <a href="#" data-role="new-project-modal" class="viewMore">create project</a>
+ <a href="#" data-role="new-project-modal" class="viewMore btn">create project</a>
[[ include partials/edit-profile ]]
[[ include projects/layouts-modal ]]
diff --git a/views/projects/layouts-modal.ejs b/views/projects/layouts-modal.ejs
index 97f1e61..34dc9af 100644
--- a/views/projects/layouts-modal.ejs
+++ b/views/projects/layouts-modal.ejs
@@ -33,14 +33,11 @@
<span class="close">X</span>
<div class="box">
+ <h1>Choose Room Template</h1>
<div class="templates">
- <h1>Choose Room Template</h1>
</div>
<div class="no-templates">
There are no room layouts available. Please <a href="/layout/new">create a new one.</a>
</div>
- <form>
- <input class="button_text" type="submit" value="Create Project">
- </form>
</div>
</div>
diff --git a/views/projects/list-projects.ejs b/views/projects/list-projects.ejs
index c41ae07..537d409 100644
--- a/views/projects/list-projects.ejs
+++ b/views/projects/list-projects.ejs
@@ -1,31 +1,23 @@
[[ if (projects.length) { ]]
- <table class="projectList">
- <tr>
+ <div class="projectList">
[[ projects.forEach(function(project, i) { ]]
- [[ if (i % 4 == 1) { ]]
- </tr><tr>
- [[ } ]]
-
- [[ if (i == 0) { ]]
- <td class="border room1" colspan=3">
- [[ } else { ]]
- <td class="border room1">
- [[ } ]]
+
+ <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>
[[ } ]]
+ <div class="holder">
<a href="/project/[[- project.slug ]]" class="roomName">
[[- project.name ]]<br>
[[- project.date ]]
</a>
- </td>
+ </div>
+ </span>
[[ }) ]]
-
- </tr>
- </table>
+ </div>
[[ } ]]
diff --git a/views/staff/projects/show.ejs b/views/staff/projects/show.ejs
index bd23784..687f0c2 100644
--- a/views/staff/projects/show.ejs
+++ b/views/staff/projects/show.ejs
@@ -19,6 +19,7 @@
<td class="editLinks">
<a href="/project/[[- project.slug ]]">[view]</a>
<a href="/project/[[- project.slug ]]/edit">[edit]</a>
+ <a href="/api/rooms/[[- project.slug ]]">[api]</a>
</td>
<td>
[[- project.date ]]
generated by cgit v1.2.3-70-g09d2 (git 2.51.0) at 2025-12-23 07:52:46 +0000