From 692903f1a10606b0e14d50623663a4c591c42674 Mon Sep 17 00:00:00 2001
From: Cheng-Han, Wu
Date: Wed, 20 Apr 2016 18:06:36 +0800
Subject: Support import from gist, fix some minor typo and issues

---
 public/views/body.ejs   | 29 ++++++++++++++++++++++++++---
 public/views/header.ejs |  4 ++++
 2 files changed, 30 insertions(+), 3 deletions(-)

(limited to 'public/views')

diff --git a/public/views/body.ejs b/public/views/body.ejs
index 044f7e6d..771da880 100644
--- a/public/views/body.ejs
+++ b/public/views/body.ejs
@@ -36,6 +36,7 @@
         <div id="toc-affix" class="ui-affix-toc ui-toc-dropdown unselectable hidden-print" data-spy="affix" style="top:51px;display:none;"></div>
     </div>
 </div>
+<!-- clipboard modal -->
 <div class="modal fade" id="clipboardModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
@@ -55,6 +56,7 @@
         </div>
     </div>
 </div>
+<!-- refresh modal -->
 <div class="modal fade" id="refreshModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
     <div class="modal-dialog modal-sm">
         <div class="modal-content">
@@ -102,7 +104,7 @@
             </div>
             <div class="modal-body" style="color:black;">
                 <h5>Sorry, you've reached the max length this note can be.</h5>
-                <strong>Please reduce the content or divided it to more notes, thank you!</strong>
+                <strong>Please reduce the content or divide it to more notes, thank you!</strong>
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-warning" data-dismiss="modal">OK</button>
@@ -121,11 +123,32 @@
             </div>
             <div class="modal-body" style="color:black;">
                 <h5></h5>
-                <a target="_blank"></a>
+                <a target="_blank" style="word-break: break-all;"></a>
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-default" data-dismiss="modal">OK</button>
             </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
+<!-- gist import modal -->
+<div class="modal fade" id="gistImportModal" 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 Gist</h4>
+            </div>
+            <div class="modal-body">
+                <input type="url" class="form-control" placeholder="Paste your gist url here... (like: https://gist.github.com/username/gistid)" id="gistImportModalContent">
+            </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="gistImportModalClear">Clear</button>
+                <button type="button" class="btn btn-primary" id="gistImportModalConfirm">Import</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 bf8f9f66..9e389ae6 100644
--- a/public/views/header.ejs
+++ b/public/views/header.ejs
@@ -48,6 +48,8 @@
                 </li>
                 <li role="presentation"><a role="menuitem" class="ui-import-google-drive" tabindex="-1" href="#" target="_self"><i class="fa fa-cloud-download fa-fw"></i> Google Drive</a>
                 </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-clipboard" href="#" data-toggle="modal" data-target="#clipboardModal"><i class="fa fa-clipboard fa-fw"></i> Clipboard</a>
                 </li>
                 <li class="divider"></li>
@@ -131,6 +133,8 @@
                     </li>
                     <li role="presentation"><a role="menuitem" class="ui-import-google-drive" tabindex="-1" href="#" target="_self"><i class="fa fa-cloud-download fa-fw"></i> Google Drive</a>
                     </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-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