Skip to content

Commit

Permalink
New documentation info banner, adaptations for GDPR (openhab#684)
Browse files Browse the repository at this point in the history
- Add new "The openHAB Documentation has moved" banner
  to all pages, includes link to the current version of
  the current page (takes care of moved/obsolete content)
- Add new privacy policy & imprint copied from new website
- Add cookie consent banner

Signed-off-by: Yannick Schaus <[email protected]>
  • Loading branch information
ghys authored and kaikreuzer committed May 24, 2018
1 parent 68d0dce commit f1f305f
Show file tree
Hide file tree
Showing 12 changed files with 412 additions and 15 deletions.
6 changes: 5 additions & 1 deletion _includes/footer.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% include base.html %}
{% comment %}<!-- Copyright message based on http://www.openhab.org -->{% endcomment %}
<footer>
<footer style="margin-bottom: 50px">
<div class="container">
<div class="row">
<div class="col s12 m7">
Expand All @@ -23,5 +23,9 @@
<script src="{{base}}/js/materialize.min.js"></script>
<script src="{{base}}/js/init.js"></script>
<script src="{{base}}/js/functions.js"></script>
<script type="text/javascript" id="cookieinfo" src="{{base}}/js/cookieinfo.min.js"
data-bg="#645862" data-fg="#FFFFFF" data-link="#F1D600" data-linkmsg="Privacy Policy"
data-moreinfo="/privacy.html" data-cookie="CookieInfoScript" data-text-align="left" data-close-text="Got it!">
</script>
</body>
</html>
59 changes: 59 additions & 0 deletions _includes/newsite-banner.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
{% assign newsite = 'https://www.openhab.org' %}
{% assign newurl = newsite | append: '/docs' | append: page.url %}
{% if page.url == '/tutorials/' %}
{% assign newurl = newsite | append: '/docs/tutorial/' %}
{% elsif page.url contains '/tutorials/beginner/' %}
{% assign newurl = newurl | replace: '/tutorials/beginner/', '/tutorial/' %}
{% elsif page.url contains '/tutorials/migration.html' %}
{% assign newurl = newsite | append: '/docs/configuration/migration/' %}
{% elsif page.url == '/introduction.html' %}
{% assign newurl = newsite | append: '/docs/' %}
{% elsif page.url contains '/addons/uis/paper/' %}
{% assign newurl = newsite | append: '/docs/configuration/paperui.html' %}
{% elsif page.url contains '/addons/uis/basic/' %}
{% assign newurl = newsite | append: '/docs/configuration/ui/basic/' %}
{% elsif page.url contains '/addons/uis/classic/' %}
{% assign newurl = newsite | append: '/docs/configuration/ui/classic/' %}
{% elsif page.url contains '/addons/uis/habmin/' %}
{% assign newurl = newsite | append: '/docs/configuration/ui/habmin/' %}
{% elsif page.url contains '/addons/uis/habpanel/' %}
{% assign newurl = newsite | append: '/docs/configuration/habpanel.html' %}
{% elsif page.url contains '/addons/uis/apps' %}
{% assign newurl = newurl | replace: '/addons/uis/apps', '/apps' %}
{% elsif page.url contains '/addons/ios/alexa-skill' %}
{% assign newurl = newsite | append: '/docs/ecosystem/alexa/' %}
{% elsif page.url contains '/addons/ios/mycroft-skill' %}
{% assign newurl = newsite | append: '/docs/ecosystem/mycroft/' %}
{% elsif page.url contains '/addons/' %}
{% if page.url contains 'readme.html' %}
{% assign newurl = newsite | append: page.url | replace_first: '/ios', '/integrations' | replace_first: '/voices/', '/voice/' | replace: 'readme.html', '' %}
{% elsif page.url contains 'transformations.html' %}
{% assign newurl = newsite | append: '/docs/configuration/transformations.html' %}
{% elsif page.url contains 'actions.html' %}
{% assign newurl = newsite | append: '/docs/configuration/actions.html' %}
{% else %}
{% assign newurl = newsite | append: '/addons/' %}
{% endif %}
{% elsif page.url contains '/appendix/' %}
{% assign newurl = newsite | append: '/about/contributing.html' %}
{% elsif page.url contains '/developers/' %}
{% assign newurl = newurl | replace: '/developers/', '/developer/' %}
{% endif %}

