diff options
author | David Mehren | 2020-11-15 21:02:36 +0100 |
---|---|---|
committer | GitHub | 2020-11-15 21:02:36 +0100 |
commit | 4c0efe1237bc33b52d06eaf86a28adad9a041ec2 (patch) | |
tree | fa068d16074645b7b6d8d88b78724b9cd82dd879 /public/views | |
parent | 299301f0fe5bea41b4407bbbc03932fc4dd1c1d3 (diff) | |
parent | 9898ab3ca5fa226967d8a3aca8e6e752554ed64d (diff) |
Merge pull request #453 from hedgedoc/misc/renaming
Diffstat (limited to 'public/views')
-rw-r--r-- | public/views/codimd.ejs | 15 | ||||
-rw-r--r-- | public/views/codimd/footer.ejs | 0 | ||||
-rw-r--r-- | public/views/error.ejs | 6 | ||||
-rw-r--r-- | public/views/hedgedoc.ejs | 14 | ||||
-rw-r--r-- | public/views/hedgedoc/body.ejs (renamed from public/views/codimd/body.ejs) | 0 | ||||
-rw-r--r-- | public/views/hedgedoc/foot.ejs (renamed from public/views/codimd/foot.ejs) | 0 | ||||
-rw-r--r-- | public/views/hedgedoc/head.ejs (renamed from public/views/codimd/head.ejs) | 5 | ||||
-rw-r--r-- | public/views/hedgedoc/header.ejs (renamed from public/views/codimd/header.ejs) | 5 | ||||
-rw-r--r-- | public/views/includes/favicon.ejs | 11 | ||||
-rw-r--r-- | public/views/index/body.ejs | 9 | ||||
-rw-r--r-- | public/views/index/head.ejs | 11 | ||||
-rw-r--r-- | public/views/pretty.ejs | 4 | ||||
-rw-r--r-- | public/views/shared/help-modal.ejs | 8 |
13 files changed, 52 insertions, 36 deletions
diff --git a/public/views/codimd.ejs b/public/views/codimd.ejs deleted file mode 100644 index 7818346c..00000000 --- a/public/views/codimd.ejs +++ /dev/null @@ -1,15 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> - -<head> - <%- include codimd/head %> -</head> - -<body> - <%- include codimd/header %> - <%- include codimd/body %> - <%- include codimd/footer %> - <%- include codimd/foot %> -</body> - -</html> diff --git a/public/views/codimd/footer.ejs b/public/views/codimd/footer.ejs deleted file mode 100644 index e69de29b..00000000 --- a/public/views/codimd/footer.ejs +++ /dev/null diff --git a/public/views/error.ejs b/public/views/error.ejs index 3ed76c8c..e208d778 100644 --- a/public/views/error.ejs +++ b/public/views/error.ejs @@ -2,18 +2,18 @@ <html lang="en"> <head> - <%- include codimd/head %> + <%- include hedgedoc/head %> <link rel="stylesheet" href="<%- serverURL %>/css/center.css"> </head> <body> - <%- include codimd/header %> + <%- include hedgedoc/header %> <div class="container-fluid text-center"> <div class="vertical-center-row"> <h1><%- code %> <%- detail %> <small><%- msg %></small></h1> </div> </div> - <%- include codimd/footer %> + <%- include hedgedoc/footer %> </body> </html> diff --git a/public/views/hedgedoc.ejs b/public/views/hedgedoc.ejs new file mode 100644 index 00000000..cfedb2b5 --- /dev/null +++ b/public/views/hedgedoc.ejs @@ -0,0 +1,14 @@ +<!DOCTYPE html> +<html lang="en"> + +<head> + <%- include hedgedoc/head %> +</head> + +<body> + <%- include hedgedoc/header %> + <%- include hedgedoc/body %> + <%- include hedgedoc/foot %> +</body> + +</html> diff --git a/public/views/codimd/body.ejs b/public/views/hedgedoc/body.ejs index 96cb8f95..96cb8f95 100644 --- a/public/views/codimd/body.ejs +++ b/public/views/hedgedoc/body.ejs diff --git a/public/views/codimd/foot.ejs b/public/views/hedgedoc/foot.ejs index 9d620e29..9d620e29 100644 --- a/public/views/codimd/foot.ejs +++ b/public/views/hedgedoc/foot.ejs diff --git a/public/views/codimd/head.ejs b/public/views/hedgedoc/head.ejs index 71e261fb..e7b13e8a 100644 --- a/public/views/codimd/head.ejs +++ b/public/views/hedgedoc/head.ejs @@ -4,12 +4,13 @@ <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"> +<%- include ../includes/favicon %> <% for (var og in opengraph) { %> <% if (opengraph.hasOwnProperty(og) && opengraph[og].trim() !== '') { %> <meta property="og:<%- og %>" content="<%- opengraph[og] %>"> <% }} if (!opengraph.hasOwnProperty('image')) { %> -<meta property="og:image" content="<%- serverURL %>/codimd-icon-1024.png"> -<meta property="og:image:alt" content="CodiMD logo"> +<meta property="og:image" content="<%- serverURL %>/icons/android-chrome-512x512"> +<meta property="og:image:alt" content="HedgeDoc logo"> <meta property="og:image:type" content="image/png"> <% } %> <base href="<%- serverURL %>/"> diff --git a/public/views/codimd/header.ejs b/public/views/hedgedoc/header.ejs index 6bf37804..f700cd5b 100644 --- a/public/views/codimd/header.ejs +++ b/public/views/hedgedoc/header.ejs @@ -13,7 +13,10 @@ <ul class="dropdown-menu list" role="menu" aria-labelledby="menu"> </ul> </div> - <a class="navbar-brand pull-left" href="<%- serverURL %>/"><i class="fa fa-file-text"></i> CodiMD</a> + <a class="navbar-brand pull-left header-brand" href="<%- serverURL %>/" title="HedgeDoc (formerly CodiMD)"> + <img src="<%- serverURL %>/banner/banner_h_bw.svg" alt="HedgeDoc" class="h-100 no-night"> + <img src="<%- serverURL %>/banner/banner_h_wb.svg" alt="HedgeDoc" class="h-100 night"> + </a> <div class="nav-mobile pull-right visible-xs"> <a data-toggle="dropdown" class="btn btn-link"> <i class="fa fa-caret-down"></i> diff --git a/public/views/includes/favicon.ejs b/public/views/includes/favicon.ejs new file mode 100644 index 00000000..1cc8edb5 --- /dev/null +++ b/public/views/includes/favicon.ejs @@ -0,0 +1,11 @@ +<link rel="apple-touch-icon" sizes="180x180" href="<%- serverURL %>/icons/apple-touch-icon.png"> +<link rel="icon" type="image/png" sizes="32x32" href="<%- serverURL %>/icons/favicon-32x32.png"> +<link rel="icon" type="image/png" sizes="16x16" href="<%- serverURL %>/icons/favicon-16x16.png"> +<link rel="manifest" href="<%- serverURL %>/icons/site.webmanifest"> +<link rel="mask-icon" href="<%- serverURL %>/icons/safari-pinned-tab.svg" color="#b51f08"> +<link rel="shortcut icon" href="<%- serverURL %>/icons/favicon.ico"> +<meta name="apple-mobile-web-app-title" content="HedgeDoc - <%= __('Collaborative markdown notes') %>"> +<meta name="application-name" content="HedgeDoc - <%= __('Collaborative markdown notes') %>"> +<meta name="msapplication-TileColor" content="#b51f08"> +<meta name="msapplication-config" content="<%- serverURL %>/icons/browserconfig.xml"> +<meta name="theme-color" content="#b51f08"> diff --git a/public/views/index/body.ejs b/public/views/index/body.ejs index 0f2b8f33..6176cb6e 100644 --- a/public/views/index/body.ejs +++ b/public/views/index/body.ejs @@ -40,10 +40,13 @@ <div id="home" class="section"<% if(signin) { %> style="display:none;"<% } %>> <div class="inner cover"> - <h1 class="cover-heading"><i class="fa fa-file-text"></i> CodiMD</h1> + <h1 class="cover-heading"><img src="<%- serverURL %>/banner/banner_vertical_color.svg" width="400" alt="HedgeDoc logo"></h1> <p class="lead"> <%= __('Best way to write and share your knowledge in markdown.') %> </p> + <span class="alert alert-info" style="display: inline-block;"> + CodiMD was renamed to HedgeDoc. <a href="https://hedgedoc.org/history/" rel="noopener noreferrer" target="_blank" class="text-danger">Read more</a> + </span> <% if (infoMessage && infoMessage.length > 0) { %> <div class="alert alert-info" style="max-width: 400px; margin: 0 auto;"><%= infoMessage %></div> <% } %> @@ -156,10 +159,10 @@ <option value="ml">മലയാളം</option> </select> <p> - <%- __('Powered by %s', '<a href="https://codimd.org">CodiMD</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><% } %> + <%- __('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/codimd/server" target="_blank" rel="noopener"><i class="fa fa-github"></i> GitHub</a>, <a href="https://community.codimd.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.codimd.org/mastodon" target="_blank" rel="noopener"><i class="fa fa-mastodon"></i> Mastodon</a>', '<a href="https://translate.codimd.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://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>') %> </h6> </div> </div> diff --git a/public/views/index/head.ejs b/public/views/index/head.ejs index 66396adb..2b751d34 100644 --- a/public/views/index/head.ejs +++ b/public/views/index/head.ejs @@ -6,17 +6,16 @@ <meta name="mobile-web-app-capable" content="yes"> <meta name="description" content="<%= __('Best way to write and share your knowledge in markdown.') %>"> <meta name="keywords" content="Collaborative, Markdown, Notes"> -<meta property="og:title" content="CodiMD - <%= __('Collaborative markdown notes') %>"> +<%- include ../includes/favicon %> +<meta property="og:title" content="HedgeDoc - <%= __('Collaborative markdown notes') %>"> <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 %>/codimd-icon-1024.png"> -<meta property="og:image:alt" content="CodiMD logo"> +<meta property="og:image" content="<%- serverURL %>/icons/android-chrome-512x512"> +<meta property="og:image:alt" content="HedgeDoc logo"> <meta property="og:image:type" content="image/png"> <base href="<%- serverURL %>/"> -<title>CodiMD - <%= __('Collaborative markdown notes') %></title> -<link rel="icon" type="image/png" href="<%- serverURL %>/favicon.png"> -<link rel="apple-touch-icon" href="<%- serverURL %>/apple-touch-icon.png"> +<title>HedgeDoc - <%= __('Collaborative markdown notes') %></title> <% 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/pretty.ejs b/public/views/pretty.ejs index 91a8ead2..d9221c93 100644 --- a/public/views/pretty.ejs +++ b/public/views/pretty.ejs @@ -18,8 +18,8 @@ <% if (opengraph.hasOwnProperty(og) && opengraph[og].trim() !== '') { %> <meta property="og:<%= og %>" content="<%= opengraph[og] %>"> <% }} if (!opengraph.hasOwnProperty('image')) { %> - <meta property="og:image" content="<%- serverURL %>/codimd-icon-1024.png"> - <meta property="og:image:alt" content="CodiMD logo"> + <meta property="og:image" content="<%- serverURL %>/icons/android-chrome-512x512"> + <meta property="og:image:alt" content="HedgeDoc logo"> <meta property="og:image:type" content="image/png"> <% } %> <base href="<%- serverURL %>/"> diff --git a/public/views/shared/help-modal.ejs b/public/views/shared/help-modal.ejs index d1fe50bb..7ffee93a 100644 --- a/public/views/shared/help-modal.ejs +++ b/public/views/shared/help-modal.ejs @@ -15,13 +15,13 @@ <h3 class="panel-title"><%= __('Contacts') %></h3> </div> <div class="panel-body"> - <a href="https://community.codimd.org" target="_blank"><i class="fa fa-users fa-fw"></i> <%= __('Join the community') %></a> + <a href="https://community.hedgedoc.org" target="_blank"><i class="fa fa-users fa-fw"></i> <%= __('Join the community') %></a> <br> - <a href="https://matrix.to/#/#hedgedoc:matrix.org" target="_blank"><i class="fa fa-hashtag fa-fw"></i> <%= __('Meet us on %s', 'Matrix') %></a> + <a href="https://chat.hedgedoc.org" target="_blank"><i class="fa fa-hashtag fa-fw"></i> <%= __('Meet us on %s', 'Matrix') %></a> <br> - <a href="https://github.com/codimd/server/issues" target="_blank"><i class="fa fa-tag fa-fw"></i> <%= __('Report an issue') %></a> + <a href="https://github.com/hedgedoc/hedgedoc/issues" target="_blank"><i class="fa fa-tag fa-fw"></i> <%= __('Report an issue') %></a> <br> - <a href="https://translate.codimd.org" target="_blank"><i class="fa fa-language fa-fw"></i> <%= __('Help us translating') %></a> + <a href="https://translate.hedgedoc.org" target="_blank"><i class="fa fa-language fa-fw"></i> <%= __('Help us translating') %></a> </div> </div> <div class="panel panel-default"> |