diff options
Diffstat (limited to 'views/controls')
| -rw-r--r-- | views/controls/builder/info.ejs | 5 | ||||
| -rw-r--r-- | views/controls/editor/color-control.ejs (renamed from views/controls/editor/light-control.ejs) | 8 | ||||
| -rw-r--r-- | views/controls/editor/media-drawer.ejs | 13 | ||||
| -rw-r--r-- | views/controls/editor/presets.ejs | 17 | ||||
| -rw-r--r-- | views/controls/editor/settings.ejs | 2 | ||||
| -rw-r--r-- | views/controls/editor/toolbar.ejs | 15 | ||||
| -rw-r--r-- | views/controls/editor/wallpaper.ejs | 4 |
7 files changed, 37 insertions, 27 deletions
diff --git a/views/controls/builder/info.ejs b/views/controls/builder/info.ejs index 205938f..2762207 100644 --- a/views/controls/builder/info.ejs +++ b/views/controls/builder/info.ejs @@ -2,7 +2,10 @@ <h4>Map Editor</h4> <div class="no-selection"> - Click a room to select it, or click and drag to make a new room. + 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> diff --git a/views/controls/editor/light-control.ejs b/views/controls/editor/color-control.ejs index 8b20464..040808e 100644 --- a/views/controls/editor/light-control.ejs +++ b/views/controls/editor/color-control.ejs @@ -1,6 +1,10 @@ -<div class="vvbox lightcontrol"> +<div class="vvbox colorcontrol"> <h4>Edit Room Colors</h4> - <div id="color-picker"> + + <div class="colors"> + </div> + + <div id="color-picker" style="display: none"> </div> <div class="slider"> diff --git a/views/controls/editor/media-drawer.ejs b/views/controls/editor/media-drawer.ejs index 7996f84..d1e2c99 100644 --- a/views/controls/editor/media-drawer.ejs +++ b/views/controls/editor/media-drawer.ejs @@ -6,7 +6,13 @@ <span class="close" id="fixed_close">X</span> <div class="mediaDrawer fixed animate mediaViewer"> - <h2><a href="#" class="userToggle active">Your Media</a> – <a href="#" class="foundToggle">Found Media</a></h2><br> + <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> <div class="myMedia"> @@ -29,4 +35,9 @@ <div class="foundMedia"> <span class="container"></span> </div> + + <div class="wallpaperMedia"> + <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 70e48e3..02e9d42 100644 --- a/views/controls/editor/presets.ejs +++ b/views/controls/editor/presets.ejs @@ -1,21 +1,6 @@ <div class="vvbox" id="presets"> - <h4>Preset Colors</h4> - <div class="colors"> - </div> - <h4>Preset Styles</h4> <div class="presets"> - <span data-preset="wireframe"> - Wireframe - </span> - <span data-preset="shaded"> - Shaded - </span> - <span data-preset="inverse"> - Inverse - </span> - <span data-preset="pfunk"> - P.Funk - </span> </div> + <input type="text" class="url" placeholder="enter a url"> </div> diff --git a/views/controls/editor/settings.ejs b/views/controls/editor/settings.ejs index 7c40a75..8443abb 100644 --- a/views/controls/editor/settings.ejs +++ b/views/controls/editor/settings.ejs @@ -1,3 +1,5 @@ +<span id="helpCursor"></span> + <div class="vvbox settings" id="editorSettings"> <h4>Room Settings</h4> <input type="hidden" name="_csrf" value="[[- token ]]"> diff --git a/views/controls/editor/toolbar.ejs b/views/controls/editor/toolbar.ejs index 8ea21d5..7b08db6 100644 --- a/views/controls/editor/toolbar.ejs +++ b/views/controls/editor/toolbar.ejs @@ -1,6 +1,11 @@ <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" @@ -11,10 +16,6 @@ class="ion-ios7-briefcase-outline"></span> <!-- <span - data-role='undo' - data-info="undo" - class="ion-reply"></span> - <span data-role='resize-media' data-info="resize media" class="ion-arrow-resize"></span> @@ -28,9 +29,10 @@ data-info="add wallpaper" class="ion-ios7-keypad-outline"></span> <span - data-role='toggle-light-control' + data-role='toggle-color-control' data-info="edit room colors" class="ion-ios7-sunny-outline"></span> +<!-- <span data-role='toggle-text-editor' data-info="add text to wall" @@ -39,6 +41,7 @@ data-role='toggle-map-view' data-info="toggle map view" class="ion-ios7-world-outline"></span> + --> <span data-role='toggle-project-settings' data-info="room settings" diff --git a/views/controls/editor/wallpaper.ejs b/views/controls/editor/wallpaper.ejs index 5ca0390..39a109b 100644 --- a/views/controls/editor/wallpaper.ejs +++ b/views/controls/editor/wallpaper.ejs @@ -12,7 +12,6 @@ <div class="wallpaperUpload toolButton"> <form> - <span class="ion-ios7-upload-outline upload-icon"></span> <label>Upload Wallpaper</label> <input type="file" accept="image/*" class="file" multiple> @@ -21,15 +20,18 @@ <input type="text" placeholder="Enter Image URL" class="url"> --> </div> + <div class="wallpaperRemove toolButton"> <span class="ion-scissors"></span> <label>Remove Wallpaper</label> </div> +<!-- <div class="wallpaperResize toolButton"> <span class="ion-arrow-resize"></span> <label>Resize Wallpaper</label> </div> +--> <div class="wallpaperResizeControls"> <span data-role="wallpaper-position" class="ion-arrow-expand"></span> |