diff options
Diffstat (limited to 'public/views')
-rw-r--r-- | public/views/body.ejs | 83 | ||||
-rw-r--r-- | public/views/foot.ejs | 5 | ||||
-rw-r--r-- | public/views/header.ejs | 20 | ||||
-rw-r--r-- | public/views/index.ejs | 38 | ||||
-rw-r--r-- | public/views/signin-modal.ejs | 5 |
5 files changed, 128 insertions, 23 deletions
diff --git a/public/views/body.ejs b/public/views/body.ejs index 11bccfef..5e183dc3 100644 --- a/public/views/body.ejs +++ b/public/views/body.ejs @@ -151,5 +151,88 @@ </div> </div> </div> +<!-- snippet import modal --> +<div class="modal fade" id="snippetImportModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> + <div class="modal-dialog"> + <div class="modal-content"> + <div class="modal-header"> + <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span> + </button> + <h4 class="modal-title" id="myModalLabel">Import from Snippet</h4> + </div> + <div class="modal-body"> + <input type="hidden" id="snippetImportModalAccessToken" /> + <input type="hidden" id="snippetImportModalBaseURL" /> + <div class="ui-field-contain" style="display:table;margin-bottom:10px;width:100%;"> + <div style="display:table-row;margin-bottom:5px;"> + <label style="display:table-cell;">Project:</label> + <select class="form-control" id="snippetImportModalProjects" style="display:table-cell;" disabled="disabled"> + <option value="init" selected="selected" disabled="disabled">Select From Available Projects</option> + </select> + </div> + <div style="display:table-row;"> + <label style="display:table-cell;">Snippet</label> + <select class="form-control" id="snippetImportModalSnippets" style="display:table-cell;" disabled="disabled"> + <option value="init" selected="selected" disabled="disabled">Select From Available Snippets</option> + </select> + </div> + </div> + <p class="snippet-import-or">OR</p> + <input type="url" class="form-control" placeholder="/projects/:id/snippets/:snippet_id" id="snippetImportModalContent" disabled="disabled"> + </div> + <div class="modal-footer"> + <span id="snippetImportModalLoading"><i class="fa fa-refresh fa-spin"></i></span> + <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button> + <button type="button" class="btn btn-danger" id="snippetImportModalClear">Clear</button> + <button type="button" class="btn btn-primary" id="snippetImportModalConfirm" disabled="disabled">Import</button> + </div> + </div> + </div> +</div> +<!-- snippet export modal --> +<div class="modal fade" id="snippetExportModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> + <div class="modal-dialog"> + <div class="modal-content"> + <div class="modal-header"> + <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span> + </button> + <h4 class="modal-title" id="myModalLabel">Export to Snippet</h4> + </div> + <div class="modal-body"> + <input type="hidden" id="snippetExportModalAccessToken" /> + <input type="hidden" id="snippetExportModalBaseURL" /> + <div class="ui-field-contain" style="display:table;margin-bottom:10px;width:100%;"> + <div style="display:table-row;margin-bottom:5px;"> + <label style="display:table-cell;">Title:</label> + <input class="form-control" placeholder="new snippet" type="text" id="snippetExportModalTitle" /> + </div> + <div style="display:table-row;margin-bottom:5px;"> + <label style="display:table-cell;">File Name:</label> + <input class="form-control" placeholder="new_snippet.md" type="text" id="snippetExportModalFileName" /> + </div> + <div style="display:table-row;margin-bottom:5px;"> + <label style="display:table-cell;">Project:</label> + <select class="form-control" id="snippetExportModalProjects" style="display:table-cell;"> + <option value="init" selected="selected" disabled="disabled">Select From Available Projects</option> + </select> + </div> + <div style="display:table-row;margin-bottom:5px;"> + <label style="display:table-cell;">Visibility:</label> + <select class="form-control" id="snippetExportModalVisibility" style="display:table-cell;"> + <option value="" selected="selected" disabled="disabled">Select Visibility Level</option> + <option value="0">Private</option> + <option value="10">Internal</option> + </select> + </div> + </div> + </div> + <div class="modal-footer"> + <span id="snippetExportModalLoading"><i class="fa fa-refresh fa-spin"></i></span> + <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button> + <button type="button" class="btn btn-primary" id="snippetExportModalConfirm">Export</button> + </div> + </div> + </div> +</div> <%- include signin-modal %> <%- include help-modal %>
\ No newline at end of file diff --git a/public/views/foot.ejs b/public/views/foot.ejs index 9cd4ba03..7adb8c72 100644 --- a/public/views/foot.ejs +++ b/public/views/foot.ejs @@ -71,8 +71,6 @@ <script src="<%- url %>/vendor/md-toc.js" defer></script> <script src="<%- url %>/vendor/showup/showup.js" defer></script> <script src="<%- url %>/vendor/randomColor.js" defer></script> -<script type="text/javascript" src="https://www.dropbox.com/static/api/2/dropins.js" id="dropboxjs" data-app-key="change this" async defer></script> -<script src="https://www.google.com/jsapi" defer></script> <script src="<%- url %>/js/google-drive-upload.js" defer></script> <script src="<%- url %>/js/google-drive-picker.js" defer></script> <script src="<%- url %>/js/common.js" defer></script> @@ -80,5 +78,4 @@ <script src="<%- url %>/js/render.js" defer></script> <script src="<%- url %>/js/history.js" defer></script> <script src="<%- url %>/js/index.js" defer></script> -<script src="<%- url %>/js/syncscroll.js" defer></script> -<script src="https://apis.google.com/js/client:plusone.js?onload=onGoogleClientLoaded" defer></script>
\ No newline at end of file +<script src="<%- url %>/js/syncscroll.js" defer></script>
\ No newline at end of file diff --git a/public/views/header.ejs b/public/views/header.ejs index bbabe778..8610b861 100644 --- a/public/views/header.ejs +++ b/public/views/header.ejs @@ -1,7 +1,7 @@ <nav class="navbar navbar-default navbar-fixed-top unselectable hidden-print"> <!-- Brand and toggle get grouped for better mobile display --> <div class="navbar-header"> - <span class="pull-right" style="margin-top: 17px; color: #777;"> + <span class="pull-right" style="margin-top: 17px; color: #777;"> <div class="visible-xs"> </div> <div class="visible-sm"> </div> <div class="visible-md"> </div> @@ -42,6 +42,10 @@ <li role="presentation"><a role="menuitem" class="ui-save-gist" tabindex="-1" href="#" target="_blank"><i class="fa fa-github fa-fw"></i> Gist</a> </li> <% } %> + <% if(typeof gitlab !== 'undefined' && gitlab) { %> + <li role="presentation"><a role="menuitem" class="ui-save-snippet" href="#" data-toggle="modal" data-target="#snippetExportModal"><i class="fa fa-gitlab fa-fw"></i> Snippet</a> + </li> + <% } %> <li class="divider"></li> <li class="dropdown-header">Import</li> <li role="presentation"><a role="menuitem" class="ui-import-dropbox" tabindex="-1" href="#" target="_self"><i class="fa fa-dropbox fa-fw"></i> Dropbox</a> @@ -50,6 +54,10 @@ </li> <li role="presentation"><a role="menuitem" class="ui-import-gist" href="#" data-toggle="modal" data-target="#gistImportModal"><i class="fa fa-github fa-fw"></i> Gist</a> </li> + <% if(typeof gitlab !== 'undefined' && gitlab) { %> + <li role="presentation"><a role="menuitem" class="ui-import-snippet" href="#" data-toggle="modal" data-target="#snippetImportModal"><i class="fa fa-gitlab fa-fw"></i> Snippet</a> + </li> + <% } %> <li role="presentation"><a role="menuitem" class="ui-import-clipboard" href="#" data-toggle="modal" data-target="#clipboardModal"><i class="fa fa-clipboard fa-fw"></i> Clipboard</a> </li> <li class="divider"></li> @@ -127,6 +135,10 @@ <li role="presentation"><a role="menuitem" class="ui-save-gist" tabindex="-1" href="#" target="_blank"><i class="fa fa-github fa-fw"></i> Gist</a> </li> <% } %> + <% if(typeof gitlab !== 'undefined' && gitlab) { %> + <li role="presentation"><a role="menuitem" class="ui-save-snippet" href="#" data-toggle="modal" data-target="#snippetExportModal"><i class="fa fa-gitlab fa-fw"></i> Snippet</a> + </li> + <% } %> <li class="divider"></li> <li class="dropdown-header">Import</li> <li role="presentation"><a role="menuitem" class="ui-import-dropbox" tabindex="-1" href="#" target="_self"><i class="fa fa-dropbox fa-fw"></i> Dropbox</a> @@ -135,6 +147,10 @@ </li> <li role="presentation"><a role="menuitem" class="ui-import-gist" href="#" data-toggle="modal" data-target="#gistImportModal"><i class="fa fa-github fa-fw"></i> Gist</a> </li> + <% if(typeof gitlab !== 'undefined' && gitlab) { %> + <li role="presentation"><a role="menuitem" class="ui-import-snippet" href="#" data-toggle="modal" data-target="#snippetImportModal"><i class="fa fa-gitlab fa-fw"></i> Snippet</a> + </li> + <% } %> <li role="presentation"><a role="menuitem" class="ui-import-clipboard" href="#" data-toggle="modal" data-target="#clipboardModal"><i class="fa fa-clipboard fa-fw"></i> Clipboard</a> </li> <li class="divider"></li> @@ -148,4 +164,4 @@ </ul> </div> </nav> -<div class="ui-spinner unselectable hidden-print"></div>
\ No newline at end of file +<div class="ui-spinner unselectable hidden-print"></div> diff --git a/public/views/index.ejs b/public/views/index.ejs index c8468848..98641df6 100644 --- a/public/views/index.ejs +++ b/public/views/index.ejs @@ -15,7 +15,7 @@ <link rel="apple-touch-icon" href="<%- url %>/apple-touch-icon.png"> <!-- Bootstrap core CSS --> - <% if(useCDN) { %> + <% if(useCDN) { %> <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css"> <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.6.2/css/font-awesome.min.css"> <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/bootstrap-social/4.9.0/bootstrap-social.min.css"> @@ -58,8 +58,10 @@ <p class="lead"> Realtime collaborative markdown notes on all platforms. </p> + <% if(facebook || twitter || github || gitlab || dropbox) { %> <a type="button" class="btn btn-lg btn-success ui-signin" data-toggle="modal" data-target=".signin-modal" style="display:none;">Sign In</a> <div class="ui-or" style="display:none;">Or</div> + <% }%> <p class="lead"> <a href="<%- url %>/new" class="btn btn-lg btn-default">New note</a> </p> @@ -70,6 +72,7 @@ </div> <div id="history" class="section" style="display:none;"> + <% if(facebook || twitter || github || gitlab || dropbox) { %> <div class="ui-signin"> <h4> <a type="button" class="btn btn-success" data-toggle="modal" data-target=".signin-modal">Sign In</a> to get own history! @@ -82,6 +85,7 @@ <a href="<%- url %>/new" class="btn btn-default">New note</a> Or <a href="#" class="btn btn-danger ui-logout">Sign Out</a> </div> + <% }%> <hr> <form class="form-inline"> <div class="form-group" style="vertical-align: bottom;"> @@ -180,25 +184,25 @@ <!-- Bootstrap core JavaScript ================================================== --> <!-- Placed at the end of the document so the pages load faster --> - <% if(useCDN) { %> - <script src="//code.jquery.com/jquery-1.11.3.min.js" defer></script> - <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" defer></script> - <script src="//cdnjs.cloudflare.com/ajax/libs/gsap/1.18.0/TweenMax.min.js" defer></script> + <% if(useCDN) { %> + <script src="//code.jquery.com/jquery-1.11.3.min.js" defer></script> + <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" defer></script> + <script src="//cdnjs.cloudflare.com/ajax/libs/gsap/1.18.0/TweenMax.min.js" defer></script> <script src="//cdnjs.cloudflare.com/ajax/libs/gsap/1.18.0/jquery.gsap.min.js" defer></script> - <script src="//cdnjs.cloudflare.com/ajax/libs/select2/3.5.2/select2.min.js" defer></script> - <script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.12.0/moment-with-locales.min.js" defer></script> - <script src="//cdnjs.cloudflare.com/ajax/libs/handlebars.js/4.0.5/handlebars.min.js" defer></script> - <script src="//cdnjs.cloudflare.com/ajax/libs/js-url/2.0.2/url.min.js" defer></script> - <% } else { %> - <script src="<%- url %>/vendor/jquery/dist/jquery.min.js" defer></script> - <script src="<%- url %>/vendor/bootstrap/dist/js/bootstrap.min.js" defer></script> + <script src="//cdnjs.cloudflare.com/ajax/libs/select2/3.5.2/select2.min.js" defer></script> + <script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.12.0/moment-with-locales.min.js" defer></script> + <script src="//cdnjs.cloudflare.com/ajax/libs/handlebars.js/4.0.5/handlebars.min.js" defer></script> + <script src="//cdnjs.cloudflare.com/ajax/libs/js-url/2.0.2/url.min.js" defer></script> + <% } else { %> + <script src="<%- url %>/vendor/jquery/dist/jquery.min.js" defer></script> + <script src="<%- url %>/vendor/bootstrap/dist/js/bootstrap.min.js" defer></script> <script src="<%- url %>/vendor/gsap/src/minified/TweenMax.min.js" defer></script> <script src="<%- url %>/vendor/gsap/src/minified/jquery.gsap.min.js" defer></script> - <script src="<%- url %>/vendor/select2/select2.min.js" defer></script> - <script src="<%- url %>/vendor/moment/min/moment-with-locales.min.js" defer></script> + <script src="<%- url %>/vendor/select2/select2.min.js" defer></script> + <script src="<%- url %>/vendor/moment/min/moment-with-locales.min.js" defer></script> <script src="<%- url %>/vendor/handlebars/handlebars.min.js" defer></script> - <script src="<%- url %>/vendor/js-url/url.min.js" defer></script> - <% } %> + <script src="<%- url %>/vendor/js-url/url.min.js" defer></script> + <% } %> <script src="<%- url %>/vendor/js.cookie.js" defer></script> <script src="<%- url %>/vendor/list.min.js" defer></script> <script src="<%- url %>/vendor/FileSaver.min.js" defer></script> @@ -209,4 +213,4 @@ <script src="<%- url %>/js/cover.js" defer></script> </body> -</html>
\ No newline at end of file +</html> diff --git a/public/views/signin-modal.ejs b/public/views/signin-modal.ejs index 260ff423..4eb33bf3 100644 --- a/public/views/signin-modal.ejs +++ b/public/views/signin-modal.ejs @@ -28,6 +28,11 @@ <i class="fa fa-dropbox"></i> Sign in via Dropbox </a> <% } %> + <% if(gitlab) { %> + <a href="<%- url %>/auth/gitlab" class="btn btn-lg btn-block btn-social btn-soundcloud"> + <i class="fa fa-gitlab"></i> Sign in via GitLab + </a> + <% } %> </div> </div> </div> |