From cd80c7ebd8ee122c15d3c2975abb63b796a01c8c Mon Sep 17 00:00:00 2001
From: Philipp Heckel <pheckel@datto.com>
Date: Sat, 4 Dec 2021 20:23:29 -0500
Subject: [PATCH] Strip down main page more
---
docs/privacy.md | 12 ++++++++++++
mkdocs.yml | 24 +++++++++++++-----------
server/index.gohtml | 32 ++++++++++++++++----------------
server/static/css/app.css | 37 ++++++++++++++++++++++++++++++++++---
4 files changed, 75 insertions(+), 30 deletions(-)
create mode 100644 docs/privacy.md
diff --git a/docs/privacy.md b/docs/privacy.md
new file mode 100644
index 0000000..a4cec9c
--- /dev/null
+++ b/docs/privacy.md
@@ -0,0 +1,12 @@
+# Privacy policy
+
+I love free software and I'm doing this because it's fun and to give back. I have no bad intentions and I will
+never monetize or sell your information. This service will always stay free and open.
+
+Neither the server nor the app record any personal information, or share any of the messages and topics with
+any outside service. All data is exclusively used to make the service function properly. The one exception
+is the Firebase Cloud Messaging (FCM) service, which is required to provide instant Android notifications (see
+[FAQ](faq.md) for details).
+
+The web server does not log or otherwise store request paths, remote IP addresses or even topics or messages,
+aside from a short on-disk cache to support service restarts.
diff --git a/mkdocs.yml b/mkdocs.yml
index e24634f..8a20bdb 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -36,6 +36,11 @@ theme:
- navigation.instant
- toc.integrate
- content.tabs.link
+extra:
+ homepage: /
+ social:
+ - icon: fontawesome/brands/github-alt
+ link: https://github.com/binwiederhier
extra_javascript:
- static/js/extra.js
extra_css:
@@ -63,25 +68,22 @@ markdown_extensions:
plugins:
- search
-extra:
- social:
- - icon: fontawesome/brands/github-alt
- link: https://github.com/binwiederhier
-
nav:
- "Getting started": index.md
-- "Installation": install.md
-- "Configuration": config.md
- "Publishing":
- "Sending messages": publish.md
- "Subscribing":
- - "From your phone": subscribe/phone.md
- - "From the Web UI": subscribe/web.md
- - "Using the API": subscribe/api.md
+ - "From your phone": subscribe/phone.md
+ - "From the Web UI": subscribe/web.md
+ - "Using the API": subscribe/api.md
+- "Self-hosting":
+ - "Installation": install.md
+ - "Configuration": config.md
- "Other things":
+ - "FAQs": faq.md
- "Examples": examples.md
- "Emojis 🥳 🎉": emojis.md
- "Development": develop.md
- - "FAQs": faq.md
+ - "Privacy policy": privacy.md
diff --git a/server/index.gohtml b/server/index.gohtml
index 0975d75..c6f86be 100644
--- a/server/index.gohtml
+++ b/server/index.gohtml
@@ -34,9 +34,21 @@
{{end}}
</head>
<body>
-<div id="header"><div id="headerBox"><img src="static/img/ntfy.png" alt="ntfy"/></div></div>
+
+<nav id="header">
+ <div id="headerBox">
+ <img id="logo" src="static/img/ntfy.png" alt="logo"/>
+ <div id="name">ntfy.sh</div>
+ <ol>
+ <li><a href="docs/">Getting started</a></li>
+ <li><a href="docs/subscribe/phone/">Android/iOS</a></li>
+ <li><a href="docs/publish/">API</a></li>
+ <li><a href="docs/install/">Self-hosting</a></li>
+ </ol>
+ </div>
+</nav>
<div id="main"{{if .Topic}} style="display: none"{{end}}>
- <h1>ntfy.sh | PUT/POST push notifications to your phone</h1>
+ <h1>Send push notifications to your phone or desktop via PUT/POST</h1>
<p>
<b>ntfy</b> (pronounce: <i>notify</i>) is a simple HTTP-based <a href="https://en.wikipedia.org/wiki/Publish%E2%80%93subscribe_pattern">pub-sub</a> notification service.
It allows you to send notifications to your phone or desktop via scripts from any computer,
@@ -83,8 +95,8 @@
<h2 id="subscribe" class="anchor">Subscribe to a topic</h2>
<p>
- You can create and subscribe to a topic either in this web UI, or in your own app by subscribing to an
- <a href="https://developer.mozilla.org/en-US/docs/Web/API/EventSource">EventSource</a>, a JSON feed, or raw feed.
+ You can create and subscribe to a topic either <a href="docs/subscribe/phone/">using your phone</a>,
+ in <a href="docs/subscribe/web/">this web UI</a>, or in your own app by <a href="docs/subscribe/api/">subscribing via the API</a>.
</p>
<div id="subscribeBox">
@@ -160,18 +172,6 @@
And another one with a smiley face 😀
</code>
- <h2 id="privacy" class="anchor">Privacy policy</h2>
- <p>
- Neither the server nor the app record any personal information, or share any of the messages and topics with
- any outside service. All data is exclusively used to make the service function properly. The one exception
- is the Firebase Cloud Messaging (FCM) service, which is required to provide instant Android notifications (see
- FAQ for details).
- </p>
- <p>
- The web server does not log or otherwise store request paths, remote IP addresses or even topics or messages,
- aside from a short on-disk cache (for {{.CacheDuration}}) to support service restarts.
- </p>
-
<center id="ironicCenterTagDontFreakOut"><i>Made with â¤ï¸ by <a href="https://heckel.io">Philipp C. Heckel</a></i></center>
</div>
<div id="detail"{{if not .Topic}} style="display: none"{{end}}>
diff --git a/server/static/css/app.css b/server/static/css/app.css
index e6a232c..bd383fe 100644
--- a/server/static/css/app.css
+++ b/server/static/css/app.css
@@ -24,8 +24,8 @@ a:hover {
}
h1 {
- margin-top: 25px;
- margin-bottom: 18px;
+ margin-top: 35px;
+ margin-bottom: 30px;
font-size: 2.5em;
word-wrap: break-word; /* For very long topics */
padding-right: 40px; /* For the X on the detail page */
@@ -209,8 +209,39 @@ code {
padding: 0 10px;
}
-#header img {
+#header #logo {
margin-top: 23px;
+ float: left;
+}
+
+#header #name {
+ float: left;
+ color: white;
+ font-size: 2.6em;
+ font-weight: bold;
+ margin: 35px 0 0 20px;
+}
+
+#header ol {
+ list-style-type: none;
+ float:right;
+ margin-top: 80px;
+}
+
+#header ol li {
+ display: inline-block;
+ margin: 0 10px;
+ font-weight: bold;
+
+}
+
+#header ol li a, nav ol li a:visited {
+ color: white;
+ text-decoration: none;
+}
+
+#header ol li a:hover {
+ text-decoration: underline;
}
/* Subscribe box */
--
GitLab