diff options
Diffstat (limited to 'views/controls')
25 files changed, 586 insertions, 205 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..ba795e3 --- /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 d92d34c..11e995a 100644 --- a/views/controls/builder/info.ejs +++ b/views/controls/builder/info.ejs @@ -1,4 +1,14 @@ -<div class="vvbox active settings info active" id="builderInfo"> +<div class="vvbox settings info" id="builderInfo"> + <h4>Map Editor</h4> + + <div class="no-selection"> + Click and drag to make a new room. + Click a room to select, move or resize it. + <br><br> + Press ESC to toggle the map. + </div> + + <div class="setting number"> <label for="room-width">width</label> <input type="text" class="units" name="width" id="room-width"> @@ -10,6 +20,8 @@ <div class="setting number twoline"> <label for="room-height">ceiling height</label> <input type="text" class="units" name="height" id="room-height"> + <label for="room-height-global" id="room-height-global-label">global?</label> + <input type="checkbox" name="heightGlobal" id="room-height-global"> </div> <div class="setting number halflines"> <label for="room-x">x</label> @@ -22,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> @@ -32,4 +44,8 @@ <input type="text" class="units" name="viewHeight" id="viewHeight"> </div> + <div class="setting"> + <a href="#" class="warn btn" data-role="destroy-room">remove this room</a> + </div> + </div> diff --git a/views/controls/builder/settings.ejs b/views/controls/builder/settings.ejs index dd2496b..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="icon-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 a00249c..ad51f0e 100644 --- a/views/controls/builder/toolbar.ejs +++ b/views/controls/builder/toolbar.ejs @@ -2,33 +2,33 @@ <span data-role='toggle-map-view' data-info="toggle map view" - class="icon-ios7-photos-outline"></span> + class="ion-ios-photos-outline"></span> <!-- <span data-role='create-mode' data-info="draw" - class="icon-plus"></span> + class="ion-plus"></span> <span data-role='move-mode' data-info="move" - class="icon-arrow-move"></span> + class="ion-arrow-move"></span> <span data-role='resize-mode' data-info="resize" - class="icon-arrow-resize"></span> + class="ion-arrow-resize"></span> --> <span data-role='destroy-mode' data-info="delete" - class="icon-ios7-trash-outline"></span> + class="ion-ios-trash-outline"></span> <!-- <span data-role='undo' data-info="undo" - class="icon-reply"></span> + class="ion-reply"></span> --> <span data-role='toggle-layout-settings' data-info="save layout" - class="icon-ios7-compose-outline"></span> + class="ion-ios-compose-outline"></span> </div> diff --git a/views/controls/editor/collaborators.ejs b/views/controls/editor/collaborators.ejs index 69e5b64..5de7d25 100644 --- a/views/controls/editor/collaborators.ejs +++ b/views/controls/editor/collaborators.ejs @@ -1,29 +1,31 @@ <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> + <div class="rap"> + <div class="holder"> + <div class="inner vvbox"> + <h2>Collaborators</h2> - <form> - <input type="text" id="collaborator-email" name="email"> - <input type="submit" id="collaborator-invite" value="Invite to this project"> - </form> + <p> + To invite others to contribute to this project, submit their email address below. They'll receive an email with instructions to join this project and register if they're not a VValls user yet. + </p> - <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> + <form> + <input type="text" id="collaborator-email" name="email"> + <input type="submit" id="collaborator-invite" value="Invite to this project"> + </form> - <ul id="collaborator-list"> - </ul> + <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> </div> - </div> <script type="text/html" id="collaborator-template"> @@ -36,26 +38,3 @@ <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/color-control.ejs b/views/controls/editor/color-control.ejs new file mode 100644 index 0000000..c035e24 --- /dev/null +++ b/views/controls/editor/color-control.ejs @@ -0,0 +1,27 @@ +<div class="vvbox colorcontrol"> + <h4>Edit Room Colors</h4> + + <div class="colors"> + </div> + + <div class="color-picker"> + </div> + + <div class="slider"> + </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> + </span> + <span> + <div class="swatch" id="outline-color" data-mode="outline"></div><label>outlines</label> + </span> + </div> +</div> diff --git a/views/controls/editor/light-control.ejs b/views/controls/editor/light-control.ejs deleted file mode 100644 index 8b133a5..0000000 --- a/views/controls/editor/light-control.ejs +++ /dev/null @@ -1,40 +0,0 @@ -<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" /> - </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> - </span> - <span> - <div class="swatch" id="outline-color" data-mode="outline"></div><label>outlines</label> - </span> - <span> - </div> - -<!-- - <div class="slider"> - <input type="range" min="0" max="100" value="100" id="wall-hue" /> - <h4>Wall Hue</h4> - </div> - <div class="slider"> - <input type="range" min="0" max="100" value="0" id="brightness-control" /> - <h4>Brightness</h4> - </div> - <div class="slider"> - <input type="range" min="0" max="100" value="0" id="shadow-control" /> - <h4>Shadow</h4> - </div> ---> -</div> diff --git a/views/controls/editor/media-drawer.ejs b/views/controls/editor/media-drawer.ejs index d73a3ef..8070941 100644 --- a/views/controls/editor/media-drawer.ejs +++ b/views/controls/editor/media-drawer.ejs @@ -1,62 +1,54 @@ -<span class="fileUpload"> - <input type="hidden" name="_csrf" value="[[- token ]]"> - <form> - <span class="icon-ios7-upload-outline upload-icon"></span><br> - Upload File - <input type="file" accept="image/*" class="file" multiple> - </form> - <small>~ or ~</small><br> - <input type="text" placeholder="Enter Vimeo or YouTube Link" class="url"> -</span> - <div class="ants"> <div class="leftborder"></div> <img class="floatingImg"> </div> <div class="mediaDrawer fixed animate mediaViewer"> - <span class="close">X</span> - <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> + <h2> + <a href="#" class="userToggle active">Your Media</a> + – <a href="#" class="foundToggle">Found Media</a> +<!-- + – <a href="#" class="wallpaperToggle">Wallpaper</a> + --> + </h2><br> + <h3 class="editBtn warn" id="deleteMedia"></h3> + <h3 class="editBtn" id="randomize">Click here<br>to automatically place<br>images on walls!</h3> + <div class="myMedia"> + <div class="noMedia">You have no media yet. Upload some!</div> + <span class="container"></span> + <a href="#" class="viewMore btn">view more</a> </div> - + <div class="foundMedia"> - <span class="mediaContainer"> - <img src="https://d1ycxz9plii3tb.cloudfront.net/post_images/52ec0e20c9dc24f1d8000067/large.jpg"> - </span> - <span class="mediaContainer"> - <img src="https://d1ycxz9plii3tb.cloudfront.net/additional_images/4e6bf67bc23f490001004579/1/tall.jpg"> - </span> - <span class="mediaContainer"> - <img src="https://d1ycxz9plii3tb.cloudfront.net/additional_images/52dcca28139b2135030002a8/tall.jpg"> - </span> - <span class="mediaContainer"> - <img src="https://d1ycxz9plii3tb.cloudfront.net/additional_images/52927bb2b202a3669d000704/larger.jpg"> - </span> - <span class="mediaContainer"> - <img src="https://d1ycxz9plii3tb.cloudfront.net/additional_images/4f9f3a3ce262e60001000fb3/large.jpg"> - </span> - <span class="mediaContainer"> - <img src="http://2.bp.blogspot.com/-GD6IxUvsdOo/UdrcMFLVYNI/AAAAAAAAF2E/kbRfxMxiUlQ/s1600/okeeffe.jpg"> - </span> - <span class="mediaContainer"> - <img src="http://www.bobkessel.com/wordpress/wp-content/uploads/2009/10/moma-bob-kessel-410.jpg"> - </span> - <span class="mediaContainer"> - <img src="http://static1.artsy.net/partner_show_images/52f28f348b3b81f2fc000364/large.jpg"> - </span> - <span class="mediaContainer"> - <img src="http://static3.artsy.net/partner_show_images/52e83674c9dc24397f0000d8/large.jpg"> - </span> - <span class="mediaContainer"> - <img src="http://static0.artsy.net/partner_show_images/52d96d484b84801ef0000273/large.jpg"> - </span> - <span class="mediaContainer"> - <img src="http://static1.artsy.net/partner_show_images/52778616275b24f95c00011d/1/large.jpg"> - </span> - <span class="mediaContainer"> - <img src="http://static1.artsy.net/partner_show_images/52dc65311a1e86be6b000205/large.jpg"> - </span> - </div> -</div>
\ No newline at end of file + <span class="container"></span> + </div> + + <div class="wallpaperMedia"> + <span class="container"></span> + </div> + +</div> + +<span class="fileUpload" id="fileUpload"> + <input type="hidden" name="_csrf" value="[[- token ]]"> + <form> + <span class="ion-ios-upload-outline upload-icon"></span><br> + Upload File + <input type="file" accept="image/*" multiple> + </form> + <small>~ or ~</small><br> + <input type="text" placeholder="Enter Vimeo or YouTube or image link" class="url"> +</span> + +<span class="fileUpload" id="tumblrUpload"> + <input type="hidden" name="_csrf" value="[[- token ]]"> + <input type="text" class="url" placeholder="Enter a Tumblr URL to add images from it!"> + <br> + <span class="exampleTumblrs"> + or try one of these: + <a href="#" class="exampleTumblr">risingtensions</a> + <a href="#" class="exampleTumblr">fixoid</a> + <a href="#" class="exampleTumblr">nopattern</a> + </span> +</span> diff --git a/views/controls/editor/media-editor.ejs b/views/controls/editor/media-editor.ejs index 000e8db..225bdc8 100644 --- a/views/controls/editor/media-editor.ejs +++ b/views/controls/editor/media-editor.ejs @@ -1,4 +1,5 @@ <div class="vvbox settings" id="mediaEditor"> + <h4>Media Settings</h4> <input type="hidden" name="_csrf" value="[[- token ]]"> <input type="hidden" name="_id" value="new"> @@ -10,25 +11,27 @@ <textarea name="description" placeholder="short description"></textarea> </div> - <div class="video setting"> + <div class="video audio setting"> <span class="playButton" data-role="play-media"> - <span class="on icon-play"></span> - <span class="off icon-pause"></span> + <span class="on ion-ios-play-outline"></span> + <span class="off ion-ios-pause-outline"></span> </span> <!-- ion-volume-high ion-volume-mute --> </div> - <div class="video setting"> + <div class="video audio setting"> <input type="checkbox" name="autoplay" value="1" id="video_autoplay"> <label for="video_autoplay">Autoplay</label> <input type="checkbox" name="loop" value="1" id="video_loop"> <label for="video_loop">Loop</label> + <span class="video"> <input type="checkbox" name="mute" value="1" id="video_mute"> <label for="video_mute">Mute</label> + </span> </div> - <div class="video setting"> + <div class="video audio setting"> <label for="video-keyframe">Initial Still</label> <br> <input type="range" min="0" max="1" value="0" step="0.01" name="keyframe" id="video-keyframe"> @@ -42,15 +45,16 @@ <label for="scenery-height">height</label> <input type="text" class="units" name="height" id="scenery-height"> </div> + <!-- <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> - + --> <div class="setting"> - <a href="#" class="warn btn" data-role="destroy-media">delete this media</a> + <a href="#" class="warn btn" data-role="destroy-media">remove from wall</a> </div> </div> diff --git a/views/controls/editor/presets.ejs b/views/controls/editor/presets.ejs new file mode 100644 index 0000000..04b1cf1 --- /dev/null +++ b/views/controls/editor/presets.ejs @@ -0,0 +1,5 @@ +<div class="vvbox" id="presets"> + <h4>Preset Styles</h4> + <div class="presets"> + </div> +</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 ed587fa..0ee00de 100644 --- a/views/controls/editor/settings.ejs +++ b/views/controls/editor/settings.ejs @@ -1,20 +1,40 @@ +<span id="helpCursor"></span> + <div class="vvbox settings" id="editorSettings"> + <h4>Room Settings</h4> <input type="hidden" name="_csrf" value="[[- token ]]"> <input type="hidden" name="_id" value="new"> - <div class="setting"> - <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 class="setting" id="startpoint"> + <a href="#" class="modalLink"> + <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> + </a> + <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="icon-ios7-plus-outline"></span> + <span class="ion-ios-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> + + <a href="#" class="modalLink" data-role='view-project' style="margin-left: 40px;"> + <span class="ion-ios-search-strong"></span> + View project + </a> + </div> + <div class="setting"> <input type="text" name="name" placeholder="room name"> </div> diff --git a/views/controls/editor/share.ejs b/views/controls/editor/share.ejs new file mode 100644 index 0000000..7e7ad3c --- /dev/null +++ b/views/controls/editor/share.ejs @@ -0,0 +1,16 @@ +<div class="vvbox settings share"> + <h4>Project Saved</h4> + + <div class="setting"> + <h2>Share on–</h2> + <a id="share_facebook">Facebook</a> + <a id="share_twitter">Twitter</a> + <a id="share_embed">Embed</a> + </div> + + <div class="setting"> + Send people this link: + <input type="text" id="share_link"> + </div> + +</div> diff --git a/views/controls/editor/signed-out.ejs b/views/controls/editor/signed-out.ejs index 20e3715..118fb7c 100644 --- a/views/controls/editor/signed-out.ejs +++ b/views/controls/editor/signed-out.ejs @@ -8,7 +8,7 @@ </div> <div class="share"> - <h2>Share this on–</h2> + <h2>Share on–</h2> <a href="#">Facebook</a> <a href="#">Twitter</a> </div> diff --git a/views/controls/editor/text-editor.ejs b/views/controls/editor/text-editor.ejs new file mode 100644 index 0000000..baf9239 --- /dev/null +++ b/views/controls/editor/text-editor.ejs @@ -0,0 +1,76 @@ +<div class="vvbox settings" id="textEditor"> + <h4>Edit Text</h4> + + <div class="no-text"> + Click a wall to add text. + </div> + + <div class="setting text-setting"> + <select name="font-family"> + <option>Baskerville</option> + <option>Brush Script</option> + <option>Chicago</option> + <option>Comic Sans</option> + <option>Cooper</option> + <option>Courier New</option> + <option>Didot</option> + <option>Futura</option> + <option>Georgia</option> + <option>Gill Sans</option> + <option>Helvetica</option> + <option>Lato</option> + <option>Lucida Grande</option> + <option>Menlo</option> + <option>Palatino</option> + <option>Papyrus</option> + <option>Tahoma</option> + <option>Times New Roman</option> + <option>Zapfino</option> + </select> + <select name="font-size"> + <option value="6">6pt</option> + <option value="8">8pt</option> + <option value="9">9pt</option> + <option value="10">10pt</option> + <option value="12">12pt</option> + <option value="16">16pt</option> + <option value="24">24pt</option> + <option value="36">36pt</option> + <option value="48">48pt</option> + <option value="72">72pt</option> + <option value="96">96pt</option> + </select> + <select name="text-align"> + <option value="left">Left</option> + <option value="center">Center</option> + <option value="right">Right</option> + <option value="justify">Justify</option> + </select> + <div class="swatch"></div> + </div> + + <div class="setting text-setting"> + <textarea name="text-body"></textarea> + </div> + + <div class="setting text-setting"> + <a href="#" class="btn left" data-role="hide-text-editor">done</a> + <a href="#" class="warn btn right" data-role="destroy-text">remove from wall</a> + </div> + + <div class="setting color-setting"> + <a href="#" class="btn" data-role="hide-color-picker">done</a><br><br> + + <div class="colors"> + </div> + + <div class="color-picker"> + </div> + + <div class="slider"> + </div> + </div> +</div> + +<style> +</style>
\ No newline at end of file diff --git a/views/controls/editor/toolbar.ejs b/views/controls/editor/toolbar.ejs index 4abf780..1a3e2d7 100644 --- a/views/controls/editor/toolbar.ejs +++ b/views/controls/editor/toolbar.ejs @@ -1,30 +1,49 @@ -<div class="edit menu vvbox" id="editorToolbar"> + +<div class="edit menu vvbox" id="editorToolbar" data-intro="This is the main toolbar. Add and select media, Apply wallpaper, change room name etc." data-position="left"> +<!-- + <span + data-role='undo' + data-info="undo" + class="ion-reply"></span> + --> <span data-role='open-media-viewer' data-info="add media" - class="icon-ios7-photos-outline"></span> + class="ion-ios-photos-outline"></span> + <span + data-role='toggle-presets' + data-info="preset styles" + class="ion-ios-briefcase-outline"></span> +<!-- <span data-role='resize-media' data-info="resize media" - class="icon-arrow-resize"></span> + class="ion-arrow-resize"></span> <span data-role='destroy-media' data-info="delete media" - class="icon-ios7-trash-outline"></span> + class="ion-ios-trash-outline"></span> + --> <span data-role='toggle-wallpaper-panel' data-info="add wallpaper" - class="icon-ios7-keypad-outline"></span> + class="ion-ios-keypad-outline"></span> <span - data-role='toggle-light-control' + data-role='toggle-color-control' data-info="edit room colors" - class="icon-ios7-sunny-outline"></span> + class="ion-ios-sunny-outline"></span> + <span + data-role='toggle-text-editor' + data-info="add text to wall" + class="ion-ios-compose-outline"></span> +<!-- <span - data-role='edit-wall-text' - data-info="edit wall text" - class="icon-ios7-compose-outline"></span> + data-role='toggle-map-view' + data-info="toggle map view" + class="ion-ios-world-outline"></span> + --> <span data-role='toggle-project-settings' data-info="room settings" - class="icon-key"></span> + class="ion-key"></span> </div> diff --git a/views/controls/editor/wallpaper.ejs b/views/controls/editor/wallpaper.ejs index 208dfff..a53f462 100644 --- a/views/controls/editor/wallpaper.ejs +++ b/views/controls/editor/wallpaper.ejs @@ -1,25 +1,39 @@ <div class="vvbox wallpaper"> - + <h4>Add Wallpaper</h4> <!-- IF NO WALL PAPER --> - <span class="txt">Add custom wallpaper to walls. Begin by uploading a pattern. Or try this one -> </span> + <span class="txt" style="margin-bottom:7px">Add custom wallpaper to walls. Begin by uploading a pattern. Or try one of these -> </span> - <div class="swatches"></div> + <span class="swatches"> + <span class="swatch" style="background-image:url(/assets/img/offbeatrepeat.jpg)"></span> + <span class="swatch" style="background-image:url(/assets/img/plainpattern3.png)"></span> + <span class="swatch" style="background-image:url(/assets/img/plainpattern.png)"></span> + <span class="swatch" style="background-image:url(/assets/img/plainpattern2.png)"></span> + </span> + + <input type="text" class="url" placeholder="Enter image URL"> - <div class="wallpaperUpload"> - <form> + <div class="wallpaperRemove toolButton"> + <span class="ion-scissors"></span> + <label>Remove</label> + </div> - <span class="icon-ios7-upload-outline upload-icon"></span> - <label>Upload wallpaper</label> - <input type="file" accept="image/*" class="file" multiple> + <div class="wallpaperUpload toolButton"> + <form> + <span class="ion-ios-upload-outline upload-icon"></span> + <label>Upload</label> + <input type="file" accept="image/*" multiple> </form> -<!-- - <input type="text" placeholder="Enter Image URL" class="url"> - --> </div> - <div class="wallpaperRemove"> - <img src="/assets/img/scissors.png"> - <label>Remove Wallpaper</label> + + <div class="wallpaperResizeControls"> + <span data-role="wallpaper-position" class="ion-arrow-expand"></span> + <input data-role="wallpaper-scale" type="range" min="-4" max="4" step="0.01" value="0.0"> + </div> + + <div class="floodMessage"> + Hit Enter to Flood the room! </div> + </div> <div class="floatingSwatch"></div> diff --git a/views/controls/reader/about-room.ejs b/views/controls/reader/about-room.ejs index e13f363..a9ef738 100644 --- a/views/controls/reader/about-room.ejs +++ b/views/controls/reader/about-room.ejs @@ -1,21 +1,28 @@ <div class="aboutRoom vvbox"> <h1> - [[- name ]], - <a href="[[- authorlink ]]">[[- author ]]</a> + <span class="roomName">[[- name ]]</span> + <br> + [[ 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-ios-person-outline"></span></a> + [[ } ]] + <a href="[[- authorlink ]]" class="authorName">[[- author ]]</a> </h1> [[ if (description) { ]] - <span class="txt">[[- description ]]</span> + <span class="txt description">[[- description ]]</span> [[ } ]] - <h2> - Last modified [[- date ]] + + <span class="txt">Last modified [[- date ]]</span> + + <div class="share"> + <h2>Share on–</h2> + <a id="share_facebook">Facebook</a> + <a id="share_twitter">Twitter</a> + <a id="share_embed">Embed</a> + </div> + [[ if (canEdit) { ]] - <a href="[[- editlink ]]" class="btn warn marg">Edit Room</a> + <a href="[[- editlink ]]" class="btn warn marg" id="edit-room-link">Edit Room</a> [[ } ]] - </h2> -</div> - -<div class="share"> - <h2>Share this on–</h2> - <a href="#">Facebook</a> - <a href="#">Twitter</a> </div> diff --git a/views/controls/reader/embed.ejs b/views/controls/reader/embed.ejs new file mode 100644 index 0000000..814644d --- /dev/null +++ b/views/controls/reader/embed.ejs @@ -0,0 +1,26 @@ +<div class="embedView fixed mediaDrawer animate"> + <span class="close">X</span> + + <div class="rap"> + <div class="holder"> + <div class="inner vvbox"> + <h2>Embed VValls</h2> + + <p> + This code generates an iframe which will embed this room in your website or blog. + </p> + <textarea id="embedCode"></textarea> + + dimensions: <input type="text" name="width">x<input type="text" name="height"> + <input type="checkbox" name="mute" id="mute" checked><label for="mute">mute</label> + <input type="checkbox" name="interactive" id="interactive" checked><label for="interactive">interactive</label> +<!-- + <input type="checkbox" id=""> <label for=""></label> + <input type="checkbox" id=""> <label for=""></label> + <input type="checkbox" id=""> <label for=""></label> + --> + <span id="testEmbed">test</span> + </div> + </div> + </div> +</div> diff --git a/views/controls/reader/media-player.ejs b/views/controls/reader/media-player.ejs index ca03ec8..cac9992 100644 --- a/views/controls/reader/media-player.ejs +++ b/views/controls/reader/media-player.ejs @@ -1,19 +1,19 @@ <div class="vvbox settings" id="mediaPlayer"> - <span class="playButton video" data-role="play-media"> - <span class="on icon-play"></span> - <span class="off icon-pause"></span> + <span class="playButton video audio" data-role="play-media"> + <span class="on ion-play"></span> + <span class="off ion-pause"></span> </span> <span class="muteButton video" data-role="mute-media"> - <span class="on icon-volume-high"></span> - <span class="off icon-volume-mute"></span> + <span class="on ion-volume-high"></span> + <span class="off ion-volume-mute"></span> </span> <span class="name"></span> <div class="author"></div> - <div class="description"></div> + <div class="txt description"></div> <div class="dimensions"></div> </div> |