diff options
| author | ryderr <r@okfoc.us> | 2014-10-02 12:26:41 -0400 |
|---|---|---|
| committer | ryderr <r@okfoc.us> | 2014-10-02 12:26:41 -0400 |
| commit | 07c4bbecdad6ba4522de09d52884e1ad790fff87 (patch) | |
| tree | 1e276d3eae7dbf564b11b1388972cadd905dab3f /views/partials | |
| parent | 7767259acb90375f55b15ad906e3d434219d43fc (diff) | |
| parent | 52cabd89039fa852cbd59db9b8bfcb29e1e0a170 (diff) | |
Merge branch 'master' of github.com:okfocus/vvalls
Diffstat (limited to 'views/partials')
| -rw-r--r-- | views/partials/header.ejs | 3 | ||||
| -rw-r--r-- | views/partials/scripts.ejs | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/views/partials/header.ejs b/views/partials/header.ejs index c946037..1b7b498 100644 --- a/views/partials/header.ejs +++ b/views/partials/header.ejs @@ -67,7 +67,10 @@ [[ } else if (! profile) { ]] <a href="/profile" class="topLink profileLink">Profile</a> [[ } ]] + + [[ if (opt.editing) { ]] <a href="#" class="icon-help-circled" id="help-button"></a> + [[ } ]] [[ } else { ]] <a href="/signup" data-role="show-signup-modal" class="signUp topLink">Sign Up</a> diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs index 2e2d8b6..1ce180a 100644 --- a/views/partials/scripts.ejs +++ b/views/partials/scripts.ejs @@ -100,6 +100,7 @@ <script type="text/javascript" src="/assets/javascripts/ui/editor/MediaEditor.js"></script> <script type="text/javascript" src="/assets/javascripts/ui/editor/MediaUpload.js"></script> <script type="text/javascript" src="/assets/javascripts/ui/editor/MediaViewer.js"></script> +<script type="text/javascript" src="/assets/javascripts/ui/editor/TextEditor.js"></script> <script type="text/javascript" src="/assets/javascripts/ui/editor/WallpaperPicker.js"></script> <script type="text/javascript" src="/assets/javascripts/ui/reader/ReaderView.js"></script> |