diff options
Diffstat (limited to 'public')
-rw-r--r-- | public/docs/features.md | 2 | ||||
-rw-r--r-- | public/js/index.js | 2 | ||||
-rw-r--r-- | public/js/lib/editor/ui-elements.js | 3 | ||||
-rw-r--r-- | public/views/hedgedoc/head.ejs | 4 | ||||
-rw-r--r-- | public/views/hedgedoc/header.ejs | 8 | ||||
-rw-r--r-- | public/views/html.hbs | 8 | ||||
-rw-r--r-- | public/views/index/body.ejs | 2 | ||||
-rw-r--r-- | public/views/index/head.ejs | 2 | ||||
-rw-r--r-- | public/views/pretty.ejs | 5 | ||||
-rw-r--r-- | public/views/slide.ejs | 3 |
10 files changed, 14 insertions, 25 deletions
diff --git a/public/docs/features.md b/public/docs/features.md index 8c88d7ae..378b81dd 100644 --- a/public/docs/features.md +++ b/public/docs/features.md @@ -7,7 +7,7 @@ This means that you can write notes with other people on your **desktop**, **tab You can sign-in via multiple auth providers like **Facebook**, **Twitter**, **GitHub** and many more on the [*homepage*](/). If you experience any *issues*, feel free to report it on [**GitHub**](https://github.com/hedgedoc/hedgedoc/issues). -Or meet us on [**Matrix.org**](https://matrix.to/#/#hedgedoc:matrix.org) for dev-talk and interactive help. +Or meet us on [**Matrix**](https://chat.hedgedoc.org) for dev-talk and interactive help. **Thank you very much!** ## Workspace diff --git a/public/js/index.js b/public/js/index.js index 9946e6fd..92acd130 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -941,8 +941,6 @@ ui.toolbar.download.rawhtml.click(function (e) { e.stopPropagation() exportToRawHTML(ui.area.markdown) }) -// pdf -ui.toolbar.download.pdf.attr('download', '').attr('href', noteurl + '/pdf') // export to dropbox ui.toolbar.export.dropbox.click(function (event) { event.preventDefault() diff --git a/public/js/lib/editor/ui-elements.js b/public/js/lib/editor/ui-elements.js index ce19436b..b1e3b5cb 100644 --- a/public/js/lib/editor/ui-elements.js +++ b/public/js/lib/editor/ui-elements.js @@ -17,8 +17,7 @@ export const getUIElements = () => ({ download: { markdown: $('.ui-download-markdown'), html: $('.ui-download-html'), - rawhtml: $('.ui-download-raw-html'), - pdf: $('.ui-download-pdf-beta') + rawhtml: $('.ui-download-raw-html') }, export: { dropbox: $('.ui-save-dropbox'), diff --git a/public/views/hedgedoc/head.ejs b/public/views/hedgedoc/head.ejs index e7b13e8a..f7e4c8fd 100644 --- a/public/views/hedgedoc/head.ejs +++ b/public/views/hedgedoc/head.ejs @@ -9,14 +9,12 @@ <% if (opengraph.hasOwnProperty(og) && opengraph[og].trim() !== '') { %> <meta property="og:<%- og %>" content="<%- opengraph[og] %>"> <% }} if (!opengraph.hasOwnProperty('image')) { %> -<meta property="og:image" content="<%- serverURL %>/icons/android-chrome-512x512"> +<meta property="og:image" content="<%- serverURL %>/icons/android-chrome-512x512.png"> <meta property="og:image:alt" content="HedgeDoc logo"> <meta property="og:image:type" content="image/png"> <% } %> <base href="<%- serverURL %>/"> <title><%= title %></title> -<link rel="icon" type="image/png" href="<%- serverURL %>/favicon.png"> -<link rel="apple-touch-icon" href="<%- serverURL %>/apple-touch-icon.png"> <% if(useCDN) { %> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.4.0/css/bootstrap.min.css" integrity="sha256-H0KfTigpUV+0/5tn2HXC0CPwhhDhWgSawJdnFd0CGCo=" crossorigin="anonymous" /> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/fork-awesome/1.1.3/css/fork-awesome.min.css" integrity="sha256-ZhApazu+kejqTYhMF+1DzNKjIzP7KXu6AzyXcC1gMus=" crossorigin="anonymous" /> diff --git a/public/views/hedgedoc/header.ejs b/public/views/hedgedoc/header.ejs index f700cd5b..ecf96e42 100644 --- a/public/views/hedgedoc/header.ejs +++ b/public/views/hedgedoc/header.ejs @@ -66,10 +66,6 @@ </li> <li role="presentation"><a role="menuitem" class="ui-download-raw-html" tabindex="-1" href="#" target="_self"><i class="fa fa-file-code-o fa-fw"></i> <%= __('Raw HTML') %></a> </li> - <% if(typeof allowPDFExport !== 'undefined' && allowPDFExport) {%> - <li role="presentation"><a role="menuitem" class="ui-download-pdf-beta" tabindex="-1" href="#" target="_self"><i class="fa fa-file-pdf-o fa-fw"></i> PDF (Beta)</a> - </li> - <% } %> <li class="divider"></li> <li role="presentation"><a role="menuitem" class="ui-help" href="#" data-toggle="modal" data-target=".help-modal"><i class="fa fa-question-circle fa-fw"></i> Help</a> </li> @@ -165,10 +161,6 @@ </li> <li role="presentation"><a role="menuitem" class="ui-download-raw-html" tabindex="-1" href="#" target="_self"><i class="fa fa-file-code-o fa-fw"></i> <%= __('Raw HTML') %></a> </li> - <% if(typeof allowPDFExport !== 'undefined' && allowPDFExport) {%> - <li role="presentation"><a role="menuitem" class="ui-download-pdf-beta" tabindex="-1" href="#" target="_self"><i class="fa fa-file-pdf-o fa-fw"></i> PDF (Beta)</a> - </li> - <% } %> </ul> </li> </ul> diff --git a/public/views/html.hbs b/public/views/html.hbs index 8e91b7b2..7ac97241 100644 --- a/public/views/html.hbs +++ b/public/views/html.hbs @@ -12,8 +12,12 @@ <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="apple-touch-icon" sizes="180x180" href="{{{url}}}/icons/apple-touch-icon.png"> + <link rel="icon" type="image/png" sizes="32x32" href="{{{url}}}/icons/favicon-32x32.png"> + <link rel="icon" type="image/png" sizes="16x16" href="{{{url}}}/icons/favicon-16x16.png"> + <link rel="manifest" href="{{{url}}}/icons/site.webmanifest"> + <link rel="mask-icon" href="{{{url}}}/icons/safari-pinned-tab.svg" color="#b51f08"> + <link rel="shortcut icon" href="{{{url}}}/icons/favicon.ico"> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.4.0/css/bootstrap.min.css" integrity="sha256-H0KfTigpUV+0/5tn2HXC0CPwhhDhWgSawJdnFd0CGCo=" crossorigin="anonymous" /> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/fork-awesome/1.1.3/css/fork-awesome.min.css" integrity="sha256-ZhApazu+kejqTYhMF+1DzNKjIzP7KXu6AzyXcC1gMus=" crossorigin="anonymous" /> diff --git a/public/views/index/body.ejs b/public/views/index/body.ejs index 6176cb6e..d3552c75 100644 --- a/public/views/index/body.ejs +++ b/public/views/index/body.ejs @@ -162,7 +162,7 @@ <%- __('Powered by %s', '<a href="https://hedgedoc.org">HedgeDoc</a>') %> | <a href="<%- serverURL %>/s/release-notes" target="_blank" rel="noopener"><%= __('Releases') %></a> | <a href="<%- sourceURL %>" target="_blank" rel="noopener"><%= __('Source Code') %></a><% if(imprint) { %> | <a href="<%- serverURL %>/s/imprint" target="_blank" rel="noopener"><%= __('Imprint') %></a><% } %><% if(privacyStatement) { %> | <a href="<%- serverURL %>/s/privacy" target="_blank" rel="noopener"><%= __('Privacy') %></a><% } %><% if(termsOfUse) { %> | <a href="<%- serverURL %>/s/terms-of-use" target="_blank" rel="noopener"><%= __('Terms of Use') %></a><% } %> </p> <h6 class="social-foot"> - <%- __('Follow us on %s and %s.', '<a href="https://github.com/hedgedoc/hedgedoc" target="_blank" rel="noopener"><i class="fa fa-github"></i> GitHub</a>, <a href="https://community.hedgedoc.org" target="_blank" rel="noopener"><i class="fa fa-users" aria-hidden="true"></i> Discourse</a>, <a href="https://matrix.to/#/#hedgedoc:matrix.org" target="_blank" rel="noopener"><i class="fa fa-comments"></i> Matrix</a>, <a href="https://social.hedgedoc.org/mastodon" target="_blank" rel="noopener"><i class="fa fa-mastodon"></i> Mastodon</a>', '<a href="https://translate.hedgedoc.org" target="_blank" rel="noopener"><i class="fa fa-globe"></i> POEditor</a>') %> + <%- __('Follow us on %s and %s.', '<a href="https://github.com/hedgedoc/hedgedoc" target="_blank" rel="noopener"><i class="fa fa-github"></i> GitHub</a>, <a href="https://community.hedgedoc.org" target="_blank" rel="noopener"><i class="fa fa-users" aria-hidden="true"></i> Discourse</a>, <a href="https://chat.hedgedoc.org" target="_blank" rel="noopener"><i class="fa fa-comments"></i> Matrix</a>, <a href="https://social.hedgedoc.org/mastodon" target="_blank" rel="noopener"><i class="fa fa-mastodon"></i> Mastodon</a>', '<a href="https://translate.hedgedoc.org" target="_blank" rel="noopener"><i class="fa fa-globe"></i> POEditor</a>') %> </h6> </div> </div> diff --git a/public/views/index/head.ejs b/public/views/index/head.ejs index 2b751d34..900d6324 100644 --- a/public/views/index/head.ejs +++ b/public/views/index/head.ejs @@ -11,7 +11,7 @@ <meta property="og:description" content="<%= __('Best way to write and share your knowledge in markdown.') %>"> <meta property="og:type" content="website"> <meta property="og:url" content="<%- serverURL %>"> -<meta property="og:image" content="<%- serverURL %>/icons/android-chrome-512x512"> +<meta property="og:image" content="<%- serverURL %>/icons/android-chrome-512x512.png"> <meta property="og:image:alt" content="HedgeDoc logo"> <meta property="og:image:type" content="image/png"> <base href="<%- serverURL %>/"> diff --git a/public/views/pretty.ejs b/public/views/pretty.ejs index d9221c93..074b181b 100644 --- a/public/views/pretty.ejs +++ b/public/views/pretty.ejs @@ -18,14 +18,13 @@ <% if (opengraph.hasOwnProperty(og) && opengraph[og].trim() !== '') { %> <meta property="og:<%= og %>" content="<%= opengraph[og] %>"> <% }} if (!opengraph.hasOwnProperty('image')) { %> - <meta property="og:image" content="<%- serverURL %>/icons/android-chrome-512x512"> + <meta property="og:image" content="<%- serverURL %>/icons/android-chrome-512x512.png"> <meta property="og:image:alt" content="HedgeDoc logo"> <meta property="og:image:type" content="image/png"> <% } %> <base href="<%- serverURL %>/"> <title><%= title %></title> - <link rel="icon" type="image/png" href="<%- serverURL %>/favicon.png"> - <link rel="apple-touch-icon" href="<%- serverURL %>/apple-touch-icon.png"> + <%- include includes/favicon.ejs %> <% if(useCDN) { %> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.4.0/css/bootstrap.min.css" integrity="sha256-H0KfTigpUV+0/5tn2HXC0CPwhhDhWgSawJdnFd0CGCo=" crossorigin="anonymous" /> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/fork-awesome/1.1.3/css/fork-awesome.min.css" integrity="sha256-ZhApazu+kejqTYhMF+1DzNKjIzP7KXu6AzyXcC1gMus=" crossorigin="anonymous" /> diff --git a/public/views/slide.ejs b/public/views/slide.ejs index 963091a7..b88fe5a2 100644 --- a/public/views/slide.ejs +++ b/public/views/slide.ejs @@ -13,8 +13,7 @@ <% } %> <base href="<%- serverURL %>/"> <title><%= title %></title> - <link rel="icon" type="image/png" href="<%- serverURL %>/favicon.png"> - <link rel="apple-touch-icon" href="<%- serverURL %>/apple-touch-icon.png"> + <%- include includes/favicon.ejs %> <% if(useCDN) { %> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/fork-awesome/1.1.3/css/fork-awesome.min.css" integrity="sha256-ZhApazu+kejqTYhMF+1DzNKjIzP7KXu6AzyXcC1gMus=" crossorigin="anonymous" /> |