diff options
Diffstat (limited to 'views/controls')
| -rw-r--r-- | views/controls/builder/info.ejs | 11 | ||||
| -rw-r--r-- | views/controls/editor/media-drawer.ejs | 30 | ||||
| -rw-r--r-- | views/controls/editor/presets.ejs | 4 | ||||
| -rw-r--r-- | views/controls/editor/settings.ejs | 11 | ||||
| -rw-r--r-- | views/controls/editor/toolbar.ejs | 6 | ||||
| -rw-r--r-- | views/controls/editor/wallpaper.ejs | 2 |
6 files changed, 45 insertions, 19 deletions
diff --git a/views/controls/builder/info.ejs b/views/controls/builder/info.ejs index 7ef0b6a..205938f 100644 --- a/views/controls/builder/info.ejs +++ b/views/controls/builder/info.ejs @@ -1,4 +1,11 @@ <div class="vvbox settings info" id="builderInfo"> + <h4>Map Editor</h4> + + <div class="no-selection"> + Click a room to select it, or click and drag to make a new room. + </div> + + <div class="setting number"> <label for="room-width">width</label> <input type="text" class="units" name="width" id="room-width"> @@ -32,4 +39,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/editor/media-drawer.ejs b/views/controls/editor/media-drawer.ejs index d800426..7996f84 100644 --- a/views/controls/editor/media-drawer.ejs +++ b/views/controls/editor/media-drawer.ejs @@ -1,28 +1,32 @@ -<span class="fileUpload"> - <input type="hidden" name="_csrf" value="[[- token ]]"> - <form> - <span class="ion-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 or image link" class="url"> -</span> - <div class="ants"> <div class="leftborder"></div> <img class="floatingImg"> </div> +<span class="close" id="fixed_close">X</span> + <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"></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> + + <span class="fileUpload"> + <input type="hidden" name="_csrf" value="[[- token ]]"> + <form> + <span class="ion-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 or image link" class="url"> + </span> <div class="foundMedia"> - </div> + <span class="container"></span> + </div> </div>
\ No newline at end of file diff --git a/views/controls/editor/presets.ejs b/views/controls/editor/presets.ejs index a41c527..70e48e3 100644 --- a/views/controls/editor/presets.ejs +++ b/views/controls/editor/presets.ejs @@ -1,4 +1,8 @@ <div class="vvbox" id="presets"> + <h4>Preset Colors</h4> + <div class="colors"> + </div> + <h4>Preset Styles</h4> <div class="presets"> <span data-preset="wireframe"> diff --git a/views/controls/editor/settings.ejs b/views/controls/editor/settings.ejs index 5b3b553..7c40a75 100644 --- a/views/controls/editor/settings.ejs +++ b/views/controls/editor/settings.ejs @@ -3,11 +3,14 @@ <input type="hidden" name="_csrf" value="[[- token ]]"> <input type="hidden" name="_id" value="new"> - <div class="setting"> - <a href="#" class="modalLink" id="startpoint"> + <div class="setting" id="startpoint"> + <a href="#" class="modalLink"> <span class="ion-ios7-navigate-outline"></span> - <span id="startText">Select Startpoint</span> - <span id="moveText">Move to Desired Point</span></a> + <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> + </a> + <a href="#" class="modalLink" id="goText"><span>(go there)</span></span> </div> <div class="setting"> <a href="#" class="modalLink" data-role='show-collaborators'> diff --git a/views/controls/editor/toolbar.ejs b/views/controls/editor/toolbar.ejs index 47d7c3c..57a98b9 100644 --- a/views/controls/editor/toolbar.ejs +++ b/views/controls/editor/toolbar.ejs @@ -1,10 +1,14 @@ <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="ion-ios7-photos-outline"></span> - <span + <span data-role='toggle-presets' data-info="preset styles" class="ion-ios7-briefcase-outline"></span> diff --git a/views/controls/editor/wallpaper.ejs b/views/controls/editor/wallpaper.ejs index ac025b5..5ca0390 100644 --- a/views/controls/editor/wallpaper.ejs +++ b/views/controls/editor/wallpaper.ejs @@ -14,7 +14,7 @@ <form> <span class="ion-ios7-upload-outline upload-icon"></span> - <label>Upload wallpaper</label> + <label>Upload Wallpaper</label> <input type="file" accept="image/*" class="file" multiple> </form> <!-- |