diff options
| author | Julie Lala <jules@okfoc.us> | 2014-08-13 02:12:40 -0400 |
|---|---|---|
| committer | Julie Lala <jules@okfoc.us> | 2014-08-13 02:12:40 -0400 |
| commit | a279338f4dff62d87021ca28252d68b0c586d3a7 (patch) | |
| tree | 832e81fca691d0eb693c6f41f3fbb2bcd79af8c6 /views | |
| parent | b8b208d219cf782c39d054ad741724c6995a0b62 (diff) | |
add measurement stuff to media editor
Diffstat (limited to 'views')
| -rw-r--r-- | views/controls/editor/media-editor.ejs | 20 | ||||
| -rw-r--r-- | views/partials/scripts.ejs | 1 |
2 files changed, 14 insertions, 7 deletions
diff --git a/views/controls/editor/media-editor.ejs b/views/controls/editor/media-editor.ejs index 5db1fb2..7f8f299 100644 --- a/views/controls/editor/media-editor.ejs +++ b/views/controls/editor/media-editor.ejs @@ -34,13 +34,19 @@ <input type="range" min="0" max="1" value="0" step="0.01" name="keyframe" id="video-keyframe"> </div> - <div class="image setting"> - Dimensions<br> - <input type="text" name="width" placeholder="width" class="number"> - <input type="text" name="height" placeholder="height" class="number"> - <select name="units"> - <option value="inch">inch</option> - <option value="cm">cm</option> + <div class="setting number"> + <label for="scenery-width">width</label> + <input type="text" class="units" name="width" id="scenery-width"> + </div> + <div class="setting number"> + <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> </select> </div> diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs index b63d1bf..087c0d7 100644 --- a/views/partials/scripts.ejs +++ b/views/partials/scripts.ejs @@ -23,6 +23,7 @@ <script type="text/javascript" src="/assets/javascripts/rectangles/util/colors.js"></script> <script type="text/javascript" src="/assets/javascripts/rectangles/util/debug.js"></script> <script type="text/javascript" src="/assets/javascripts/rectangles/util/permissions.js"></script> +<script type="text/javascript" src="/assets/javascripts/rectangles/util/measurement.js"></script> <script type="text/javascript" src="/assets/javascripts/rectangles/util/sort.js"></script> <script type="text/javascript" src="/assets/javascripts/rectangles/util/uid.js"></script> <script type="text/javascript" src="/assets/javascripts/rectangles/util/wheel.js"></script> |