Jump to 0.3.1

5 files changed, 132 insertions, 16 deletions

diff --git a/public/views/body.ejs b/public/views/body.ejs
index 4237746b..bf713cba 100644
--- a/public/views/body.ejs
+++ b/public/views/body.ejs
@@ -3,7 +3,31 @@
         <textarea id="textit"></textarea>
     </div>
     <div class="ui-view-area">
-        <div class="markdown-body container-fluid"></div>
+        <div class="ui-infobar container-fluid">
+            <small>
+                <span class="ui-lastchange text-uppercase"></span>
+                <span class="ui-permission dropdown pull-right">
+                    <a id="permissionLabel" class="ui-permission-label text-uppercase" data-target="#" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
+                    </a>
+                    <ul class="dropdown-menu" aria-labelledby="permissionLabel">
+                        <li class="ui-permission-freely"><a><i class="fa fa-leaf fa-fw"></i> Freely - Anyone can edit</a></li>
+                        <li class="ui-permission-editable"><a><i class="fa fa-pencil fa-fw"></i> Editable - Signed people can edit</a></li>
+                        <li class="ui-permission-locked"><a><i class="fa fa-lock fa-fw"></i> Locked - Only owner can edit</a></li>
+                    </ul>
+                </span>
+            </small>
+        </div>
+        <div id="doc" class="markdown-body container-fluid"></div>
+        <div class="ui-toc dropup" style="display:none;">
+            <div class="pull-right dropdown">
+                <a id="tocLabel" class="ui-toc-label btn btn-default" data-target="#" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false" title="Table of content">
+                    <i class="fa fa-bars"></i>
+                </a>
+                <ul id="toc" class="ui-toc-dropdown dropdown-menu" aria-labelledby="tocLabel">
+                </ul>
+            </div>
+        </div>
+        <div id="toc-affix" class="ui-affix-toc ui-toc-dropdown" data-spy="affix" style="top:50px;display:none;"></div>
     </div>
 </div>
 <div class="modal fade" id="clipboardModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
@@ -24,4 +48,66 @@
             </div>
         </div>
     </div>
+</div>
+<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">
+            <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">This page need refresh</h4>
+            </div>
+            <div class="modal-body">
+                <h5>This page have a mismatch client version or incorrect user state.</h5>
+                <strong>Please refresh this page.</strong>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-primary" id="refreshModalRefresh">Refresh</button>
+            </div>
+        </div>
+    </div>
+</div>
+<!-- signin modal -->
+<div class="modal fade signin-modal" tabindex="-1" role="dialog" aria-labelledby="mySmallModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-sm">
+        <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="mySmallModalLabel">Please sign in to edit</h4>
+            </div>
+            <div class="modal-body">
+                <a href="/auth/facebook" class="btn btn-lg btn-block btn-social btn-facebook">
+                    <i class="fa fa-facebook"></i> Sign in via Facebook
+                </a>
+                <a href="/auth/twitter" class="btn btn-lg btn-block btn-social btn-twitter">
+                    <i class="fa fa-twitter"></i> Sign in via Twitter
+                </a>
+                <a href="/auth/github" class="btn btn-lg btn-block btn-social btn-github">
+                    <i class="fa fa-github"></i> Sign in via GitHub
+                </a>
+                <a href="/auth/dropbox" class="btn btn-lg btn-block btn-social btn-dropbox">
+                    <i class="fa fa-dropbox"></i> Sign in via Dropbox
+                </a>
+            </div>
+        </div>
+    </div>
+</div>
+<!-- locked modal -->
+<div class="modal fade locked-modal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-sm">
+        <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"><i class="fa fa-lock"></i> This note is locked</h4>
+            </div>
+            <div class="modal-body" style="color:black;">
+                <h5>Sorry, only owner can edit this note.</h5>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-danger" data-dismiss="modal">OK</button>
+            </div>
+        </div>
+    </div>
 </div>
\ No newline at end of file
diff --git a/public/views/foot.ejs b/public/views/foot.ejs
index 8ef3cc21..0e808e6a 100644
--- a/public/views/foot.ejs
+++ b/public/views/foot.ejs
@@ -1,5 +1,6 @@
 <script src="/vendor/spin.min.js" defer></script>
 <script src="/vendor/jquery-1.11.2.min.js" defer></script>
+<script src="/vendor/jquery.mousewheel.min.js" defer></script>
 <script src="/vendor/bootstrap/js/bootstrap.min.js" defer></script>
 <script src="/vendor/greensock-js/TweenMax.min.js" defer></script>
 <script src="/vendor/greensock-js/jquery.gsap.min.js" defer></script>
@@ -13,6 +14,7 @@
 <script src="/vendor/remarkable-regex.js" defer></script>
 <script src="/vendor/gist-embed.js" defer></script>
 <script src="/vendor/lz-string.min.js" defer></script>
