diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-07-16 15:29:10 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-07-16 15:29:10 -0400 |
| commit | e17d458b644fddccd522d0475f531b487c4d95ef (patch) | |
| tree | 7e9e1fdd8913093ca2b2d8f73ea8290c6b8105d3 /views | |
| parent | 5a5dc68dd2f9ae198864d7f25b4c9840dbe14d77 (diff) | |
some bugfixes.. info window for builder
Diffstat (limited to 'views')
| -rw-r--r-- | views/builder.ejs | 3 | ||||
| -rw-r--r-- | views/controls/builder/info.ejs | 35 | ||||
| -rw-r--r-- | views/controls/editor/media-editor.ejs | 4 | ||||
| -rw-r--r-- | views/partials/sign-in.ejs | 4 | ||||
| -rw-r--r-- | views/projects/layouts-modal.ejs | 8 | ||||
| -rw-r--r-- | views/projects/list-projects.ejs | 2 |
6 files changed, 50 insertions, 6 deletions
diff --git a/views/builder.ejs b/views/builder.ejs index 61e84c3..afb8c66 100644 --- a/views/builder.ejs +++ b/views/builder.ejs @@ -12,6 +12,7 @@ [[ include partials/header ]] <div id="builderView"> + [[ include controls/builder/info ]] [[ include controls/builder/toolbar ]] [[ include controls/builder/settings ]] </div> @@ -20,7 +21,6 @@ <div id="minimap" class="vvbox"> <span class="el"></span> </div> - --> <select id="palette"> <option>colors</option> @@ -31,6 +31,7 @@ <option>white</option> <option>black</option> </select> + --> <div id="hud"> <div id="map" style="display: block"> diff --git a/views/controls/builder/info.ejs b/views/controls/builder/info.ejs new file mode 100644 index 0000000..af0a76d --- /dev/null +++ b/views/controls/builder/info.ejs @@ -0,0 +1,35 @@ +<div class="vvbox active settings info active" id="builderInfo"> + <div class="setting number"> + <label for="room-width">width</label> + <input type="text" name="width" id="room-width"> + </div> + <div class="setting number"> + <label for="room-depth">depth</label> + <input type="text" name="depth" id="room-depth"> + </div> + <div class="setting number twoline"> + <label for="room-height">ceiling height</label> + <input type="text" name="height" id="room-height"> + </div> + + <div class="setting number twoline"> + <label for="builder-units">units</label> + <select id="builder-units" name="units"> + <option value="px">pixels</option> + <option value="foot">foot</option> + <option value="meter">meter</option> + </select> + </div> + + <div class="setting number"> + <label for="builder-resolution">px/<span class="unitName"></span></label> + <input type="text" name="resolution" id="builder-resolution"> + </div> + + <div class="setting number twoline"> + <label for="camera-height">camera height</label> + <input type="text" name="camera-height" id="camera-height"> + <span class="unitName"></span> + </div> + +</div> diff --git a/views/controls/editor/media-editor.ejs b/views/controls/editor/media-editor.ejs index 65db3ce..5db1fb2 100644 --- a/views/controls/editor/media-editor.ejs +++ b/views/controls/editor/media-editor.ejs @@ -29,9 +29,9 @@ <label for="video_mute">Mute</label> </div> <div class="video setting"> - Initial Still + <label for="video-keyframe">Initial Still</label> <br> - <input type="range" min="0" max="1" value="0" step="0.01" name="keyframe"> + <input type="range" min="0" max="1" value="0" step="0.01" name="keyframe" id="video-keyframe"> </div> <div class="image setting"> diff --git a/views/partials/sign-in.ejs b/views/partials/sign-in.ejs index 3f05fff..8268b2a 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="info">– or the ol' fashion way –</b> + <b class="signin-tagline">– or the ol' fashion way –</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="info">– or the ol' fashion way –</b> + <b class="signin-tagline">– or the ol' fashion way –</b> <li> <label class="description" for="usernameInput">Username:</label> <div> diff --git a/views/projects/layouts-modal.ejs b/views/projects/layouts-modal.ejs index 75b2641..97f1e61 100644 --- a/views/projects/layouts-modal.ejs +++ b/views/projects/layouts-modal.ejs @@ -5,6 +5,9 @@ <div class="templates"> <h1>Edit Room Layouts</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 data-role="create-new-layout" class="button_text" type="submit" value="New Layout"> </form> @@ -18,6 +21,8 @@ <div class="templates"> <h1>Your Projects</h1> </div> + <div class="no-templates"> + </div> <form> <input class="button_text" type="submit" value="New Project"> </form> @@ -31,6 +36,9 @@ <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> diff --git a/views/projects/list-projects.ejs b/views/projects/list-projects.ejs index 42387ba..2c12af0 100644 --- a/views/projects/list-projects.ejs +++ b/views/projects/list-projects.ejs @@ -6,7 +6,7 @@ [[ projects.forEach(function(project, i) { ]] <td class="border room1"> - <iframe src="/project/[[- project.slug ]]/view?noui=1" class="embed"></iframe> + <iframe src="/project/[[- project.slug ]]/view?noui=1&mute=1" class="embed"></iframe> [[ if (profile._id == project.user_id) { ]] <div class="editBtn">edit</div> [[ } ]] |
