diff options
Diffstat (limited to 'views')
| -rw-r--r-- | views/controls/editor/light-control.ejs | 7 | ||||
| -rw-r--r-- | views/controls/editor/wallpaper.ejs | 12 | ||||
| -rw-r--r-- | views/partials/meta.ejs | 17 | ||||
| -rw-r--r-- | views/partials/scripts.ejs | 3 |
4 files changed, 37 insertions, 2 deletions
diff --git a/views/controls/editor/light-control.ejs b/views/controls/editor/light-control.ejs index 4324087..8536b74 100644 --- a/views/controls/editor/light-control.ejs +++ b/views/controls/editor/light-control.ejs @@ -6,8 +6,11 @@ </div> <div class="color-swatches"> - <div class="swatch" id="wall-color"></div> <label>wall color</label> - <div class="swatch" id="outline-color"></div> <label>outline color</label> + <div class="swatch" id="wall-color"></div><label>wall</label> + <div class="swatch" id="floor-color"></div><label>floor</label> + <div class="swatch" id="ceiling-color"></div><label>ceiling</label> + <br> + <div class="swatch" id="outline-color"></div><label>outlines</label> </div> <!-- diff --git a/views/controls/editor/wallpaper.ejs b/views/controls/editor/wallpaper.ejs index 144e419..55ecf85 100644 --- a/views/controls/editor/wallpaper.ejs +++ b/views/controls/editor/wallpaper.ejs @@ -1,4 +1,16 @@ <div class="vvbox wallpaper"> + <div class="swatches"></div> + + <div class="wallpaperUpload"> + <form> + <span class="icon-ios7-upload-outline upload-icon"></span> + <label>Upload wallpaper</label> + <input type="file" accept="image/*" class="file" multiple> + </form> +<!-- + <input type="text" placeholder="Enter Image URL" class="url"> + --> + </div> </div> <div class="floatingSwatch"></div> diff --git a/views/partials/meta.ejs b/views/partials/meta.ejs index ceaaba1..9916b34 100644 --- a/views/partials/meta.ejs +++ b/views/partials/meta.ejs @@ -1,3 +1,20 @@ + +<!-----+ +------+ +------+ +------+ +------+ +|`. `. |\ \ | | / /| .' .'| +| `+------+ | +------+ +------+ +------+ | +------+' | +| | | | | | | | | | | | | | ++ | | + | | | | | | + | | + + `. | | \| | | | | |/ | | .' + `+------+ +------+ +------+ +------+ +------+' + VVALLS - developed by okfoc.us + .+------+ +------+ +------+ +------+ +------+. + .' .'| / /| | | |\ \ |`. `. ++------+' | +------+ | +------+ | +------+ | `+------+ +| | | | | | | | | | | | | | +| | + | | + | | + | | + | | +| | .' | |/ | | \| | `. | | ++------+' +------+ +------+ +------+ `+------> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/> <meta name="viewport" content="width=device-width, initial-scale=1.0"/> diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs index ae5b31f..7d56b2e 100644 --- a/views/partials/scripts.ejs +++ b/views/partials/scripts.ejs @@ -41,6 +41,7 @@ <script type="text/javascript" src="/assets/javascripts/rectangles/models/wall.js"></script> <script type="text/javascript" src="/assets/javascripts/rectangles/engine/rooms/_rooms.js"></script> +<script type="text/javascript" src="/assets/javascripts/rectangles/engine/rooms/_walls.js"></script> <script type="text/javascript" src="/assets/javascripts/rectangles/engine/rooms/builder.js"></script> <script type="text/javascript" src="/assets/javascripts/rectangles/engine/rooms/clipper.js"></script> <script type="text/javascript" src="/assets/javascripts/rectangles/engine/rooms/grouper.js"></script> @@ -63,6 +64,7 @@ <script type="text/javascript" src="/assets/javascripts/ui/lib/Router.js"></script> <script type="text/javascript" src="/assets/javascripts/ui/lib/ModalView.js"></script> <script type="text/javascript" src="/assets/javascripts/ui/lib/FormView.js"></script> +<script type="text/javascript" src="/assets/javascripts/ui/lib/UploadView.js"></script> <script type="text/javascript" src="/assets/javascripts/ui/lib/AlertModal.js"></script> <script type="text/javascript" src="/assets/javascripts/ui/lib/ConfirmModal.js"></script> <script type="text/javascript" src="/assets/javascripts/ui/lib/ErrorModal.js"></script> @@ -103,6 +105,7 @@ <script type="text/javascript" src="/assets/javascripts/ui/_router.js"></script> <script type="text/javascript" src="/assets/javascripts/app.js"></script> +<script type="text/javascript" src="/assets/javascripts/defaults.js"></script> <!-- external dependencies --> <script src="http://www.youtube.com/player_api"></script> |