<div class="col s10 offset-s1">
<div class="card grey darken-1" id="contribution-wanted">
<div class="card-content white-text">
<span class="card-title white-text">The openHAB Documentation Has Moved</span>
<p>
The documentation has moved to
<a target="_blank" style="color: #FF6600; font-weight: bold;" href="{{newsite}}/docs/">openhab.org/docs</a>
and
<a target="_blank" style="color: #FF6600; font-weight: bold;" href="{{newsite}}/addons/">openhab.org/addons</a>.
</p>
<p>Please use the link below to be redirected to the new version of this article, and update your bookmarks.</p>
</div>
<div class="card-action">
<a class="" target="_blank" href="{{newurl}}">Open This Article on the New Documentation Site</a>
</div>
</div>
</div>
1 change: 1 addition & 0 deletions _layouts/addon.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
</div>
{% include versioning.html %}
<div class="content">
{% include newsite-banner.html %}
{{ content }}
</div>
</div>
Expand Down
1 change: 1 addition & 0 deletions _layouts/developersguide.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
{% include dev-menu.html %}
</div>
<div class="content">
{% include newsite-banner.html %}
{{ content }}
</div>
</div>
Expand Down
2 changes: 2 additions & 0 deletions _layouts/documentation.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
{% include user-menu.html %}
</div>
{% include versioning.html %}

<div class="content">
{% include newsite-banner.html %}
{{ content }}
</div>
</div>
Expand Down
1 change: 1 addition & 0 deletions _layouts/gettingstarted.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
{% include gettingstarted-menu.html %}
</div>
<div class="content">
{% include newsite-banner.html %}
{{ content }}
</div>
</div>
Expand Down
1 change: 1 addition & 0 deletions _layouts/intro.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

<section id="documentation" class="text content-wrapper">
<div class="container">
{% include newsite-banner.html %}
{{ content }}
</div>
</section>
Expand Down
1 change: 1 addition & 0 deletions _layouts/raw.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{% include header.html bodyClass="documentation" %}

<section id="documentation" class="text content-wrapper">
{% include newsite-banner.html %}
{{ content }}
</section>

Expand Down
1 change: 1 addition & 0 deletions _layouts/tutorial-beginner.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
{% include tutorial-beginner-menu.html %}
</div>
<div class="content">
{% include newsite-banner.html %}
{{ content }}
</div>
</div>
Expand Down
47 changes: 43 additions & 4 deletions imprint.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,62 @@ title: Imprint
{% comment %}<!-- Based on http://www.openhab.org/imprint.html -->{% endcomment %}
# Imprint

### This site is operated by
## This Site is operated by

<address>
<p>openHAB Foundation e.V.<br />Kollwitzweg 10<br />64372 Ober-Ramstadt</p>
</address>
<p><i class="material-icons">phone</i> +49 (6154) 603-9765</p>
<p><i class="material-icons">email</i> <a href="mailto:[email protected]">[email protected]</a></p>

Information provided according to Sec. 5 German Telemedia Act (TMG)

### Executive Board

<p>Kai Kreuzer, President<br />Dan Cunningham, Vice President<br />Hans-Jörg Merk, Chief Financial Officer</p>
<p>Register of Associations: Darmstadt 83855</p>

### Privacy Statement
### Responsible for Journalistic-Editorial Contents

<p>Kai Kreuzer<br />
Kollwitzweg 10<br />
64372 Ober-Ramstadt</p>

Information provided according to Sec. 55, para. 2 German Federal Broadcasting Agreement (RstV)

openHAB Foundation respects your desire for privacy. Please see our <a href="/privacy.html">Privacy Policy</a> regarding the use of our website and the mobile reference applications.
## Privacy Statement

### Trademarks
openHAB Foundation respects your desire for privacy. Please see our [Privacy Policy](/privacy.html)
regarding the use of our website and the mobile reference applications.

## Trademarks

openHAB is a registered trademark of Kai Kreuzer in the EU, the US and other countries.

<!-- Rules for the re-use of the openHAB logo can be found [here](/about/logos.html). -->

## Liability for Contents

As service providers, we are liable for own contents of these websites according to
Sec. 7, paragraph 1 German Telemedia Act (TMG). However, according to Sec. 8 to 10
German Telemedia Act (TMG), service providers are not obligated to permanently monitor
submitted or stored information or to search for evidences that indicate illegal activities.

Legal obligations to removing information or to blocking the use of information remain
unchallenged. In this case, liability is only possible at the time of knowledge about a
specific violation of law. Illegal contents will be removed immediately at the time we
get knowledge of them.

## Liability for Links

Our offer includes links to external third party websites. We have no influence on the
contents of those websites, therefore we cannot guarantee for those contents. Providers
or administrators of linked websites are always responsible for their own contents.

The linked websites had been checked for possible violations of law at the time of the
establishment of the link. Illegal contents were not detected at the time of the
linking.

A permanent monitoring of the contents of linked websites cannot be imposed
without reasonable indications that there has been a violation of law. Illegal links
will be removed immediately at the time we get knowledge of them.
1 change: 1 addition & 0 deletions js/cookieinfo.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit f1f305f

Please sign in to comment.