Merge pull request #251 from offen/index-update

Index update
offen · Jan 11, 2020 · b2823de · b2823de
2 parents 1343537 + 398c1fb
commit b2823de
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 [![CircleCI](https://circleci.com/gh/offen/offen/tree/master.svg?style=svg)](https://circleci.com/gh/offen/offen/tree/master)
 [![Patreon](https://img.shields.io/static/v1.svg?label=patreon&message=donate&color=e85b46)](https://www.patreon.com/offen)
 
-# offen
+# Offen
 
 ## Web analytics that handle your data with respect
 
@@ -63,7 +63,7 @@ You can test your setup by starting the application:
 $ make up
 ```
 
-which should enable you to access <http://localhost:8080/auditorium/> and use the `auditorium`
+which should enable you to access <http://localhost:8080/auditorium/> and use the `Auditorium`
 
 Run the tests for all subapplicatons using
 

diff --git a/auditorium/index.html b/auditorium/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en" dir="ltr">
   <head>
-    <title>offen auditorium</title>
+    <title>Offen Auditorium</title>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <base href="/auditorium/">

diff --git a/auditorium/index.js b/auditorium/index.js
@@ -45,27 +45,27 @@ var base = (document.querySelector('base') && document.querySelector('base').get
 
 app.route(
   base + 'account/:accountId',
-  decorateWithDefaults(withAuthentication()(withModel()(mainView)), __('offen auditorium'))
+  decorateWithDefaults(withAuthentication()(withModel()(mainView)), __('Offen Auditorium'))
 )
 app.route(
   base + 'account',
-  decorateWithDefaults(withAuthentication()(accountView), __('offen accounts'))
+  decorateWithDefaults(withAuthentication()(accountView), __('Offen accounts'))
 )
 app.route(
   base + 'login',
-  decorateWithDefaults(loginView, __('offen login'))
+  decorateWithDefaults(loginView, __('Offen login'))
 )
 app.route(
   base + 'reset-password/:token',
-  decorateWithDefaults(resetPasswordView, __('offen reset password'))
+  decorateWithDefaults(resetPasswordView, __('Offen reset password'))
 )
 app.route(
   base + 'reset-password',
-  decorateWithDefaults(forgotPasswordView, __('offen forgot password'))
+  decorateWithDefaults(forgotPasswordView, __('Offen forgot password'))
 )
 app.route(
   base.replace(/\/$/, ''),
-  decorateWithDefaults(withModel()(mainView), __('offen auditorium'))
+  decorateWithDefaults(withModel()(mainView), __('Offen Auditorium'))
 )
 app.route(
   base + '*',

diff --git a/auditorium/views/decorators/with-layout.js b/auditorium/views/decorators/with-layout.js
@@ -11,7 +11,7 @@ function withLayout () {
       return html`
         <div data-role="app-host" class="mw8 center pa3 pb5 f5 roboto dark-gray">
           <div id="headline">
-            <h1 class="f2 normal mt0 mb4">${raw(__('<strong>offen</strong> auditorium'))}</h1>
+            <h1 class="f2 normal mt0 mb4">${raw(__('Offen Auditorium'))}</h1>
             ${flash ? html`
               <p data-role="flash-message" class="dib pa2 br2 bg-black-05 mt0 mb2">${flash}</p>
             ` : null}

diff --git a/auditorium/views/main.js b/auditorium/views/main.js
@@ -107,17 +107,15 @@ function view (state, emit) {
       <p class="dib pa2 br2 bg-black-05 mt0 mb2">
         ${raw(__('You are viewing your <strong>usage</strong> data.'))}
       </p>
-      ${!state.model.hasOptedIn ? html`<p><strong>${__('You have not opted in to data collection. You can use the buttons below to do so.')}</strong></p>` : null}
+      ${state.model.allowsCookies ? null : html`<p class="dib pa2 black br2 bg-black-05 mt0 mb2">${__('Your browser does not allow 3rd party cookies. We respect this setting and collect only very basic data in this case, yet it also means we cannot display any data to you here.')}</p>`}
     `
     if (!state.model.allowsCookies) {
       var noCookiesCopy = __('Your browser does not allow 3rd party cookies. We respect this setting and collect only very basic data in this case, yet it also means we cannot display any data to you here.')
       accountHeader = [
         accountHeader,
         html`
           <p class="dib pa2 black br2 bg-black-05 mt0 mb2">
-            <strong>
-              ${noCookiesCopy}
-            </strong>
+            ${noCookiesCopy}
           </p>
         `
       ]

diff --git a/server/public/index.go.html b/server/public/index.go.html
@@ -4,7 +4,7 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta http-equiv="X-UA-Compatible" content="ie=edge">
-  <title>{{ __ "offen" }}</title>
+  <title>{{ __ "Offen" }}</title>
   <link rel="stylesheet" type="text/css" href="/tachyons.min.css">
   <link rel="stylesheet" type="text/css" href="/fonts.css">
   <link rel="preload" href="/fonts/roboto-v20-latin-regular.woff2" as="font">
@@ -15,7 +15,7 @@
 </head>
 <body class="bg-washed-yellow">
   <div class="mw8 center pa3 pb5 f5 roboto dark-gray">
-    <h1 class="f2 normal mt0 mb4">{{ __ "Welcome to <strong>offen</strong> web analytics" }}</h1>
+    <h1 class="f2 normal mt0 mb4">{{ __ "Welcome to Offen web analytics" }}</h1>
     <div class="flex flex-column flex-row-ns items-center w-100 ph3 ph4-ns pv4 mt4 mb2 ba b--black-10 br2 bg-white">
       <div class="w-100 w-70-ns mr3-ns">
         <h3 class="f5 b tc tl-ns mt0 mb0">
@@ -24,7 +24,7 @@ <h3 class="f5 b tc tl-ns mt0 mb0">
       </div>
       <div class="w-100 w-30-ns tc mt2 mt0-ns">
         <a href="/auditorium/" class="f5 tc link dim bn ph3 pv2 dib br1 white bg-dark-green">
-          {{ __ "Open auditorium" }}
+          {{ __ "Open Auditorium" }}
         </a>
       </div>
     </div>
@@ -41,7 +41,7 @@ <h3 class="f5 b tc tl-ns mt0 mb0">
       <div class="flex flex-column flex-row-ns w-100">
         <div class="w-100 w-50-ns mr2-ns">
           <p class="b mt0 mb1">{{ __ "How can I review and delete my usage data?" }}</p>
-          <p class="mt0 mb4">{{ __ "Go to the <a href=\"/auditorium/\" class=\"link dim dark-green\">auditorium.</a>" }}</p>
+          <p class="mt0 mb4">{{ __ "Go to the <a href=\"/auditorium/\" class=\"link dim dark-green\">Auditorium.</a>" }}</p>
           <p class="b mt0 mb1">{{ __ "What data is collected?" }}</p>
           <p class="mt0 mb4">{{ __ "Only page views, sessions, referrer and visited URL are collected. From this, other metrics such as the bounce rate are calculated." }}</p>
           <p class="b mt0 mb1">{{ __ "What data isn't collected?" }}</p>
@@ -50,12 +50,14 @@ <h3 class="f5 b tc tl-ns mt0 mb0">
           <p class="mt0 mb4">{{ __ "Your data is encrypted end-to-end. It will be deleted after 6 months at the latest. Offen does not share your data with third-parties." }}</p>
         </div>
         <div class="w-100 w-50-ns ml4-ns">
-          <p class="b mt0 mb1">{{ __ "Why do I need to opt-in or opt-out?" }}</p>
+          <p class="b mt0 mb1">{{ __ "Why do I need to opt in or opt out?" }}</p>
           <p class="mt0 mb4">{{ __ "Our banner serves two purposes: We ask you to access your usage data and would like to obtain your consent for its use." }}</p>
+          <p class="b mt0 mb1">{{ __ "Do you use cookies?" }}</p>
+          <p class="mt0 mb4">{{ __ "Yes, in particular cookies are used to store your decision about granting access to your usage data. If you opt in, we also use cookies to store a user and a session ID for you." }}</p>
           <p class="b mt0 mb1">{{ __ "How does it all work?" }}</p>
           <p class="mt0 mb1">{{ __ "After opening a website that has offen installed you can explicitly opt in to the data collection and thereby help to improve the services you use." }}</p>
-          <p class="mt0 mb1">{{ __ "Only then will you be assigned an ID using a cookie. Learn more about cookies <a href=\"https://en.wikipedia.org/wiki/HTTP_cookie\" class=\"link dim dark-green\" target=\"_blank\">here.</a>" }}</p>
-          <p class="mt0 mb4">{{ __ "Offen handles this ID in an unrecognizable form. Operators can identify you only within one website." }}</p>
+          <p class="mt0 mb1">{{ __ "Only then you will be assigned a user and a session ID using a cookie. Learn more about cookies <a href=\"https://en.wikipedia.org/wiki/HTTP_cookie\" class=\"link dim dark-green\" target=\"_blank\">here.</a>" }}</p>
+          <p class="mt0 mb4">{{ __ "Offen handles these IDs in an unrecognizable form. Operators can identify you only within one website." }}</p>
           <p class="mt0 mb3">{{ __ "Visit <a href=\"https://www.offen.dev/\" class=\"link dim dark-green\" target=\"_blank\">www.offen.dev</a> for more information." }}</p>
         </div>
       </div>

diff --git a/vault/index.html b/vault/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
     <head>
-        <title>offen vault</title>
+        <title>Offen vault</title>
         <meta charset="utf-8">
     </head>
     <body>