Skip to content

Commit 0e47911

Browse files
YukaiiYukaii
committed
Merge branch 'master' into es6-integration
2 parents 74b04d0 + a669c20 commit 0e47911

22 files changed

Lines changed: 239 additions & 235 deletions

‎public/views/error.ejs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
<html lang="en">
33

44
<head>
5-
<%- include head %>
5+
<%- include hackmd/head %>
66
<link rel="stylesheet" href="<%- url %>/css/center.css">
77
</head>
88

99
<body>
10-
<%- include header %>
10+
<%- include hackmd/header %>
1111
<div class="container-fluid text-center">
1212
<div class="vertical-center-row">
1313
<h1><%- code %> <%- detail %> <small><%- msg %></small></h1>
1414
</div>
1515
</div>
16-
<%- include footer %>
16+
<%- include hackmd/footer %>
1717
</body>
1818

1919
</html>

‎public/views/hackmd.ejs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
<html lang="en">
33

44
<head>
5-
<%- include head %>
5+
<%- include hackmd/head %>
66
</head>
77

88
<body>
9-
<%- include header %>
10-
<%- include body %>
11-
<%- include footer %>
12-
<%- include foot %>
9+
<%- include hackmd/header %>
10+
<%- include hackmd/body %>
11+
<%- include hackmd/footer %>
12+
<%- include hackmd/foot %>
1313
</body>
1414

15-
</html>
15+
</html>

public/views/body.ejs renamed to public/views/hackmd/body.ejs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@
244244
</div>
245245
</div>
246246
</div>
247-
<%- include refresh-modal %>
248-
<%- include signin-modal %>
249-
<%- include help-modal %>
250-
<%- include revision-modal %>
247+
<%- include ../shared/refresh-modal %>
248+
<%- include ../shared/signin-modal %>
249+
<%- include ../shared/help-modal %>
250+
<%- include ../shared/revision-modal %>

public/views/foot.ejs renamed to public/views/hackmd/foot.ejs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
<script src="https://cdnjs.cloudflare.com/ajax/libs/gist-embed/2.6.0/gist-embed.min.js" integrity="sha256-KyF2D6xPIJUW5sUDSs93vWyZm+1RzIpKCexxElmxl8g=" crossorigin="anonymous" defer></script>
2121
<script src="https://cdnjs.cloudflare.com/ajax/libs/viz.js/1.4.1/viz.js" integrity="sha256-U0a9HpXT7zG0N3tVzo58B5S+QXUxo4FdBIjrBMYrxZI=" crossorigin="anonymous" defer></script>
2222
<script src="https://cdnjs.cloudflare.com/ajax/libs/1000hz-bootstrap-validator/0.11.8/validator.min.js" integrity="sha256-LHeY7YoYJ0SSXbCx7sR14Pqna+52moaH3bhv0Mjzd/M=" crossorigin="anonymous" defer></script>
23-
<%- include build/index-scripts %>
23+
<%- include ../build/index-scripts %>
2424
<% } else { %>
2525
<script src="<%- url %>/build/MathJax/MathJax.js" defer></script>
2626
<script src="<%- url %>/build/MathJax/config/TeX-AMS-MML_HTMLorMML.js" defer></script>
27-
<%- include build/index-pack-scripts %>
27+
<%- include ../build/index-pack-scripts %>
2828
<% } %>

public/views/footer.ejs renamed to public/views/hackmd/footer.ejs

File renamed without changes.

public/views/head.ejs renamed to public/views/hackmd/head.ejs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ionicons/2.0.1/css/ionicons.min.css" integrity="sha256-3iu9jgsy9TpTwXKb7bNQzqWekRX7pPK+2OLj3R922fo=" crossorigin="anonymous" />
1515
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/octicons/3.5.0/octicons.min.css" integrity="sha256-QiWfLIsCT02Sdwkogf6YMiQlj4NE84MKkzEMkZnMGdg=" crossorigin="anonymous" />
1616
<link rel="stylesheet" href='<%- url %>/build/emojify.js/dist/css/basic/emojify.min.css'>
17-
<%- include build/index-header %>
17+
<%- include ../build/index-header %>
1818
<% } else { %>
1919
<link rel="stylesheet" href='<%- url %>/build/emojify.js/dist/css/basic/emojify.min.css'>
20-
<%- include build/index-pack-header %>
20+
<%- include ../build/index-pack-header %>
2121
<% } %>
22-
<%- include polyfill %>
22+
<%- include ../shared/polyfill %>

public/views/header.ejs renamed to public/views/hackmd/header.ejs

File renamed without changes.

‎public/views/index.ejs‎

