diff options
| author | Julie Lala <jules@okfoc.us> | 2014-06-10 19:46:53 -0400 |
|---|---|---|
| committer | Julie Lala <jules@okfoc.us> | 2014-06-10 19:46:53 -0400 |
| commit | 4e4b5b5668835097f335efaf55dfe837eec7dc3c (patch) | |
| tree | 5cd6cb12a203c5dd7c8cf9f62b9cd9235e52513c /views/controls | |
| parent | 3074488306e041718dec221ff9142748e2e68916 (diff) | |
| parent | b231af3e38b8f066f18031fd69b0fdb30a5e244a (diff) | |
Merge branch 'master' of github.com:okfocus/vvalls
Diffstat (limited to 'views/controls')
| -rw-r--r-- | views/controls/builder/settings.ejs | 8 | ||||
| -rw-r--r-- | views/controls/builder/toolbar.ejs | 20 |
2 files changed, 15 insertions, 13 deletions
diff --git a/views/controls/builder/settings.ejs b/views/controls/builder/settings.ejs index f92d1c7..c91f7b5 100644 --- a/views/controls/builder/settings.ejs +++ b/views/controls/builder/settings.ejs @@ -1,4 +1,4 @@ -<div class="vvbox settings"> +<div class="vvbox settings" id="builderSettings"> <div class="setting"> <a href="#" id="startpoint"> @@ -19,11 +19,11 @@ </div> <div class="setting"> <div class="radio-group"> - <input id="opt_1" class="radio-group__option" type="radio" name="opt" checked="checked"> + <input id="opt_1" class="radio-group__option" type="radio" name="opt" value="public" checked="checked"> <label class="radio-group__label" for="opt_1"> Everyone </label> - <input id="opt_2" class="radio-group__option" type="radio" name="opt"> + <input id="opt_2" class="radio-group__option" type="radio" name="opt" value="private"> <label class="radio-group__label" for="opt_2"> Just for me </label> @@ -37,4 +37,4 @@ <a href="#">Clear</a> <a href="#" id="deleteRoom">Delete</a> </div> -</div>
\ No newline at end of file +</div> diff --git a/views/controls/builder/toolbar.ejs b/views/controls/builder/toolbar.ejs index 1d57322..cb6dd60 100644 --- a/views/controls/builder/toolbar.ejs +++ b/views/controls/builder/toolbar.ejs @@ -1,27 +1,29 @@ -<div class="edit menu vvbox"> +<div class="edit menu vvbox" id="builderToolbar"> <span data-info="add media" class="icon-ios7-photos-outline"></span> <span - data-role='undo' - data-info="undo" - class="icon-reply"></span> - <span data-role='create-mode' data-info="draw" class="icon-plus"></span> <span - data-role='resize-mode' - data-info="resize" - class="icon-arrow-resize"></span> - <span data-role='move-mode' data-info="move" class="icon-arrow-move"></span> <span + data-role='resize-mode' + data-info="resize" + class="icon-arrow-resize"></span> + <span data-role='delete-mode' data-info="delete" class="icon-close"></span> +<!-- + <span + data-role='undo' + data-info="undo" + class="icon-reply"></span> +--> <span data-role='toggle-layout-settings' data-info="layout settings" |