diff options
Diffstat (limited to 'views')
| -rw-r--r-- | views/controls/editor/settings.ejs | 14 | ||||
| -rwxr-xr-x | views/home.ejs | 12 | ||||
| -rw-r--r-- | views/partials/footer.ejs | 2 | ||||
| -rw-r--r-- | views/partials/meta.ejs | 2 | ||||
| -rw-r--r-- | views/partials/scripts.ejs | 2 | ||||
| -rw-r--r-- | views/profile.ejs | 16 | ||||
| -rw-r--r-- | views/reader.ejs | 6 |
7 files changed, 35 insertions, 19 deletions
diff --git a/views/controls/editor/settings.ejs b/views/controls/editor/settings.ejs index 8443abb..cd17382 100644 --- a/views/controls/editor/settings.ejs +++ b/views/controls/editor/settings.ejs @@ -10,17 +10,25 @@ <span class="ion-ios7-navigate-outline"></span> <span id="startText">Set Startpoint</span> <span id="moveText">Move to Desired Point <span class="done">done</span></span> - <span id="confirmText">Startpoint Confirmed</span> + <span id="confirmText">Set Startpoint</span> </a> - <a href="#" class="modalLink" id="goText"><span>(go there)</span></span> + <a href="#" class="modalLink" id="goText"><span><u>view current</u></span></span> </div> + <div class="setting"> <a href="#" class="modalLink" data-role='show-collaborators'> <span class="ion-ios7-plus-outline"></span> Add Collaborators </a> </div> - + + <div class="setting"> + <a href="#" class="modalLink" data-role='toggle-map'> + <span class="ion-map"></span> + Edit map + </a> + </div> + <div class="setting"> <input type="text" name="name" placeholder="room name"> </div> diff --git a/views/home.ejs b/views/home.ejs index 85a235b..0a55336 100755 --- a/views/home.ejs +++ b/views/home.ejs @@ -15,7 +15,7 @@ <div class="hero" style="background-image:url(http://okfocus.s3.amazonaws.com/images/vvalls-video-still1.jpg)"> <div class="holder"> - <span class="circle wow bounceInDown"> + <span class="circle"> <span class="videoTitle">Create 3D Rooms</span><br> <span class="ion-ios7-play"></span><br> <span class="videoTitle">Watch video.</span> @@ -26,29 +26,29 @@ <h1>What's VValls For?</h1> <div class="projectList about"> - <div class="item wow bounceInLeft"> + <div class="item"> <div class="rap"> <span style="background-image:url(http://okfocus.s3.amazonaws.com/images/hangart1.gif)"> </span> <span> <h3>Plan Your Art Show</h3> - <words>Whether you're and artist or curator, VValls makes visualizing art within a physical space much easier. With VValls you can build 3D rooms and put your add art to the walls. Map out how your next gallery show will look without having to drill into sheetrock.</words> + <words>Whether you're an artist or curator, VValls makes visualizing art within a physical space much easier. With VValls you can build 3D rooms and add art to the walls. Map out how your next gallery show will look without having to nail into sheetrock.</words> </span> </div> </div> - <div class="item wow bounceInRight"> + <div class="item"> <div class="rap"> <span style="background-image:url(http://dump.fm/images/20100904/1283618382861-dumpfm-timb-paperrad.paranoia.gif)"> </span> <span> <h3>Defy The Status Quo</h3> - <words>There is no platform on the internet quite like VValls. Built using advanced HTML5 techniques, VValls opens up the possibilities of expression online. Go crazy, make other worldly rooms.</words> + <words>There is no platform on the internet quite like VValls. Built using advanced HTML5 techniques, VValls opens up the possibilities of expression online. Go crazy, make otherworldly rooms.</words> </span> </div> </div> - <div class="item wow bounceInLeft"> + <div class="item"> <div class="rap"> <span style="background-image:url(http://33.media.tumblr.com/tumblr_m0an31XPpF1qbhp9xo1_1280.jpg)"> </span> diff --git a/views/partials/footer.ejs b/views/partials/footer.ejs index 3ee4afc..f44b611 100644 --- a/views/partials/footer.ejs +++ b/views/partials/footer.ejs @@ -11,7 +11,7 @@ <br><br> <span> - you are signed in as → + signed in as → <a href="/profile/[[- user.username ]]"><b>[[- user.displayName ]]</b></a> [[ if (user.isStaff) { ]] <a href="/staff">Staff Area</a> diff --git a/views/partials/meta.ejs b/views/partials/meta.ejs index c50fc01..f1b6f48 100644 --- a/views/partials/meta.ejs +++ b/views/partials/meta.ejs @@ -30,7 +30,7 @@ <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon"> <link href='/assets/stylesheets/ionicons.css' rel='stylesheet' type='text/css'> <link href='/assets/stylesheets/app.css' rel='stylesheet' type='text/css'> - <link href='/assets/stylesheets/animate.css' rel='stylesheet' type='text/css'> + <!--<link href='/assets/stylesheets/animate.css' rel='stylesheet' type='text/css'>--> <link href='/assets/stylesheets/chardinjs.css' rel='stylesheet' type='text/css'> <!--[if lt IE 9]> <style> diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs index af16099..3e61a5a 100644 --- a/views/partials/scripts.ejs +++ b/views/partials/scripts.ejs @@ -7,7 +7,7 @@ <script type="text/javascript" src="/assets/javascripts/vendor/tube.js"></script> <script type="text/javascript" src="/assets/javascripts/vendor/loader.js"></script> <script type="text/javascript" src="/assets/javascripts/vendor/polyfill.js"></script> -<script type="text/javascript" src="/assets/javascripts/vendor/wow.js"></script> +<!--<script type="text/javascript" src="/assets/javascripts/vendor/wow.js"></script>--> <script type="text/javascript" src="/assets/javascripts/vendor/chardinjs.min.js"></script> <script type="text/javascript" src="/assets/javascripts/vendor/sha1.js"></script> <script type="text/javascript" src="/assets/javascripts/vendor/dataUriToBlob.js"></script> diff --git a/views/profile.ejs b/views/profile.ejs index 1be0702..272deb7 100644 --- a/views/profile.ejs +++ b/views/profile.ejs @@ -58,14 +58,16 @@ </h2> [[ if (isOwnProfile) { ]] - <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> + <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> + [[ } else { ]] + <h2><a href="/" class="homeLink">Learn more about VValls</a></h2> + <h3>This person has no projects.</h3> [[ } ]] - </div> [[ } ]] </div> diff --git a/views/reader.ejs b/views/reader.ejs index b110ffd..e86bab1 100644 --- a/views/reader.ejs +++ b/views/reader.ejs @@ -16,6 +16,12 @@ [[ include controls/reader/about-room ]] [[ include controls/reader/media-player ]] </div> + +<!-- + <div id="minimap" class="vvbox" data-intro="Mini-map shows your position and orientation in a room. Navigate with WASD keys or drag here." data-position="top"> + <span class="el"></span> + </div> + --> </div> [[ } ]] |