diff options
Diffstat (limited to 'views/controls')
| -rw-r--r-- | views/controls/blueprint/editor.ejs | 36 | ||||
| -rw-r--r-- | views/controls/blueprint/info.ejs | 30 | ||||
| -rw-r--r-- | views/controls/blueprint/notice.ejs | 4 | ||||
| -rw-r--r-- | views/controls/blueprint/scaler.ejs | 48 | ||||
| -rw-r--r-- | views/controls/blueprint/settings.ejs | 18 | ||||
| -rw-r--r-- | views/controls/blueprint/toolbar.ejs | 42 | ||||
| -rw-r--r-- | views/controls/builder/info.ejs | 4 | ||||
| -rw-r--r-- | views/controls/builder/settings.ejs | 2 | ||||
| -rw-r--r-- | views/controls/builder/toolbar.ejs | 6 | ||||
| -rw-r--r-- | views/controls/editor/media-drawer.ejs | 4 | ||||
| -rw-r--r-- | views/controls/editor/media-editor.ejs | 8 | ||||
| -rw-r--r-- | views/controls/editor/sculpture.ejs | 42 | ||||
| -rw-r--r-- | views/controls/editor/settings.ejs | 6 | ||||
| -rw-r--r-- | views/controls/editor/toolbar.ejs | 14 | ||||
| -rw-r--r-- | views/controls/editor/wallpaper.ejs | 2 | ||||
| -rw-r--r-- | views/controls/reader/about-room.ejs | 2 |
16 files changed, 243 insertions, 25 deletions
diff --git a/views/controls/blueprint/editor.ejs b/views/controls/blueprint/editor.ejs new file mode 100644 index 0000000..0dbac8e --- /dev/null +++ b/views/controls/blueprint/editor.ejs @@ -0,0 +1,36 @@ +<style type="text/css"> +#perspective, +#perspective .mx-scene { + position: absolute; + left:0%; + top:0px; + -webkit-transform: translateZ(0); + transform: translateZ(0); +} +#orthographic { + position: absolute; + left:50%; + top:0px +} +.blueprintInfo { + bottom: 14px; + left: 10px; + width: 270px; + font-size: 13px; + font-weight: 300; + padding: 10px; +} +.blueprintInfo .setting { + margin-bottom: 20px; +} +.blueprintInfo .setting.number input[type=text] { + width: 100px; + font-size: 16px; +} +</style> + +<div id="blueprintView"> + <div id="perspective"></div> + <div id="orthographic"></div> +</div> + diff --git a/views/controls/blueprint/info.ejs b/views/controls/blueprint/info.ejs new file mode 100644 index 0000000..a86481b --- /dev/null +++ b/views/controls/blueprint/info.ejs @@ -0,0 +1,30 @@ +<div class="vvbox settings info" id="blueprintInfo"> + <h4>Blueprint Editor</h4> + + <div class="setting number twoline"> + <label for="room-height">ceiling height</label> + <input type="text" class="units" name="height" id="room-height"> + </div> + + <div class="setting number twoline"> + <label for="viewHeight">camera height</label> + <input type="text" class="units" name="viewHeight" id="viewHeight"> + </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="ft">feet</option> + <option value="m">meters</option> + </select> + </div> + + <div class="setting number scale"> + <label>scale</label> + <span id="blueprintScaleDisplay"></span> + px/<span class="units"></span> + <span class="openScaler">[edit scale]</span> + </div> + +</div> diff --git a/views/controls/blueprint/notice.ejs b/views/controls/blueprint/notice.ejs new file mode 100644 index 0000000..bf1a310 --- /dev/null +++ b/views/controls/blueprint/notice.ejs @@ -0,0 +1,4 @@ +<div class="vvbox settings" id="blueprintNotice"> + <div class="notice"></div> + <span class="next">Next</span> +</div> diff --git a/views/controls/blueprint/scaler.ejs b/views/controls/blueprint/scaler.ejs new file mode 100644 index 0000000..82fd2b2 --- /dev/null +++ b/views/controls/blueprint/scaler.ejs @@ -0,0 +1,48 @@ +<div class="mediaDrawer fixed animate active blueprintScaler"> + <div class="box"> + + <div class="blueprintUploader"> + <h2>Upload your Blueprint</h2> + <p> + Upload an image which you will trace to make a floor plan. + Images should be at least 1000x1000. + </p> + <input type="hidden" name="_csrf" value="[[- token ]]"> + <input type="text" class="url" placeholder="Enter an image URL or..."> + <div class="wallpaperUpload toolButton"> + <form> + <span class="ion-ios-upload-outline upload-icon"></span> + <label>Upload a File</label> + <input type="file" accept="image/*" multiple> + </form> + </div> + <div class="blueprints"> + <h5>Your uploaded blueprints</h5> + </div> + </div> + + <div class="blueprintInfo vvbox"> + Please tell us the scale of your blueprint. + Click two corners of a wall, and then enter how long the wall is. + <br><br> + You can also <span class="uploadNewBlueprint">upload another blueprint</span>. + <br><br> + + <form> + <div class="setting number"> + <label for="blueprint-dimensions">length</label> + <input type="text" class="units" name="blueprint-dimensions" id="blueprint-dimensions"> + <select id="blueprint-units" name="blueprint-units"> + <option value="ft">feet</option> + <option value="m">meters</option> + </select> + </div> + <button id="saveBlueprint">Save</button> + </form> + </div> + + <div id="blueprintMap"> + </div> + + </div> +</div>
\ No newline at end of file diff --git a/views/controls/blueprint/settings.ejs b/views/controls/blueprint/settings.ejs new file mode 100644 index 0000000..9c615ea --- /dev/null +++ b/views/controls/blueprint/settings.ejs @@ -0,0 +1,18 @@ +<div class="vvbox settings active" id="blueprintSettings"> + <input type="hidden" name="_csrf" value="[[- token ]]"> + <input type="hidden" name="_id" value="new"> + + <div class="setting"> + <input type="text" name="name" placeholder="Blueprint name"> + </div> + + <div class="setting"> + <button data-role="save-layout">Save</button> + </div> + + <div class="setting subButtons"> + <a href="#" data-role="clear-layout">Clear</a> + <a href="#" data-role="destroy-layout">Delete</a> + </div> + +</div> diff --git a/views/controls/blueprint/toolbar.ejs b/views/controls/blueprint/toolbar.ejs new file mode 100644 index 0000000..c499262 --- /dev/null +++ b/views/controls/blueprint/toolbar.ejs @@ -0,0 +1,42 @@ +<div class="edit menu vvbox" id="blueprintToolbar"> + + <span + data-role='upload-floorplan' + data-info="upload a new floorplan" + class="ion-ios-upload-outline"></span> + + <span + data-role='toggle-orbit-mode' + data-info="toggle 3D mode" + class="ion-ios-photos-outline"></span> + + <span + data-role="arrow-mode" + data-info="move endpoints" + class="ion-navigate mode"></span> + + <span + data-role="polyline-mode" + data-info="draw walls" + class="ion-ios-pulse mode"></span> + + <span + data-role="ortho-polyline-mode" + data-info="draw right-angled walls" + class="ion-ios-grid-view-outline mode"></span> + + <span + data-role="eraser-mode" + data-info="remove walls" + class="ion-scissors mode"></span> + + <span + data-role="start-position-mode" + data-info="set starting position" + class="ion-ios-home-outline mode"></span> + + <span + data-role='toggle-layout-settings' + data-info="save blueprint" + class="ion-ios-compose-outline"></span> +</div> diff --git a/views/controls/builder/info.ejs b/views/controls/builder/info.ejs index 8a0e0d5..11e995a 100644 --- a/views/controls/builder/info.ejs +++ b/views/controls/builder/info.ejs @@ -34,8 +34,8 @@ <label for="builder-units">units</label> <select id="builder-units" name="units"> <option value="px">pixels</option> - <option value="ft">foot</option> - <option value="m">meter</option> + <option value="ft">feet</option> + <option value="m">meters</option> </select> </div> diff --git a/views/controls/builder/settings.ejs b/views/controls/builder/settings.ejs index aae67d0..f7642ae 100644 --- a/views/controls/builder/settings.ejs +++ b/views/controls/builder/settings.ejs @@ -4,7 +4,7 @@ <div class="setting"> <a href="#" id="startpoint"> - <span class="ion-ios7-navigate-outline"></span> + <span class="ion-ios-navigate-outline"></span> <span id="startText">Select Startpoint</span> <span id="moveText">Move to Desired Point</span></a> </div> diff --git a/views/controls/builder/toolbar.ejs b/views/controls/builder/toolbar.ejs index 8b2e9b8..ad51f0e 100644 --- a/views/controls/builder/toolbar.ejs +++ b/views/controls/builder/toolbar.ejs @@ -2,7 +2,7 @@ <span data-role='toggle-map-view' data-info="toggle map view" - class="ion-ios7-photos-outline"></span> + class="ion-ios-photos-outline"></span> <!-- <span data-role='create-mode' @@ -20,7 +20,7 @@ <span data-role='destroy-mode' data-info="delete" - class="ion-ios7-trash-outline"></span> + class="ion-ios-trash-outline"></span> <!-- <span data-role='undo' @@ -30,5 +30,5 @@ <span data-role='toggle-layout-settings' data-info="save layout" - class="ion-ios7-compose-outline"></span> + class="ion-ios-compose-outline"></span> </div> diff --git a/views/controls/editor/media-drawer.ejs b/views/controls/editor/media-drawer.ejs index f9bce61..8070941 100644 --- a/views/controls/editor/media-drawer.ejs +++ b/views/controls/editor/media-drawer.ejs @@ -3,8 +3,6 @@ <img class="floatingImg"> </div> -<span class="close" id="fixed_close">X</span> - <div class="mediaDrawer fixed animate mediaViewer"> <h2> <a href="#" class="userToggle active">Your Media</a> @@ -35,7 +33,7 @@ <span class="fileUpload" id="fileUpload"> <input type="hidden" name="_csrf" value="[[- token ]]"> <form> - <span class="ion-ios7-upload-outline upload-icon"></span><br> + <span class="ion-ios-upload-outline upload-icon"></span><br> Upload File <input type="file" accept="image/*" multiple> </form> diff --git a/views/controls/editor/media-editor.ejs b/views/controls/editor/media-editor.ejs index 99746e8..225bdc8 100644 --- a/views/controls/editor/media-editor.ejs +++ b/views/controls/editor/media-editor.ejs @@ -13,8 +13,8 @@ <div class="video audio setting"> <span class="playButton" data-role="play-media"> - <span class="on ion-ios7-play-outline"></span> - <span class="off ion-ios7-pause-outline"></span> + <span class="on ion-ios-play-outline"></span> + <span class="off ion-ios-pause-outline"></span> </span> <!-- ion-volume-high @@ -49,8 +49,8 @@ <div class="setting number"> <select id="builder-units" name="units"> <option value="px">pixels</option> - <option value="ft">foot</option> - <option value="m">meter</option> + <option value="ft">feet</option> + <option value="m">meters</option> </select> </div> --> diff --git a/views/controls/editor/sculpture.ejs b/views/controls/editor/sculpture.ejs new file mode 100644 index 0000000..dfe917f --- /dev/null +++ b/views/controls/editor/sculpture.ejs @@ -0,0 +1,42 @@ +<div class="vvbox settings" id="sculptureEditor"> + <h4>3D Object</h4> + + <input type="hidden" name="_csrf" value="[[- token ]]"> + <input type="hidden" name="_id" value="new"> + + <div class="setting"> + <input type="text" name="name" placeholder="media title"> + </div> + + <div class="setting"> + <textarea name="description" placeholder="short description"></textarea> + </div> + + <div class="setting"> + <input type="checkbox" name="outline" value="1" id="sculpture-outline"> + <label for="sculpture-outline">Show outline?</label> + <input type="color" name="outlineColor" value="#000000"> + </div> + + <div class="setting"> + <input type="checkbox" name="billboard" value="1" id="sculpture-billboard"> + <label for="sculpture-billboard">Billboard?</label> + </div> + + <div class="setting number"> + <label for="sculpture-width">width</label> + <input type="text" class="units" name="width" id="sculpture-width"> + </div> + <div class="setting number"> + <label for="sculpture-height">height</label> + <input type="text" class="units" name="height" id="sculpture-height"> + </div> + <div class="setting number"> + <label for="sculpture-height">depth</label> + <input type="text" class="units" name="depth" id="sculpture-depth"> + </div> + <div class="setting"> + <a href="#" class="warn btn" data-role="destroy-sculpture">remove object</a> + </div> + +</div> diff --git a/views/controls/editor/settings.ejs b/views/controls/editor/settings.ejs index cd915c5..0ee00de 100644 --- a/views/controls/editor/settings.ejs +++ b/views/controls/editor/settings.ejs @@ -7,7 +7,7 @@ <div class="setting" id="startpoint"> <a href="#" class="modalLink"> - <span class="ion-ios7-navigate-outline"></span> + <span class="ion-ios-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">Set Startpoint</span> @@ -17,7 +17,7 @@ <div class="setting"> <a href="#" class="modalLink" data-role='show-collaborators'> - <span class="ion-ios7-plus-outline"></span> + <span class="ion-ios-plus-outline"></span> Add Collaborators </a> </div> @@ -29,7 +29,7 @@ </a> <a href="#" class="modalLink" data-role='view-project' style="margin-left: 40px;"> - <span class="ion-ios7-search-strong"></span> + <span class="ion-ios-search-strong"></span> View project </a> diff --git a/views/controls/editor/toolbar.ejs b/views/controls/editor/toolbar.ejs index 6960cbc..1a3e2d7 100644 --- a/views/controls/editor/toolbar.ejs +++ b/views/controls/editor/toolbar.ejs @@ -9,11 +9,11 @@ <span data-role='open-media-viewer' data-info="add media" - class="ion-ios7-photos-outline"></span> + class="ion-ios-photos-outline"></span> <span data-role='toggle-presets' data-info="preset styles" - class="ion-ios7-briefcase-outline"></span> + class="ion-ios-briefcase-outline"></span> <!-- <span data-role='resize-media' @@ -22,25 +22,25 @@ <span data-role='destroy-media' data-info="delete media" - class="ion-ios7-trash-outline"></span> + class="ion-ios-trash-outline"></span> --> <span data-role='toggle-wallpaper-panel' data-info="add wallpaper" - class="ion-ios7-keypad-outline"></span> + class="ion-ios-keypad-outline"></span> <span data-role='toggle-color-control' data-info="edit room colors" - class="ion-ios7-sunny-outline"></span> + class="ion-ios-sunny-outline"></span> <span data-role='toggle-text-editor' data-info="add text to wall" - class="ion-ios7-compose-outline"></span> + class="ion-ios-compose-outline"></span> <!-- <span data-role='toggle-map-view' data-info="toggle map view" - class="ion-ios7-world-outline"></span> + class="ion-ios-world-outline"></span> --> <span data-role='toggle-project-settings' diff --git a/views/controls/editor/wallpaper.ejs b/views/controls/editor/wallpaper.ejs index 3168f1c..a53f462 100644 --- a/views/controls/editor/wallpaper.ejs +++ b/views/controls/editor/wallpaper.ejs @@ -19,7 +19,7 @@ <div class="wallpaperUpload toolButton"> <form> - <span class="ion-ios7-upload-outline upload-icon"></span> + <span class="ion-ios-upload-outline upload-icon"></span> <label>Upload</label> <input type="file" accept="image/*" multiple> </form> diff --git a/views/controls/reader/about-room.ejs b/views/controls/reader/about-room.ejs index 974fe0f..a9ef738 100644 --- a/views/controls/reader/about-room.ejs +++ b/views/controls/reader/about-room.ejs @@ -5,7 +5,7 @@ [[ if (authorpic) { ]] <a href="[[- authorlink ]]" class="authorName"><div class="profilePic" style="background-image:url([[- authorpic ]])"></div></a> [[ } else { ]] - <a href="[[- authorlink ]]" class="authorName"><span class="ion-ios7-person-outline"></span></a> + <a href="[[- authorlink ]]" class="authorName"><span class="ion-ios-person-outline"></span></a> [[ } ]] <a href="[[- authorlink ]]" class="authorName">[[- author ]]</a> </h1> |
