diff options
Diffstat (limited to 'views')
| -rw-r--r-- | views/controls/editor/collaborators.ejs | 57 | ||||
| -rw-r--r-- | views/controls/editor/share.ejs | 16 | ||||
| -rw-r--r-- | views/controls/reader/about-room.ejs | 3 | ||||
| -rw-r--r-- | views/controls/reader/embed.ejs | 26 | ||||
| -rw-r--r-- | views/docs.ejs | 2 | ||||
| -rwxr-xr-x | views/editor.ejs | 2 | ||||
| -rwxr-xr-x | views/home.ejs | 11 | ||||
| -rw-r--r-- | views/partials/footer.ejs | 2 | ||||
| -rw-r--r-- | views/partials/scripts.ejs | 3 | ||||
| -rw-r--r-- | views/profile.ejs | 4 | ||||
| -rw-r--r-- | views/reader.ejs | 1 |
11 files changed, 80 insertions, 47 deletions
diff --git a/views/controls/editor/collaborators.ejs b/views/controls/editor/collaborators.ejs index b658bf6..8ad8c00 100644 --- a/views/controls/editor/collaborators.ejs +++ b/views/controls/editor/collaborators.ejs @@ -4,29 +4,29 @@ <div class="rap"> <div class="holder"> <div class="inner vvbox"> - <h2>Collaborators</h2> + <h2>Collaborators</h2> - <p> - To invite others to contribute to this project, submit their email address below. They'll receive an email with instructions to join this blog and register if they're not a Vvalls user yet. - </p> + <p> + To invite others to contribute to this project, submit their email address below. They'll receive an email with instructions to join this project and register if they're not a Vvalls user yet. + </p> - <form> - <input type="text" id="collaborator-email" name="email"> - <input type="submit" id="collaborator-invite" value="Invite to this project"> - </form> + <form> + <input type="text" id="collaborator-email" name="email"> + <input type="submit" id="collaborator-invite" value="Invite to this project"> + </form> - <div id="collaborator-url-rapper"> - We've sent a link to join this project to <span id="collaborator-dummy-email"></span>. - You can also send this link yourself: - <input type="text" id="collaborator-url"> - </div> + <div id="collaborator-url-rapper"> + We've sent a link to join this project to <span id="collaborator-dummy-email"></span>. + You can also send this link yourself: + <input type="text" id="collaborator-url"> + </div> - <ul id="collaborator-list"> - </ul> - </div> + <ul id="collaborator-list"> + </ul> + </div> + </div> </div> </div> -</div> <script type="text/html" id="collaborator-template"> <li> @@ -38,26 +38,3 @@ <span class="role">owner</span> </li> </script> - -<style> -#collaborator-url-rapper { - display: none; - background: #fff; - border: 1px solid; - box-shadow: -3px 3px 0; - padding: 10px; - font-weight: 300; - font-size: 14px; - margin: 10px 0; -} -#collaborator-url { - font-size: 16px; - width: 500px; - border: 1px solid; - font-size: 14px; - padding: 5px; - font-weight: 300; - margin-top: 5px; - display: block; -} -</style> diff --git a/views/controls/editor/share.ejs b/views/controls/editor/share.ejs new file mode 100644 index 0000000..7e7ad3c --- /dev/null +++ b/views/controls/editor/share.ejs @@ -0,0 +1,16 @@ +<div class="vvbox settings share"> + <h4>Project Saved</h4> + + <div class="setting"> + <h2>Share on–</h2> + <a id="share_facebook">Facebook</a> + <a id="share_twitter">Twitter</a> + <a id="share_embed">Embed</a> + </div> + + <div class="setting"> + Send people this link: + <input type="text" id="share_link"> + </div> + +</div> diff --git a/views/controls/reader/about-room.ejs b/views/controls/reader/about-room.ejs index c9ad626..7e02e93 100644 --- a/views/controls/reader/about-room.ejs +++ b/views/controls/reader/about-room.ejs @@ -13,9 +13,10 @@ <h2>Share on–</h2> <a id="share_facebook">Facebook</a> <a id="share_twitter">Twitter</a> + <a id="share_embed">Embed</a> </div> [[ if (canEdit) { ]] - <a href="[[- editlink ]]" class="btn warn marg">Edit Room</a> + <a href="[[- editlink ]]" class="btn warn marg" id="edit-room-link">Edit Room</a> [[ } ]] </div> diff --git a/views/controls/reader/embed.ejs b/views/controls/reader/embed.ejs new file mode 100644 index 0000000..cc21c74 --- /dev/null +++ b/views/controls/reader/embed.ejs @@ -0,0 +1,26 @@ +<div class="embedView fixed mediaDrawer animate"> + <span class="close">X</span> + + <div class="rap"> + <div class="holder"> + <div class="inner vvbox"> + <h2>Embed Vvalls</h2> + + <p> + This code generates an iframe which will embed this room in your website or blog. + </p> + <textarea id="embedCode"></textarea> + + dimensions: <input type="text" name="width">x<input type="text" name="height"> + <input type="checkbox" name="mute" id="mute" checked><label for="mute">mute</label> + <input type="checkbox" name="interactive" id="interactive" checked><label for="interactive">interactive</label> +<!-- + <input type="checkbox" id=""> <label for=""></label> + <input type="checkbox" id=""> <label for=""></label> + <input type="checkbox" id=""> <label for=""></label> + --> + <span id="testEmbed">test</span> + </div> + </div> + </div> +</div> diff --git a/views/docs.ejs b/views/docs.ejs index 665190d..741cff7 100644 --- a/views/docs.ejs +++ b/views/docs.ejs @@ -5,7 +5,7 @@ [[ include partials/meta ]] </head> <body class="loading"> -<div class="rapper page docs"> +<div class="rapper page docs about"> [[ include partials/header ]] [[ if (! isNew) { ]] diff --git a/views/editor.ejs b/views/editor.ejs index 29db917..efc4b9d 100755 --- a/views/editor.ejs +++ b/views/editor.ejs @@ -20,6 +20,8 @@ [[ include controls/editor/color-control ]] [[ include controls/editor/text-editor ]] [[ include controls/editor/collaborators ]] + [[ include controls/editor/share ]] + [[ include controls/reader/embed ]] [[ include controls/editor/settings ]] [[ include controls/editor/presets ]] </div> diff --git a/views/home.ejs b/views/home.ejs index 0a55336..76fbf3f 100755 --- a/views/home.ejs +++ b/views/home.ejs @@ -64,7 +64,16 @@ <h1>Room Showcase</h1> [[ include projects/list-projects ]] - + + <div class="projectList about gopro"> + + <span> + <h3>Ready To Go Pro?</h3> + + We offer white-label licensing of the VValls platform that could be used within the context of your product offering. We can also customize the VValls platform to suit the various needs of your project. This could be include custom floor plans and numerous other features. Please inquire to start a conversation. + <a href="mailto:info@vvalls.com?subject=VValls platform">Contact</a> + </span> + </div> [[ include partials/confirm-modal ]] [[ include projects/layouts-modal ]] [[ include partials/sign-in ]] diff --git a/views/partials/footer.ejs b/views/partials/footer.ejs index f44b611..a94acb1 100644 --- a/views/partials/footer.ejs +++ b/views/partials/footer.ejs @@ -5,7 +5,7 @@ <a href="/about/terms">Terms</a> <a href="/about/privacy">Privacy</a> - <span>©2014 VVALLS Inc.</span> + <span>©2014 Dot Dash 3, Inc.</span> [[ if (logged_in) { ]] <br><br> diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs index 3e61a5a..70c3b27 100644 --- a/views/partials/scripts.ejs +++ b/views/partials/scripts.ejs @@ -7,7 +7,7 @@ <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> -<!--<script type="text/javascript" src="/assets/javascripts/vendor/wow.js"></script>--> +<!-- <script type="text/javascript" src="/assets/javascripts/vendor/wow.js"></script> --> <script type="text/javascript" src="/assets/javascripts/vendor/chardinjs.min.js"></script> <script type="text/javascript" src="/assets/javascripts/vendor/sha1.js"></script> <script type="text/javascript" src="/assets/javascripts/vendor/dataUriToBlob.js"></script> @@ -115,6 +115,7 @@ <script type="text/javascript" src="/assets/javascripts/ui/reader/ReaderView.js"></script> <script type="text/javascript" src="/assets/javascripts/ui/reader/ShareView.js"></script> +<script type="text/javascript" src="/assets/javascripts/ui/reader/EmbedView.js"></script> <script type="text/javascript" src="/assets/javascripts/ui/reader/MediaPlayer.js"></script> <script type="text/javascript" src="/assets/javascripts/ui/reader/Tracker.js"></script> diff --git a/views/profile.ejs b/views/profile.ejs index 272deb7..5043df6 100644 --- a/views/profile.ejs +++ b/views/profile.ejs @@ -33,12 +33,12 @@ [[ } ]] [[ if (profile.website && profile.website.length) { ]] <span> - <a href="[[- profile.website ]]">[[- profile.website ]]</a> + <a href="[[- profile.website ]]" target="_blank">[[- profile.website ]]</a> </span> [[ } ]] [[ if (profile.twitterName && profile.twitterName.length) { ]] <span> - <a href="https://twitter.com/[[- profile.twitterName ]]">@[[- profile.twitterName ]]</a> + <a href="https://twitter.com/[[- profile.twitterName ]]" target="_blank">@[[- profile.twitterName ]]</a> </span> [[ } ]] </div> diff --git a/views/reader.ejs b/views/reader.ejs index e86bab1..b9b53d2 100644 --- a/views/reader.ejs +++ b/views/reader.ejs @@ -15,6 +15,7 @@ <div id="editorView"> [[ include controls/reader/about-room ]] [[ include controls/reader/media-player ]] + [[ include controls/reader/embed ]] </div> <!-- |