Lines changed: 5 additions & 211 deletions
Original file line numberDiff line numberDiff line change
@@ -2,220 +2,14 @@
22
<html lang="en">
33

44
<head>
5-
<meta charset="utf-8">
6-
<meta http-equiv="X-UA-Compatible" content="IE=edge">
7-
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
8-
<meta name="apple-mobile-web-app-capable" content="yes">
9-
<meta name="apple-mobile-web-app-status-bar-style" content="black">
10-
<meta name="mobile-web-app-capable" content="yes">
11-
<meta name="description" content="<%= __('Best way to write and share your knowledge in markdown.') %>">
12-
<meta name="keywords" content="Collaborative, Markdown, Notes">
13-
<title>HackMD - <%= __('Collaborative markdown notes') %></title>
14-
<link rel="icon" type="image/png" href="<%- url %>/favicon.png">
15-
<link rel="apple-touch-icon" href="<%- url %>/apple-touch-icon.png">
16-
<% if(useCDN) { %>
17-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha256-916EbMg70RQy9LHiGkXzG8hSg9EdNy97GazNG/aiY1w=" crossorigin="anonymous" />
18-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" integrity="sha256-eZrrJcwDc/3uDhsdt61sL2oOBY362qM3lon1gyExkL0=" crossorigin="anonymous" />
19-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-social/4.9.0/bootstrap-social.min.css" integrity="sha256-02JtFTurpwBjQJ6q13iJe82/NF0RbZlJroDegK5g87Y=" crossorigin="anonymous" />
20-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/select2/3.5.4/select2.min.css" integrity="sha256-ijlUKKj3hJCiiT2HWo1kqkI79NTEYpzOsw5Rs3k42dI=" crossorigin="anonymous" />
21-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/select2/3.5.4/select2-bootstrap.min.css" integrity="sha256-NAWFcNIZdH+TS1xpWujF/EB/Y8gwBbEOCoaK/eqaer8=" crossorigin="anonymous" />
22-
<%- include build/cover-header %>
23-
<% } else { %>
24-
<%- include build/cover-pack-header %>
25-
<% } %>
26-
<%- include polyfill %>
5+
<%- include index/head %>
276
</head>
287

