summaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
Diffstat (limited to 'views')
-rw-r--r--views/controls/editor/collaborators.ejs61
-rw-r--r--views/controls/editor/light-control.ejs16
-rw-r--r--views/controls/editor/settings.ejs8
-rw-r--r--views/controls/editor/wallpaper.ejs12
-rw-r--r--views/controls/reader/about-room.ejs7
-rwxr-xr-xviews/editor.ejs1
-rw-r--r--views/mail/collaborator.html.ejs20
-rw-r--r--views/mail/collaborator.text.ejs7
-rw-r--r--views/mail/welcome.html.ejs2
-rw-r--r--views/mail/welcome.text.ejs2
-rw-r--r--views/partials/meta.ejs17
-rw-r--r--views/partials/scripts.ejs4
-rw-r--r--views/reader.ejs2
13 files changed, 152 insertions, 7 deletions
diff --git a/views/controls/editor/collaborators.ejs b/views/controls/editor/collaborators.ejs
new file mode 100644
index 0000000..69e5b64
--- /dev/null
+++ b/views/controls/editor/collaborators.ejs
@@ -0,0 +1,61 @@
+<div class="collaborators fixed mediaDrawer animate">
+ <span class="close">X</span>
+
+ <div>
+ <h2>Collaborators</h2>
+
+ <p>
+ To invite others to contribute to this project, submit their email address below. They'll receive an email with instructions to join this blog and register if they're not a Vvalls user yet.
+ </p>
+
+ <form>
+ <input type="text" id="collaborator-email" name="email">
+ <input type="submit" id="collaborator-invite" value="Invite to this project">
+ </form>
+
+ <div id="collaborator-url-rapper">
+ We've sent a link to join this project to <span id="collaborator-dummy-email"></span>.
+ You can also send this link yourself:
+ <input type="text" id="collaborator-url">
+ </div>
+
+ <ul id="collaborator-list">
+ </ul>
+
+ </div>
+
+</div>
+
+<script type="text/html" id="collaborator-template">
+ <li>
+ <a class="user">
+ <div class="avatar"></div><span class="username"></span>
+ </a>
+ <span class="email"></span>
+ <button data-role="destroy-collaborator" class="remove-user">Remove</button>
+ <span class="role">owner</span>
+ </li>
+</script>
+
+<style>
+#collaborator-url-rapper {
+ display: none;
+ background: #fff;
+ border: 1px solid;
+ box-shadow: -3px 3px 0;
+ padding: 10px;
+ font-weight: 300;
+ font-size: 14px;
+ margin: 10px 0;
+}
+#collaborator-url {
+ font-size: 16px;
+ width: 500px;
+ border: 1px solid;
+ font-size: 14px;
+ padding: 5px;
+ font-weight: 300;
+ margin-top: 5px;
+ display: block;
+}
+</style>
diff --git a/views/controls/editor/light-control.ejs b/views/controls/editor/light-control.ejs
index ddd282b..a67df34 100644
--- a/views/controls/editor/light-control.ejs
+++ b/views/controls/editor/light-control.ejs
@@ -1,8 +1,19 @@
<div class="vvbox lightcontrol">
+
<div class="slider">
- <input type="range" min="0" max="100" value="0" id="outline-hue" />
- <h4>Outline Hue</h4>
+ <input type="range" min="0" max="110" value="0" id="brightness-control" />
+ <h4>Brightness</h4>
</div>
+
+ <div class="color-swatches">
+ <div class="swatch" id="wall-color" data-mode="wall"></div><label>wall</label>
+ <div class="swatch" id="floor-color" data-mode="floor"></div><label>floor</label>
+ <div class="swatch" id="ceiling-color" data-mode="ceiling"></div><label>ceiling</label>
+ <br>
+ <div class="swatch" id="outline-color" data-mode="outline"></div><label>outlines</label>
+ </div>
+
+<!--
<div class="slider">
<input type="range" min="0" max="100" value="100" id="wall-hue" />
<h4>Wall Hue</h4>
@@ -15,4 +26,5 @@
<input type="range" min="0" max="100" value="0" id="shadow-control" />
<h4>Shadow</h4>
</div>
+-->
</div>
diff --git a/views/controls/editor/settings.ejs b/views/controls/editor/settings.ejs
index 6f46be3..e4ec7ee 100644
--- a/views/controls/editor/settings.ejs
+++ b/views/controls/editor/settings.ejs
@@ -3,11 +3,17 @@
<input type="hidden" name="_id" value="new">
<div class="setting">
- <a href="#" id="startpoint">
+ <a href="#" class="modalLink" id="startpoint">
<span class="icon-ios7-navigate-outline"></span>
<span id="startText">Select Startpoint</span>
<span id="moveText">Move to Desired Point</span></a>
</div>
+ <div class="setting">
+ <a href="#" class="modalLink" data-role='show-collaborators'>
+ <span class="icon-ios7-plus-outline"></span>
+ Add Collaborators
+ </a>
+ </div>
<div class="setting">
<input type="text" name="name" placeholder="room name">
diff --git a/views/controls/editor/wallpaper.ejs b/views/controls/editor/wallpaper.ejs
index 144e419..55ecf85 100644
--- a/views/controls/editor/wallpaper.ejs
+++ b/views/controls/editor/wallpaper.ejs
@@ -1,4 +1,16 @@
<div class="vvbox wallpaper">
+ <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>
+ </form>
+<!--
+ <input type="text" placeholder="Enter Image URL" class="url">
+ -->
+ </div>
</div>
<div class="floatingSwatch"></div>
diff --git a/views/controls/reader/about-room.ejs b/views/controls/reader/about-room.ejs
index f990da8..2aa244b 100644
--- a/views/controls/reader/about-room.ejs
+++ b/views/controls/reader/about-room.ejs
@@ -3,7 +3,12 @@
[[- name ]],<br>
<a href="[[- authorlink ]]">[[- author ]]</a>
</h1>
- <h2>Last modified [[- date ]]</h2>
+ <h2>
+ Last modified [[- date ]]
+ [[ if (canEdit) { ]]
+ &middot; <a href="[[- editlink ]]" class="editlink">Edit</a>
+ [[ } ]]
+ </h2>
<span>[[- description ]]</span>
</div>
diff --git a/views/editor.ejs b/views/editor.ejs
index 5d1e052..9950878 100755
--- a/views/editor.ejs
+++ b/views/editor.ejs
@@ -17,6 +17,7 @@
[[ include controls/editor/media-editor ]]
[[ include controls/editor/wallpaper ]]
[[ include controls/editor/light-control ]]
+ [[ include controls/editor/collaborators ]]
[[ include controls/editor/settings ]]
</div>
diff --git a/views/mail/collaborator.html.ejs b/views/mail/collaborator.html.ejs
new file mode 100644
index 0000000..2a08a1c
--- /dev/null
+++ b/views/mail/collaborator.html.ejs
@@ -0,0 +1,20 @@
+<html>
+<body>
+
+<p>
+ <a href="http://vvalls.com/"><img src="http://vvalls.com/assets/img/logo.svg"></a>
+</p>
+
+<p>
+ <a href="http://vvalls.com/profile/[[- username ]]">[[- username ]]</a> has invited you to join the project
+ <a href="http://vvalls.com/project/[[- projectSlug ]]">[[- projectName ]]</a> on Vvalls.
+</p>
+
+<p>
+ Accept the invitation below:
+</p>
+
+<a href="http://vvalls.com/join/[[- nonce ]]">Join Project</a>
+
+</body>
+</html>
diff --git a/views/mail/collaborator.text.ejs b/views/mail/collaborator.text.ejs
new file mode 100644
index 0000000..52d39b6
--- /dev/null
+++ b/views/mail/collaborator.text.ejs
@@ -0,0 +1,7 @@
+
+[[- username ]] has invited you to join the project [[- projectName ]] on Vvalls.
+
+Accept the invitation below:
+
+http://vvalls.com/join/[[- nonce ]]
+
diff --git a/views/mail/welcome.html.ejs b/views/mail/welcome.html.ejs
index 8b7194b..b2c329f 100644
--- a/views/mail/welcome.html.ejs
+++ b/views/mail/welcome.html.ejs
@@ -2,7 +2,7 @@
<body>
<p>
- <a href="http://vvalls.com/"><img src="http://vvalls.com/img/logo.svg"></a>
+ <a href="http://vvalls.com/"><img src="http://vvalls.com/assets/img/logo.svg"></a>
</p>
<p>
diff --git a/views/mail/welcome.text.ejs b/views/mail/welcome.text.ejs
index cab9c15..02b449b 100644
--- a/views/mail/welcome.text.ejs
+++ b/views/mail/welcome.text.ejs
@@ -1,4 +1,4 @@
Welcome to Vvalls, [[- username ]]
-http://www.posthang.com
+http://www.vvalls.com
diff --git a/views/partials/meta.ejs b/views/partials/meta.ejs
index ceaaba1..9916b34 100644
--- a/views/partials/meta.ejs
+++ b/views/partials/meta.ejs
@@ -1,3 +1,20 @@
+
+<!-----+ +------+ +------+ +------+ +------+
+|`. `. |\ \ | | / /| .' .'|
+| `+------+ | +------+ +------+ +------+ | +------+' |
+| | | | | | | | | | | | | |
++ | | + | | | | | | + | | +
+ `. | | \| | | | | |/ | | .'
+ `+------+ +------+ +------+ +------+ +------+'
+ VVALLS - developed by okfoc.us
+ .+------+ +------+ +------+ +------+ +------+.
+ .' .'| / /| | | |\ \ |`. `.
++------+' | +------+ | +------+ | +------+ | `+------+
+| | | | | | | | | | | | | |
+| | + | | + | | + | | + | |
+| | .' | |/ | | \| | `. | |
++------+' +------+ +------+ +------+ `+------>
+
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 6d85699..7d56b2e 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -41,6 +41,7 @@
<script type="text/javascript" src="/assets/javascripts/rectangles/models/wall.js"></script>
<script type="text/javascript" src="/assets/javascripts/rectangles/engine/rooms/_rooms.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/rooms/_walls.js"></script>
<script type="text/javascript" src="/assets/javascripts/rectangles/engine/rooms/builder.js"></script>
<script type="text/javascript" src="/assets/javascripts/rectangles/engine/rooms/clipper.js"></script>
<script type="text/javascript" src="/assets/javascripts/rectangles/engine/rooms/grouper.js"></script>
@@ -63,6 +64,7 @@
<script type="text/javascript" src="/assets/javascripts/ui/lib/Router.js"></script>
<script type="text/javascript" src="/assets/javascripts/ui/lib/ModalView.js"></script>
<script type="text/javascript" src="/assets/javascripts/ui/lib/FormView.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/lib/UploadView.js"></script>
<script type="text/javascript" src="/assets/javascripts/ui/lib/AlertModal.js"></script>
<script type="text/javascript" src="/assets/javascripts/ui/lib/ConfirmModal.js"></script>
<script type="text/javascript" src="/assets/javascripts/ui/lib/ErrorModal.js"></script>
@@ -91,6 +93,7 @@
<script type="text/javascript" src="/assets/javascripts/ui/editor/EditorSettings.js"></script>
<script type="text/javascript" src="/assets/javascripts/ui/editor/EditorToolbar.js"></script>
<script type="text/javascript" src="/assets/javascripts/ui/editor/LightControl.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/editor/Collaborators.js"></script>
<script type="text/javascript" src="/assets/javascripts/ui/editor/MediaEditor.js"></script>
<script type="text/javascript" src="/assets/javascripts/ui/editor/MediaUpload.js"></script>
<script type="text/javascript" src="/assets/javascripts/ui/editor/MediaViewer.js"></script>
@@ -102,6 +105,7 @@
<script type="text/javascript" src="/assets/javascripts/ui/_router.js"></script>
<script type="text/javascript" src="/assets/javascripts/app.js"></script>
+<script type="text/javascript" src="/assets/javascripts/defaults.js"></script>
<!-- external dependencies -->
<script src="http://www.youtube.com/player_api"></script>
diff --git a/views/reader.ejs b/views/reader.ejs
index 7c31766..ed5df1f 100644
--- a/views/reader.ejs
+++ b/views/reader.ejs
@@ -4,7 +4,7 @@
<title>vvalls</title>
[[ include partials/meta ]]
</head>
-<body class="editing loading">
+<body class="loading">
<div id="scene"></div>
generated by cgit v1.2.3-70-g09d2 (git 2.51.0) at 2025-12-21 16:51:07 +0000