diff options
Diffstat (limited to 'views')
| -rw-r--r-- | views/controls/editor/text-editor.ejs | 10 | ||||
| -rw-r--r-- | views/controls/editor/toolbar.ejs | 2 | ||||
| -rw-r--r-- | views/controls/reader/about-room.ejs | 16 | ||||
| -rw-r--r-- | views/partials/scripts.ejs | 14 | ||||
| -rw-r--r-- | views/reader.ejs | 2 |
5 files changed, 29 insertions, 15 deletions
diff --git a/views/controls/editor/text-editor.ejs b/views/controls/editor/text-editor.ejs index 205fbdf..3a367d5 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> @@ -17,6 +21,12 @@ <option value="36">36pt</option> <option value="72">72pt</option> </select> + <select name="text-align"> + <option value="left">Left</option> + <option value="center">Center</option> + <option value="right">Right</option> + <option value="justify">Justify</option> + </select> </div> <div class="setting"> 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/controls/reader/about-room.ejs b/views/controls/reader/about-room.ejs index ab8fee6..c0ca9f7 100644 --- a/views/controls/reader/about-room.ejs +++ b/views/controls/reader/about-room.ejs @@ -4,18 +4,20 @@ <a href="[[- authorlink ]]">[[- author ]]</a> </h1> [[ if (description) { ]] - <span class="txt">[[- description ]]</span><br> + <span class="txt">[[- description ]]</span> [[ } ]] <span class="txt">Last modified [[- date ]]</span> + <div class="share"> + <h2>Share on–</h2> + <a href="#">Facebook</a> + <a href="#">Twitter</a> + </div> + [[ if (canEdit) { ]] - <br> <a href="[[- editlink ]]" class="btn warn marg">Edit Room</a> + <a href="[[- editlink ]]" class="btn warn marg">Edit Room</a> [[ } ]] </div> -<div class="share"> - <h2>Share on–</h2> - <a href="#">Facebook</a> - <a href="#">Twitter</a> -</div> + diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs index 4af9938..f768160 100644 --- a/views/partials/scripts.ejs +++ b/views/partials/scripts.ejs @@ -3,6 +3,7 @@ <script type="text/javascript" src="/assets/javascripts/vendor/bower_components/momentjs/min/moment.min.js"></script> <script type="text/javascript" src="/assets/javascripts/vendor/bower_components/fiber/src/fiber.min.js"></script> <script type="text/javascript" src="/assets/javascripts/vendor/bower_components/prefixfree/prefixfree.min.js"></script> +<script type="text/javascript" src="/assets/javascripts/vendor/bower_components/marked/lib/marked.js"></script> <script type="text/javascript" src="/assets/javascripts/vendor/tube.js"></script> <script type="text/javascript" src="/assets/javascripts/vendor/loader.js"></script> <script type="text/javascript" src="/assets/javascripts/vendor/polyfill.js"></script> @@ -17,6 +18,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 +29,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 +61,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> diff --git a/views/reader.ejs b/views/reader.ejs index ed5df1f..b110ffd 100644 --- a/views/reader.ejs +++ b/views/reader.ejs @@ -22,7 +22,7 @@ [[ include partials/confirm-modal ]] [[ include projects/layouts-modal ]] [[ include partials/sign-in ]] - +<img src="/assets/img/keys.png" id="keyhint"> </body> [[ include partials/scripts ]] </html> |