diff options
Diffstat (limited to 'views')
| -rw-r--r-- | views/controls/editor/text-editor.ejs | 4 | ||||
| -rw-r--r-- | views/controls/editor/toolbar.ejs | 2 | ||||
| -rw-r--r-- | views/partials/scripts.ejs | 13 |
3 files changed, 12 insertions, 7 deletions
diff --git a/views/controls/editor/text-editor.ejs b/views/controls/editor/text-editor.ejs index 205fbdf..a14c469 100644 --- a/views/controls/editor/text-editor.ejs +++ b/views/controls/editor/text-editor.ejs @@ -1,6 +1,10 @@ <div class="vvbox settings" id="textEditor"> <h4>Edit Text</h4> + <div class="no-text"> + Click a wall to add text. + </div> + <div class="setting"> <select name="font-family"> <option>Helvetica</option> diff --git a/views/controls/editor/toolbar.ejs b/views/controls/editor/toolbar.ejs index 586194b..f9d91af 100644 --- a/views/controls/editor/toolbar.ejs +++ b/views/controls/editor/toolbar.ejs @@ -30,7 +30,7 @@ [[ if (user.username == "test12343") { ]] <span data-role='toggle-text-editor' - data-info="edit wall text" + data-info="add text to wall" class="icon-ios7-compose-outline"></span> [[ } ]] diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs index 4af9938..35dd782 100644 --- a/views/partials/scripts.ejs +++ b/views/partials/scripts.ejs @@ -17,6 +17,7 @@ <script type="text/javascript" src="/assets/javascripts/mx/extensions/mx.movements.js"></script> <script type="text/javascript" src="/assets/javascripts/mx/extensions/mx.movementsMobile.js"></script> <script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.image.js"></script> +<script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.text.js"></script> <script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.video.js"></script> <script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.youtube.js"></script> <script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.vimeo.js"></script> @@ -27,19 +28,18 @@ <script type="text/javascript" src="/assets/javascripts/rectangles/util/colors.js"></script> <script type="text/javascript" src="/assets/javascripts/rectangles/util/coords.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/keys.js"></script> <script type="text/javascript" src="/assets/javascripts/rectangles/util/measurement.js"></script> +<script type="text/javascript" src="/assets/javascripts/rectangles/util/minotaur.js"></script> +<script type="text/javascript" src="/assets/javascripts/rectangles/util/mouse.js"></script> +<script type="text/javascript" src="/assets/javascripts/rectangles/util/permissions.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> -<script type="text/javascript" src="/assets/javascripts/rectangles/util/mouse.js"></script> -<script type="text/javascript" src="/assets/javascripts/rectangles/util/keys.js"></script> <script type="text/javascript" src="/assets/javascripts/rectangles/util/undostack.js"></script> -<script type="text/javascript" src="/assets/javascripts/rectangles/util/minotaur.js"></script> +<script type="text/javascript" src="/assets/javascripts/rectangles/util/wheel.js"></script> <script type="text/javascript" src="/assets/javascripts/rectangles/models/vec2.js"></script> <script type="text/javascript" src="/assets/javascripts/rectangles/models/vec3.js"></script> -<script type="text/javascript" src="/assets/javascripts/rectangles/models/mat4.js"></script> <script type="text/javascript" src="/assets/javascripts/rectangles/models/rect.js"></script> <script type="text/javascript" src="/assets/javascripts/rectangles/models/surface.js"></script> <script type="text/javascript" src="/assets/javascripts/rectangles/models/tree.js"></script> @@ -60,6 +60,7 @@ <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/undo.js"></script> <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/types/_object.js"></script> <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/types/image.js"></script> +<script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/types/text.js"></script> <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/types/video.js"></script> <script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/_map.js"></script> |