From eec08267506b75b0f6deda156ddad8c58036bbc0 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Wed, 16 May 2018 11:57:06 +0200 Subject: [PATCH] added link to the TOS page if it is activated --- src/Content/Nav.php | 4 ++++ view/templates/nav.tpl | 2 ++ view/theme/duepuntozero/templates/nav.tpl | 2 ++ view/theme/frio/templates/nav.tpl | 3 +++ view/theme/quattro/templates/nav.tpl | 1 + view/theme/smoothly/templates/nav.tpl | 1 + view/theme/vier/templates/nav.tpl | 1 + 7 files changed, 14 insertions(+) diff --git a/src/Content/Nav.php b/src/Content/Nav.php index cd2cfb363..b0fe8a14e 100644 --- a/src/Content/Nav.php +++ b/src/Content/Nav.php @@ -174,6 +174,10 @@ class Nav $nav['about'] = ['friendica', L10n::t('Information'), '', L10n::t('Information about this friendica instance')]; + if (Config::get('system', 'tosdisplay')) { + $nav['tos'] = ['tos', L10n::t('Terms of Service'), '', L10n::t('Terms of Service of this Friendica instance')]; + } + // The following nav links are only show to logged in users if (local_user()) { $nav['network'] = ['network', L10n::t('Network'), '', L10n::t('Conversations from your friends')]; diff --git a/view/templates/nav.tpl b/view/templates/nav.tpl index b6513e0fe..3c71fa938 100644 --- a/view/templates/nav.tpl +++ b/view/templates/nav.tpl @@ -12,6 +12,8 @@ {{if $nav.register}}{{$nav.register.1}}{{/if}} {{if $nav.help}} {{$nav.help.1}}{{/if}} + + {{if $nav.tos}} {{$nav.tos.1}}{{/if}} {{if $nav.apps}}{{$nav.apps.1}}{{/if}} diff --git a/view/theme/duepuntozero/templates/nav.tpl b/view/theme/duepuntozero/templates/nav.tpl index a47dca390..fcab9dbde 100644 --- a/view/theme/duepuntozero/templates/nav.tpl +++ b/view/theme/duepuntozero/templates/nav.tpl @@ -12,6 +12,8 @@ {{if $nav.register}}{{$nav.register.1}}{{/if}} {{if $nav.help}} {{$nav.help.1}}{{/if}} + + {{if $nav.tos}} {{$nav.tos.1}}{{/if}} {{if $nav.apps}}{{$nav.apps.1}}{{/if}} diff --git a/view/theme/frio/templates/nav.tpl b/view/theme/frio/templates/nav.tpl index 96f42e7ac..c41243bc5 100644 --- a/view/theme/frio/templates/nav.tpl +++ b/view/theme/frio/templates/nav.tpl @@ -161,6 +161,9 @@ {{if $nav.help}}
  • {{$nav.help.1}}
  • {{/if}} + {{if $nav.tos}} +
  • {{$nav.tos.1}}
  • + {{/if}} {{if $nav.settings}}
  • {{$nav.settings.1}}
  • {{/if}} diff --git a/view/theme/quattro/templates/nav.tpl b/view/theme/quattro/templates/nav.tpl index f0aacd426..b5ae5c2d0 100644 --- a/view/theme/quattro/templates/nav.tpl +++ b/view/theme/quattro/templates/nav.tpl @@ -78,6 +78,7 @@ {{if $nav.logout}}
  • {{$nav.logout.1}}
  • {{/if}} {{if $nav.login}}
  • {{$nav.login.1}}
  • {{/if}} + {{if $nav.tos}}
  • {{$nav.tos.1}}
  • {{/if}} diff --git a/view/theme/smoothly/templates/nav.tpl b/view/theme/smoothly/templates/nav.tpl index faa6027b1..0c55b5886 100644 --- a/view/theme/smoothly/templates/nav.tpl +++ b/view/theme/smoothly/templates/nav.tpl @@ -50,6 +50,7 @@ {{if $nav.admin}}
  • {{$nav.admin.1}}
  • {{/if}} {{if $nav.help}}
  • {{$nav.help.1}}
  • {{/if}} + {{if $nav.tos}}
  • {{$nav.tos.1}}
  • {{/if}} {{if $nav.login}}
  • {{$nav.login.1}}
  • {{/if}} {{if $nav.logout}}
  • {{$nav.logout.1}}
  • {{/if}} diff --git a/view/theme/vier/templates/nav.tpl b/view/theme/vier/templates/nav.tpl index 281714e3e..376fcdc31 100644 --- a/view/theme/vier/templates/nav.tpl +++ b/view/theme/vier/templates/nav.tpl @@ -43,6 +43,7 @@