298
<body>
30-
<div class="site-wrapper">
31-
<div class="site-wrapper-inner">
32-
<div class="cover-container">
33-
34-
<div class="masthead clearfix">
35-
<div class="inner">
36-
<h3 class="masthead-brand"></h3>
37-
<nav>
38-
<ul class="nav masthead-nav">
39-
<li class="ui-home<% if(!signin) { %> active<% } %>"><a href="#"><%= __('Intro') %></a>
40-
</li>
41-
<li class="ui-history<% if(signin) { %> active<% } %>"><a href="#"><%= __('History') %></a>
42-
</li>
43-
<div class="ui-signin" style="float: right; margin-top: 8px;<% if(signin) { %> display: none;<% } %>">
44-
<% if(allowAnonymous) { %>
45-
<a type="button" href="<%- url %>/new" class="btn btn-sm btn-link"><i class="fa fa-plus"></i> <%= __('New guest note') %></a>
46-
<% } %>
47-
<% if(facebook || twitter || github || gitlab || dropbox || google || ldap || email) { %>
48-
<button class="btn btn-sm btn-success ui-signin" data-toggle="modal" data-target=".signin-modal"><%= __('Sign In') %></button>
49-
<% } %>
50-
</div>
51-
<div class="ui-signout" style="float: right; margin-top: 8px;<% if(!signin) { %> display: none;<% } %>">
52-
<a type="button" href="<%- url %>/new" class="btn btn-sm btn-link"><i class="fa fa-plus"></i> <%= __('New note') %></a>
53-
<span class="ui-profile dropdown pull-right">
54-
<button id="profileLabel" class="btn btn-sm btn-link ui-profile-label" style="padding-right: 0;" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
55-
<img class="ui-avatar" width="20" height="20"><span class="hidden-xs hidden-sm">&ensp;<span class="ui-name"></span></span>&ensp;<i class="fa fa-caret-down"></i>
56-
</button>
57-
<ul class="dropdown-menu" aria-labelledby="profileLabel">
58-
<li><a href="<%- url %>/logout"><i class="fa fa-sign-out fa-fw"></i> <%= __('Sign Out') %></a></li>
59-
</ul>
60-
</span>
61-
</div>
62-
</ul>
63-
</nav>
64-
</div>
65-
</div>
66-
67-
<div id="home" class="section"<% if(signin) { %> style="display:none;"<% } %>>
68-
<div class="inner cover">
69-
<h1 class="cover-heading"><i class="fa fa-file-text"></i> HackMD</h1>
70-
<p class="lead">
71-
<%= __('Best way to write and share your knowledge in markdown.') %>
72-
</p>
73-
<% if (infoMessage && infoMessage.length > 0) { %>
74-
<div class="alert alert-info" style="max-width: 400px; margin: 0 auto;"><%= infoMessage %></div>
75-
<% } %>
76-
<% if (errorMessage && errorMessage.length > 0) { %>
77-
<div class="alert alert-danger" style="max-width: 400px; margin: 0 auto;"><%= errorMessage %></div>
78-
<% } %>
79-
<% if(facebook || twitter || github || gitlab || dropbox || google || ldap || email) { %>
80-
<span class="ui-signin">
81-
<br>
82-
<a type="button" class="btn btn-lg btn-success ui-signin" data-toggle="modal" data-target=".signin-modal" style="min-width: 200px;"><%= __('Sign In') %></a>
83-
</span>
84-
<span class="ui-or"><%= __('or') %></span>
85-
<% } %>
86-
<span class="ui-signin">
87-
<a type="button" href="<%- url %>/features" class="btn btn-lg btn-primary" style="min-width: 200px;"><%= __('Explore all features') %></a>
88-
<br>
89-
<br>
90-
<img src="<%- url %>/screenshot.png" class="screenshot ui-signin">
91-
</span>
92-
<div class="lead row" style="width: 90%; margin: 0 auto;">
93-
<div class="col-md-4 inner">
94-
<a href="<%- url %>/features#share-notes">
95-
<i class="fa fa-bolt fa-3x"></i>
96-
<h4><%= __('Collaborate with URL') %></h4>
97-
</a>
98-
</div>
99-
<div class="col-md-4 inner">
100-
<a href="<%- url %>/features#mathjax">
101-
<i class="fa fa-bar-chart fa-3x"></i>
102-
<h4><%= __('Support charts and MathJax') %></h4>
103-
</a>
104-
</div>
105-
<div class="col-md-4 inner">
106-
<a href="<%- url %>/features#slide-mode">
107-
<i class="fa fa-tv fa-3x"></i>
108-
<h4><%= __('Support slide mode') %></h4>
109-
</a>
110-
</div>
111-
</div>
112-
</div>
113-
</div>
114-
115-
<div id="history" class="section"<% if(!signin) { %> style="display:none;"<% } %>>
116-
<div class="ui-signin"<% if(signin) { %> style="display:none;"<% } %>>
117-
<p><%= __('Below is the history from browser') %></p>
118-
</div>
119-
<br>
120-
<form class="form-inline">
121-
<div class="form-group" style="vertical-align: bottom;">
122-
<input class="form-control ui-use-tags" placeholder="<%= __('Select tags...') %>" />
123-
</div>
124-
<div class="form-group">
125-
<input class="search form-control" placeholder="<%= __('Search keyword...') %>" />
126-
</div>
127-
<a href="#" class="sort btn btn-default" data-sort="text" title="<%= __('Sort by title') %>">
128-
<%= __('Title') %>
129-
</a>
130-
<a href="#" class="sort btn btn-default" data-sort="timestamp" title="<%= __('Sort by time') %>">
131-
<%= __('Time') %>
132-
</a>
133-
<span class="hidden-xs hidden-sm">
134-
<a href="#" class="btn btn-default ui-save-history" title="<%= __('Export history') %>"><i class="fa fa-save"></i></a>
135-
<span class="btn btn-default btn-file ui-open-history" title="<%= __('Import history') %>">
136-
<i class="fa fa-folder-open-o"></i><input type="file" />
137-
</span>
138-
<a href="#" class="btn btn-default ui-clear-history" title="<%= __('Clear history') %>" data-toggle="modal" data-target=".delete-modal"><i class="fa fa-trash-o"></i></a>
139-
</span>
140-
<a href="#" class="btn btn-default ui-refresh-history" title="<%= __('Refresh history') %>"><i class="fa fa-refresh"></i></a>
141-
</form>
142-
<h4 class="ui-nohistory" style="display:none;">
143-
<%= __('No history') %>
144-
</h4>
145-
<a href="#" class="btn btn-primary ui-import-from-browser" style="display:none;"><%= __('Import from browser') %></a>
146-
<ul id="history-list" class="list">
147-
</ul>
148-
<ul class="pagination"></ul>
149-
</div>
150-
151-
<div class="mastfoot">
152-
<div class="inner">
153-
<h6 class="social-foot">
154-
<iframe src="//ghbtns.com/github-btn.html?user=hackmdio&repo=hackmd&type=star&count=true" frameborder="0" scrolling="0" width="104px" height="20px"></iframe>
155-
</h6>
156-
<p>
157-
&copy; 2017 <a href="https://www.facebook.com/hackmdio" target="_blank"><i class="fa fa-facebook-square"></i> HackMD</a> | <a href="<%- url %>/s/release-notes" target="_blank"><%= __('Releases') %></a>
158-
</p>
159-
<select class="ui-locale">
160-
<option value="en">English</option>
161-
<option value="zh">中文</option>
162-
<option value="fr">Français</option>
163-
<option value="de">Deutsch</option>
164-
<option value="ja">日本語</option>
165-
<option value="es">Español</option>
166-
<option value="el">Ελληνικά</option>
167-
<option value="pt">Português</option>
168-
<option value="it">italiano</option>
169-
<option value="tr">Türkçe</option>
170-
<option value="ru">Русский</option>
171-
<option value="nl">Nederlands</option>
172-
<option value="hr">hrvatski jezik</option>
173-
<option value="pl">język polski</option>
174-
<option value="uk">Українська</option>
175-
<option value="hi">हिन्दी</option>
176-
<option value="sv">svenska</option>
177-
<option value="eo">Esperanto</option>
178-
</select>
179-
</div>
180-
</div>
181-
</div>
182-
</div>
183-
</div>
184-
<!-- delete modal -->
185-
<div class="modal fade delete-modal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
186-
<div class="modal-dialog modal-sm">
187-
<div class="modal-content">
188-
<div class="modal-header">
189-
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span>
190-
</button>
191-
<h4 class="modal-title" id="myModalLabel"><%= __('Are you sure?') %></h4>
192-
</div>
193-
<div class="modal-body" style="color:black;">
194-
<h5 class="ui-delete-modal-msg"></h5>
195-
<strong class="ui-delete-modal-item"></strong>
196-
</div>
197-
<div class="modal-footer">
198-
<button type="button" class="btn btn-default" data-dismiss="modal"><%= __('Cancel') %></button>
199-
<button type="button" class="btn btn-danger ui-delete-modal-confirm"><%= __('Yes, do it!') %></button>
200-
</div>
201-
</div>
202-
</div>
203-
</div>
204-
<%- include signin-modal %>
205-
206-
<% if(useCDN) { %>
207-
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.1/jquery.min.js" integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8=" crossorigin="anonymous"></script>
208-
<script src="https://cdnjs.cloudflare.com/ajax/libs/velocity/1.4.0/velocity.min.js" integrity="sha256-bhm0lgEt6ITaZCDzZpkr/VXVrLa5RP4u9v2AYsbzSUk=" crossorigin="anonymous" defer></script>
209-
<script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha256-U5ZEeKfGNOja007MMD3YBI0A3OSZOQbeG6z2f2Y0hu8=" crossorigin="anonymous" defer></script>
210-
<script src="https://cdnjs.cloudflare.com/ajax/libs/list.pagination.js/0.1.1/list.pagination.min.js" integrity="sha256-WwTza96H3BgcQTfEfxX7MFaFc/dZA0QrPRKDRLdFHJo=" crossorigin="anonymous" defer></script>
211-
<script src="https://cdnjs.cloudflare.com/ajax/libs/select2/3.5.2/select2.min.js" integrity="sha256-HzzZFiY4t0PIv02Tm8/R3CVvLpcjHhO1z/YAUCp4oQ4=" crossorigin="anonymous" defer></script>
212-
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.17.1/moment-with-locales.min.js" integrity="sha256-vvT7Ok9u6GbfnBPXnbM6FVDEO8E1kTdgHOFZOAXrktA=" crossorigin="anonymous" defer></script>
213-
<script src="https://cdnjs.cloudflare.com/ajax/libs/js-url/2.3.0/url.min.js" integrity="sha256-HOZJz4x+1mn1Si84WT5XKXPtOlTytmZLnMb6n1v4+5Q=" crossorigin="anonymous" defer></script>
214-
<script src="https://cdnjs.cloudflare.com/ajax/libs/1000hz-bootstrap-validator/0.11.8/validator.min.js" integrity="sha256-LHeY7YoYJ0SSXbCx7sR14Pqna+52moaH3bhv0Mjzd/M=" crossorigin="anonymous" defer></script>
215-
<%- include build/cover-scripts %>
216-
<% } else { %>
217-
<%- include build/cover-pack-scripts %>
218-
<% } %>
9+
<%- include index/header %>
10+
<%- include index/body %>
11+
<%- include index/footer %>
12+
<%- include index/foot %>
21913
</body>
22014

22115
</html>

0 commit comments

Comments
 (0)