+<script src="/vendor/string.min.js" defer></script>
 <script src="/vendor/highlight-js/highlight.min.js" defer></script>
 <script src="/vendor/js.cookie.js" defer></script>
 <script src="/vendor/moment-with-locales.js" defer></script>
@@ -29,6 +31,9 @@
 <script src="/vendor/idle.js" defer></script>
 <script src="/vendor/visibility-1.2.1.min.js" defer></script>
 <script src="/vendor/list.min.js" defer></script>
+<script src="/vendor/md5.min.js" defer></script>
+<script src="/vendor/md-toc.js" defer></script>
+<script src="/vendor/showup/showup.js" defer></script>
 <script type="text/javascript" src="https://www.dropbox.com/static/api/2/dropins.js" id="dropboxjs" data-app-key="rdoizrlnkuha23r" async defer></script>
 <script type="text/x-mathjax-config">
     MathJax.Hub.Config({ messageStyle: "none", skipStartupTypeset: true ,tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']], processEscapes: true }});
diff --git a/public/views/head.ejs b/public/views/head.ejs
index cb48e291..0518ebc7 100644
--- a/public/views/head.ejs
+++ b/public/views/head.ejs
@@ -4,9 +4,7 @@
 <meta name="apple-mobile-web-app-capable" content="yes">
 <meta name="apple-mobile-web-app-status-bar-style" content="black">
 <meta name="mobile-web-app-capable" content="yes">
-<meta name="description" content="Realtime collaborative markdown notes on all platforms.">
-<meta name="author" content="jackycute">
-<title>HackMD - Collaborative notes</title>
+<title><%- title %></title>
 <link rel="icon" type="image/png" href="/favicon.png">
 <link rel="apple-touch-icon" href="/apple-touch-icon.png">
 <link rel="stylesheet" href="/vendor/bootstrap/css/bootstrap.min.css">
@@ -19,8 +17,10 @@
 <link rel="stylesheet" href="/vendor/codemirror/theme/monokai.css">
 <link rel="stylesheet" href="/css/github-extract.css">
 <link rel="stylesheet" href="/css/gist.css">
-<link rel="stylesheet" href="/vendor/highlight-js/github.min.css">
+<link rel="stylesheet" href="/vendor/highlight-js/github-gist.min.css">
 <link rel="stylesheet" href="/vendor/emojify/css/emojify.min.css">
+<link rel="stylesheet" href="/vendor/showup/showup.css">
+<link rel="stylesheet" href="/css/bootstrap-social.css">
 <link rel="stylesheet" href="/css/markdown.css">
 <link rel="stylesheet" href="/css/index.css">
 <link rel="stylesheet" href="/css/extra.css">
diff --git a/public/views/header.ejs b/public/views/header.ejs
index b8f5074e..7aee5351 100644
--- a/public/views/header.ejs
+++ b/public/views/header.ejs
@@ -13,15 +13,18 @@
             <ul class="dropdown-menu list" role="menu" aria-labelledby="menu">
             </ul>
         </div>
-        <a class="navbar-brand" href="./"><i class="fa fa-file-text"></i> HackMD</a>
+        <a class="navbar-brand" href="/"><i class="fa fa-file-text"></i> HackMD</a>
         <div class="nav-mobile pull-right visible-xs">
+            <span class="btn btn-link btn-file ui-upload-image" title="Upload Image" style="display:none;">
+                <i class="fa fa-camera"></i><input type="file" accept="image/*" name="upload" multiple>
+            </span>
             <a data-target="#" data-toggle="dropdown" class="btn btn-link">
                 <i class="fa fa-caret-down"></i>
             </a>
             <ul class="dropdown-menu" role="menu" aria-labelledby="menu">
                 <li role="presentation"><a role="menuitem" class="ui-new" tabindex="-1" href="./new" target="_blank"><i class="fa fa-plus fa-fw"></i> New</a>
                 </li>
-                <li role="presentation"><a role="menuitem" class="ui-pretty" tabindex="-1" href="#" target="_blank"><i class="fa fa-share-alt fa-fw"></i> Share</a>
+                <li role="presentation"><a role="menuitem" class="ui-share" tabindex="-1" href="#" target="_blank"><i class="fa fa-share-alt fa-fw"></i> Share</a>
                 </li>
                 <li class="divider"></li>
                 <li class="dropdown-header">Save</li>
@@ -62,6 +65,9 @@
             <a href="https://www.facebook.com/messages/866415986748945" class="btn btn-link ui-feedback" title="Feedback" target="_blank">
                 <i class="fa fa-bullhorn"></i>
             </a>
+            <span class="btn btn-link btn-file ui-upload-image" title="Upload Image" style="display:none;">
+                <i class="fa fa-camera"></i><input type="file" accept="image/*" name="upload" multiple>
+            </span>
         </ul>
         <ul class="nav navbar-nav navbar-right">
             <li id="online-user-list">
@@ -79,7 +85,7 @@
                 </a>
             </li>
             <li>
-                <a href="#" target="_blank" class="ui-pretty">
+                <a href="#" target="_blank" class="ui-share">
                     <i class="fa fa-share-alt"></i> Share
                 </a>
             </li>
diff --git a/public/views/pretty.ejs b/public/views/pretty.ejs
index 690c7604..cc4f80d2 100644
--- a/public/views/pretty.ejs
+++ b/public/views/pretty.ejs
@@ -4,43 +4,62 @@
 <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <title>
-        HackMD - Collaborative notes
-    </title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="mobile-web-app-capable" content="yes">
+    <title><%- title %></title>
     <link rel="icon" type="image/png" href="<%- url %>/favicon.png">
 <link rel="apple-touch-icon" href="<%- url %>/apple-touch-icon.png">
     <link rel="stylesheet" href='<%- url %>/vendor/bootstrap/css/bootstrap.min.css'>
     <link rel="stylesheet" href='<%- url %>/vendor/font-awesome/css/font-awesome.min.css'>
     <link rel="stylesheet" href='<%- url %>/css/github-extract.css'>
     <link rel="stylesheet" href='<%- url %>/css/gist.css'>
-    <link rel="stylesheet" href='<%- url %>/vendor/highlight-js/github.min.css'>
+    <link rel="stylesheet" href='<%- url %>/vendor/highlight-js/github-gist.min.css'>
     <link rel="stylesheet" href='<%- url %>/css/markdown.css'>
     <link rel="stylesheet" href='<%- url %>/vendor/emojify/css/emojify.min.css'>
     <link rel="stylesheet" href='<%- url %>/css/extra.css'>
     <link rel="stylesheet" href='<%- url %>/css/site.css'>
 </head>
 
-<body>
-    <div class="container markdown-body" style="display:none;">
+<body style="display:none;">
+    <div class="ui-infobar container-fluid">
+        <small>
+            <span class="ui-lastchange text-uppercase"><%- updatetime %></span>
+            <span class="pull-right"><%- viewcount %> views <a href="#" class="ui-edit" title="Edit this note"><i class="fa fa-pencil"></i></a></span>
+        </small>
+    </div>
+    <div id="doc" class="container markdown-body">
 <%- body %>
     </div>
+    <div class="ui-toc dropup" style="display:none;">
+        <div class="pull-right dropdown">
+            <a id="tocLabel" class="ui-toc-label btn btn-default" data-target="#" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false" title="Table of content">
+                <i class="fa fa-bars"></i>
+            </a>
+            <ul id="toc" class="ui-toc-dropdown dropdown-menu" aria-labelledby="tocLabel">
+            </ul>
+        </div>
+    </div>
+    <div id="toc-affix" class="ui-affix-toc ui-toc-dropdown" data-spy="affix" style="display:none;"></div>
 </body>
 
 </html>
-<!--<script src="<%- url %>/js/ga.js" async defer></script>-->
-<!--<script src="<%- url %>/js/newrelic.js" async defer></script>-->
 <script src="<%- url %>/vendor/jquery-1.11.2.min.js" defer></script>
+<script src="<%- url %>/vendor/bootstrap/js/bootstrap.min.js" defer></script>
 <script src="<%- url %>/vendor/lz-string.min.js" defer></script>
 <script src="<%- url %>/vendor/remarkable.min.js" defer></script>
 <script src="<%- url %>/vendor/remarkable-regex.js" defer></script>
 <script src="<%- url %>/vendor/gist-embed.js" defer></script>
 <script src="<%- url %>/vendor/string.min.js" defer></script>
 <script src="<%- url %>/vendor/highlight-js/highlight.min.js" defer></script>
+<script src="<%- url %>/vendor/moment-with-locales.js" defer></script>
 <script src="<%- url %>/vendor/emojify/js/emojify.min.js" defer></script>
 <script src="<%- url %>/vendor/raphael-min.js" defer></script>
 <script src="<%- url %>/vendor/lodash.min.js" defer></script>
 <script src="<%- url %>/vendor/sequence-diagrams/sequence-diagram-min.js" defer></script>
 <script src="<%- url %>/vendor/flowchart/flowchart-1.4.0.min.js" defer></script>
+<script src="<%- url %>/vendor/md-toc.js" defer></script>
 <script type="text/x-mathjax-config">
     MathJax.Hub.Config({ messageStyle: "none", skipStartupTypeset: true ,tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']], processEscapes: true }});
 </script>