From 079822dfecfba659a491034c447c679dab2424c7 Mon Sep 17 00:00:00 2001
From: Jason Croft
Date: Mon, 9 May 2016 16:27:35 -0400
Subject: Start extending to support GitLab authentication. Add necessary
 dependency. Add baseURL parameter for self-hosted GitLab Add necessary
 require. Add block for GitLab auth. Fix typo Update font-awesome dependency
 for GitLab icon. Use a color closer to GitLab orange. More direct TODO

---
 public/views/modal.ejs | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'public/views')

diff --git a/public/views/modal.ejs b/public/views/modal.ejs
index 260ff423..4eb33bf3 100644
--- a/public/views/modal.ejs
+++ b/public/views/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>
-- 
cgit v1.2.3


From 277bf60a2ea539645428360734f9f8d2e33e3631 Mon Sep 17 00:00:00 2001
From: Jason Croft
Date: Mon, 9 May 2016 17:06:44 -0400
Subject: Add GitLab options.

---
 public/views/header.ejs | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'public/views')

diff --git a/public/views/header.ejs b/public/views/header.ejs
index 40dee0b0..18369ba9 100644
--- a/public/views/header.ejs
+++ b/public/views/header.ejs
@@ -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" tabindex="-1" href="#" target="_blank"><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,8 @@
                 </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>
+                <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 +133,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" tabindex="-1" href="#" target="_blank"><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 +145,8 @@
                     </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>
+                    <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>
-- 
cgit v1.2.3


From 17d2249ec31bce28f79e8def4be1515ac465d29b Mon Sep 17 00:00:00 2001
From: Jason Croft
Date: Mon, 9 May 2016 22:37:51 -0400
Subject: Define snippet import modal

---
 public/views/body.ejs | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'public/views')

diff --git a/public/views/body.ejs b/public/views/body.ejs
index 771da880..23a3acef 100644
--- a/public/views/body.ejs
+++ b/public/views/body.ejs
@@ -151,4 +151,24 @@
         </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">&times;</span>
+                </button>
+                <h4 class="modal-title" id="myModalLabel">Import from Snippet</h4>
+            </div>
+            <div class="modal-body">
+                <input type="url" class="form-control" placeholder="Paste your snippet url here... (like: /projects/:id/snippets/:snippet_id)" id="snippetImportModalContent">
+            </div>
+            <div class="modal-footer">
+                <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">Import</button>
+            </div>
+        </div>
+    </div>
+</div>
 <%- include modal %>
\ No newline at end of file
-- 
cgit v1.2.3


From 9f401b3fa88aa60c435c548f807fbb0742aaa2e0 Mon Sep 17 00:00:00 2001
From: Jason Croft
Date: Wed, 11 May 2016 17:05:53 -0400
Subject: Fully-fleshed snippetImportModal

---
 public/views/body.ejs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'public/views')

diff --git a/public/views/body.ejs b/public/views/body.ejs
index 23a3acef..039690ef 100644
--- a/public/views/body.ejs
+++ b/public/views/body.ejs
@@ -158,15 +158,17 @@
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span>
                 </button>
-                <h4 class="modal-title" id="myModalLabel">Import from Snippet</h4>
+                <h4 class="modal-title" id="myModalLabel">Import from Snippet <i class="fa fa-refresh fa-spin" id="snippetImportModalLoading"></i></h4>
             </div>
             <div class="modal-body">
-                <input type="url" class="form-control" placeholder="Paste your snippet url here... (like: /projects/:id/snippets/:snippet_id)" id="snippetImportModalContent">
+                <input type="hidden" id="snippetImportModalAccessToken" />
+                <input type="hidden" id="snippetImportModalBaseURL" />
+                <input type="url" class="form-control" placeholder="Paste your snippet url here... (like: /projects/:id/snippets/:snippet_id)" id="snippetImportModalContent" disabled="disabled">
             </div>
             <div class="modal-footer">
                 <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">Import</button>
+                <button type="button" class="btn btn-primary" id="snippetImportModalConfirm" disabled="disabled">Import</button>
             </div>
         </div>
     </div>
-- 
cgit v1.2.3


From de998c4a0fcbadc4c0353c8e65d5769c271cfcd9 Mon Sep 17 00:00:00 2001
From: Jason Croft
Date: Wed, 11 May 2016 21:12:48 -0400
Subject: Check to make sure GitLab is configured before showing import option.

---
 public/views/header.ejs | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'public/views')

diff --git a/public/views/header.ejs b/public/views/header.ejs
index 18369ba9..051817dc 100644
--- a/public/views/header.ejs
+++ b/public/views/header.ejs
@@ -54,8 +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>
@@ -145,8 +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>
-- 
cgit v1.2.3


From c16345ab128288b92023e789f09cabb5197d1181 Mon Sep 17 00:00:00 2001
From: Jason Croft
Date: Thu, 12 May 2016 11:19:14 -0400
Subject: Can now select from available projects and snippets to build import
 URL.

---
 public/views/body.ejs | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

(limited to 'public/views')

diff --git a/public/views/body.ejs b/public/views/body.ejs
index 039690ef..a0b872d4 100644
--- a/public/views/body.ejs
+++ b/public/views/body.ejs
@@ -158,14 +158,30 @@
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span>
                 </button>
-                <h4 class="modal-title" id="myModalLabel">Import from Snippet <i class="fa fa-refresh fa-spin" id="snippetImportModalLoading"></i></h4>
+                <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" />
-                <input type="url" class="form-control" placeholder="Paste your snippet url here... (like: /projects/:id/snippets/:snippet_id)" id="snippetImportModalContent" disabled="disabled">
+                <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>
-- 
cgit v1.2.3


From 30e602a7400f3b38918a55f1470610b8d4ee49d7 Mon Sep 17 00:00:00 2001
From: Jason Croft
Date: Thu, 12 May 2016 12:28:08 -0400
Subject: Enable snippet exporting.

---
 public/views/body.ejs   | 45 +++++++++++++++++++++++++++++++++++++++++++++
 public/views/header.ejs |  4 ++--
 2 files changed, 47 insertions(+), 2 deletions(-)

(limited to 'public/views')

diff --git a/public/views/body.ejs b/public/views/body.ejs
index a0b872d4..f0b62c28 100644
--- a/public/views/body.ejs
+++ b/public/views/body.ejs
@@ -189,4 +189,49 @@
         </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">&times;</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 modal %>
\ No newline at end of file
diff --git a/public/views/header.ejs b/public/views/header.ejs
index 051817dc..ee89ddeb 100644
--- a/public/views/header.ejs
+++ b/public/views/header.ejs
@@ -43,7 +43,7 @@
                 </li>
                 <% } %>
                 <% if(typeof gitlab !== 'undefined' && gitlab) { %>
-                <li role="presentation"><a role="menuitem" class="ui-save-snippet" tabindex="-1" href="#" target="_blank"><i class="fa fa-gitlab fa-fw"></i> Snippet</a>
+                <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>
@@ -136,7 +136,7 @@
                     </li>
                     <% } %>
                     <% if(typeof gitlab !== 'undefined' && gitlab) { %>
-                    <li role="presentation"><a role="menuitem" class="ui-save-snippet" tabindex="-1" href="#" target="_blank"><i class="fa fa-gitlab fa-fw"></i> Snippet</a>
+                    <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>
-- 
cgit v1.2.3