diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-10-06 23:41:04 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-10-06 23:41:04 -0400 |
| commit | 9dccd8305b57a8d19caac960aa6f8528f208baf6 (patch) | |
| tree | 7a0a1aae626abcde6722d054b97388e5a3f1814e /views/controls | |
| parent | c4793f4c649425d0a4b09ce7244edd7ceb69f335 (diff) | |
| parent | 20b1d2787e71cb28c55187d42805407fef63d0e4 (diff) | |
merge
Diffstat (limited to 'views/controls')
| -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 |
3 files changed, 20 insertions, 8 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> + |