Merge pull request #407 from digital-services-act/dsa-1672

Dsa 1672
digital-services-act · Jun 10, 2024 · d98b7ca · d98b7ca
2 parents 4bcc032 + 4b17c27
commit d98b7ca
Show file tree

Hide file tree

Showing 5 changed files with 115 additions and 89 deletions.
diff --git a/lang/en/menu.php b/lang/en/menu.php
@@ -14,7 +14,7 @@
  'FAQ' => 'FAQ',
  'General' => 'General',
  'Technical' => 'Technical',
- 'Platforms' => 'Platforms',
+ 'Documentations' => 'Documentations',
  'General_link'=>'faq#general-faq',
  'Technical_link'=>'faq#technical-faq',
  'Platforms_link'=>'faq#platforms-faq',

diff --git a/lang/fr/menu.php b/lang/fr/menu.php
@@ -17,7 +17,7 @@
  'Platforms_link'=>'faq#faq-de-la-plateforme',
  'General' => 'Général',
  'Technical' => 'Technique',
- 'Platforms' => 'Plateformes',
+ 'Documentations' => 'Documentations',
  'Submit statements of reasons' => 'Soumettre des Déclarations de Raisons',
  'Global Documentation' => 'Documentation Globale',
  'API Documentation' => 'Documentation de l\'API'

diff --git a/resources/views/components/ecl/footer.blade.php b/resources/views/components/ecl/footer.blade.php
@@ -48,6 +48,11 @@ class="ecl-link ecl-link--standalone ecl-link--inverted ecl-site-footer__link"
  class="ecl-link ecl-link--standalone ecl-link--inverted ecl-site-footer__link"
  aria-label="{{__('footer.Learn more about the DSA')}}">{{__('footer.Learn more about the DSA')}}</a></li>
 
+ <li class="ecl-site-footer__list-item">
+ <a href="{{ route('page.show', [__('menu.General_link')]) }}"
+ class="ecl-link ecl-link--standalone ecl-link--inverted ecl-site-footer__link"
+ aria-label="{{__('menu.General')}}">{{__('menu.FAQ')}}</a></li>
+
  <li class="ecl-site-footer__list-item">
  <a href="{{ route('page.show', ['page' => 'announcements']) }}"
  class="ecl-link ecl-link--standalone ecl-link--inverted ecl-site-footer__link"

diff --git a/resources/views/components/ecl/header.blade.php b/resources/views/components/ecl/header.blade.php
@@ -83,96 +83,114 @@ class="ecl-link ecl-link--standalone ecl-link--icon ecl-button ecl-button--terti
  <a href="{{ route('home') }}"
  class="ecl-link ecl-link--standalone ecl-menu__link"
  data-ecl-menu-link
- id="ecl-menu-home-link">Home</a>
+ id="ecl-menu-home-link">{{__('menu.Home')}}</a>
  </li>
 
-
- <li class="ecl-menu__item ecl-menu__item--has-children" data-ecl-menu-item=""
- data-ecl-has-children=""
- aria-expanded="false" id="ecl-menu-item-database">
- <a href="{{route('dashboard')}}"
+ <li class="ecl-menu__item" data-ecl-menu-item id="ecl-menu-home">
+ <a href="{{ route('dashboard') }}"
  class="ecl-link ecl-link--standalone ecl-menu__link"
- data-ecl-menu-link=""
- id="ecl-menu-item-database-link">The Database</a>
- <button class="ecl-button ecl-button--ghost ecl-menu__button-caret ecl-button--icon-only"
- type="button"
- data-ecl-menu-caret="" aria-label="The Database"
- aria-expanded="false"
- aria-describedby="ecl-menu-item-database-link">
- <span class="ecl-button__container">
- <svg class="ecl-icon ecl-icon--xs ecl-icon--rotate-180 ecl-button__icon ecl-button__icon--after"
- focusable="false" aria-hidden="true" data-ecl-icon="">
- <x-ecl.icon icon="corner-arrow"/>
- </svg>
- </span>
- </button>
- <div class="ecl-menu__mega" data-ecl-menu-mega="">
- <ul class="ecl-menu__sublist">
- <li class="ecl-menu__subitem" data-ecl-menu-subitem="">
- <a href="{{route('dashboard')}}"
- class="ecl-link ecl-link--standalone ecl-menu__sublink">Dashboard</a>
- </li>
- <li class="ecl-menu__subitem" data-ecl-menu-subitem="">
- <a href="{{route('dayarchive.index')}}"
- class="ecl-link ecl-link--standalone ecl-menu__sublink">Data
- Download</a>
- </li>
- <li class="ecl-menu__subitem" data-ecl-menu-subitem="">
- <a href="{{route('statement.index')}}"
- class="ecl-link ecl-link--standalone ecl-menu__sublink">Search
- for
- Statements of Reasons</a>
- </li>
- </ul>
- </div>
+ data-ecl-menu-link
+ id="ecl-menu-home-link">{{__('menu.Dashboard')}}</a>
  </li>
 
+ <li class="ecl-menu__item" data-ecl-menu-item id="ecl-menu-home">
+ <a href="{{ route('dayarchive.index') }}"
+ class="ecl-link ecl-link--standalone ecl-menu__link"
+ data-ecl-menu-link
+ id="ecl-menu-home-link">{{__('menu.Data Download')}}</a>
+ </li>
 
- <li class="ecl-menu__item ecl-menu__item--has-children" data-ecl-menu-item=""
- data-ecl-has-children=""
- aria-expanded="false" id="ecl-menu-item-faq">
- <a href="{{ route('page.show', ['faq']) }}"
+ <li class="ecl-menu__item" data-ecl-menu-item id="ecl-menu-home">
+ <a href="{{ route('statement.index') }}"
  class="ecl-link ecl-link--standalone ecl-menu__link"
- data-ecl-menu-link=""
- id="ecl-menu-item-faq-link">FAQ</a>
- <button class="ecl-button ecl-button--ghost ecl-menu__button-caret ecl-button--icon-only"
- type="button"
- data-ecl-menu-caret="" aria-label="FAQ"
- aria-expanded="false">
- <span class="ecl-button__container">
- <svg
- class="ecl-icon ecl-icon--xs ecl-icon--rotate-180 ecl-button__icon ecl-button__icon--after"
- focusable="false" aria-hidden="true" data-ecl-icon="">
- <x-ecl.icon icon="corner-arrow"/>
- </svg>
- </span>
- </button>
- <div class="ecl-menu__mega" data-ecl-menu-mega="">
- <ul class="ecl-menu__sublist">
- <li class="ecl-menu__subitem" data-ecl-menu-subitem="">
- <a href="{{ route('page.show', ['faq']) }}#general-faq"
- class="ecl-link ecl-link--standalone ecl-menu__sublink">General</a>
- </li>
- <li class="ecl-menu__subitem" data-ecl-menu-subitem="">
- <a href="{{ route('page.show', ['faq']) }}#technical-faq"
- class="ecl-link ecl-link--standalone ecl-menu__sublink">Technical</a>
- </li>
- <li class="ecl-menu__subitem" data-ecl-menu-subitem="">
- <a href="{{ route('page.show', ['faq']) }}#platform-faq"
- class="ecl-link ecl-link--standalone ecl-menu__sublink">Platforms</a>
- </li>
- </ul>
- </div>
+ data-ecl-menu-link
+ id="ecl-menu-home-link">{{__('menu.Search for Statements of Reasons')}}</a>
  </li>
 
 
+{{-- <li class="ecl-menu__item ecl-menu__item--has-children" data-ecl-menu-item=""--}}
+{{-- data-ecl-has-children=""--}}
+{{-- aria-expanded="false" id="ecl-menu-item-database">--}}
+{{-- <a href="{{route('dashboard')}}"--}}
+{{-- class="ecl-link ecl-link--standalone ecl-menu__link"--}}
+{{-- data-ecl-menu-link=""--}}
+{{-- id="ecl-menu-item-database-link">{{__('menu.The Database')}}</a>--}}
+{{-- <button class="ecl-button ecl-button--ghost ecl-menu__button-caret ecl-button--icon-only"--}}
+{{-- type="button"--}}
+{{-- data-ecl-menu-caret="" aria-label="The Database"--}}
+{{-- aria-expanded="false"--}}
+{{-- aria-describedby="ecl-menu-item-database-link">--}}
+{{-- <span class="ecl-button__container">--}}
+{{-- <svg class="ecl-icon ecl-icon--xs ecl-icon--rotate-180 ecl-button__icon ecl-button__icon--after"--}}
+{{-- focusable="false" aria-hidden="true" data-ecl-icon="">--}}
+{{-- <x-ecl.icon icon="corner-arrow"/>--}}
+{{-- </svg>--}}
+{{-- </span>--}}
+{{-- </button>--}}
+{{-- <div class="ecl-menu__mega" data-ecl-menu-mega="">--}}
+{{-- <ul class="ecl-menu__sublist">--}}
+{{-- <li class="ecl-menu__subitem" data-ecl-menu-subitem="">--}}
+{{-- <a href="{{route('dashboard')}}"--}}
+{{-- class="ecl-link ecl-link--standalone ecl-menu__sublink">{{__('menu.Dashboard')}}</a>--}}
+{{-- </li>--}}
+{{-- <li class="ecl-menu__subitem" data-ecl-menu-subitem="">--}}
+{{-- <a href="{{route('dayarchive.index')}}"--}}
+{{-- class="ecl-link ecl-link--standalone ecl-menu__sublink">{{__('menu.Data Download')}}</a>--}}
+{{-- </li>--}}
+{{-- <li class="ecl-menu__subitem" data-ecl-menu-subitem="">--}}
+{{-- <a href="{{route('statement.index')}}"--}}
+{{-- class="ecl-link ecl-link--standalone ecl-menu__sublink">{{__('menu.Search for Statements of Reasons')}}</a>--}}
+{{-- </li>--}}
+{{-- </ul>--}}
+{{-- </div>--}}
+{{-- </li>--}}
+
+
+{{-- <li class="ecl-menu__item ecl-menu__item--has-children" data-ecl-menu-item=""--}}
+{{-- data-ecl-has-children=""--}}
+{{-- aria-expanded="false" id="ecl-menu-item-faq">--}}
+{{-- <a href="{{ route('page.show', ['faq']) }}"--}}
+{{-- class="ecl-link ecl-link--standalone ecl-menu__link"--}}
+{{-- data-ecl-menu-link=""--}}
+{{-- id="ecl-menu-item-faq-link">{{__('menu.FAQ')}}</a>--}}
+{{-- <button class="ecl-button ecl-button--ghost ecl-menu__button-caret ecl-button--icon-only"--}}
+{{-- type="button"--}}
+{{-- data-ecl-menu-caret="" aria-label="FAQ"--}}
+{{-- aria-expanded="false">--}}
+{{-- <span class="ecl-button__container">--}}
+{{-- <svg--}}
+{{-- class="ecl-icon ecl-icon--xs ecl-icon--rotate-180 ecl-button__icon ecl-button__icon--after"--}}
+{{-- focusable="false" aria-hidden="true" data-ecl-icon="">--}}
+{{-- <x-ecl.icon icon="corner-arrow"/>--}}
+{{-- </svg>--}}
+{{-- </span>--}}
+{{-- </button>--}}
+{{-- <div class="ecl-menu__mega" data-ecl-menu-mega="">--}}
+{{-- <ul class="ecl-menu__sublist">--}}
+{{-- <li class="ecl-menu__subitem" data-ecl-menu-subitem="">--}}
+{{-- <a href="{{ route('page.show', [__('menu.General_link')]) }}"--}}
+{{-- class="ecl-link ecl-link--standalone ecl-menu__sublink">{{__('menu.General')}}</a>--}}
+{{-- </li>--}}
+{{-- <li class="ecl-menu__subitem" data-ecl-menu-subitem="">--}}
+{{-- <a href="{{ route('page.show', [__('menu.Technical_link')]) }}"--}}
+{{-- class="ecl-link ecl-link--standalone ecl-menu__sublink">{{__('menu.Technical')}}</a>--}}
+{{-- </li>--}}
+{{-- <li class="ecl-menu__subitem" data-ecl-menu-subitem="">--}}
+{{-- <a href="{{ route('page.show', [__('menu.Platforms_link')]) }}"--}}
+{{-- class="ecl-link ecl-link--standalone ecl-menu__sublink">{{__('menu.Platforms')}}</a>--}}
+{{-- </li>--}}
+{{-- </ul>--}}
+{{-- </div>--}}
+{{-- </li>--}}
+
+
  <li class="ecl-menu__item ecl-menu__item--has-children" data-ecl-menu-item=""
  data-ecl-has-children=""
  aria-expanded="false" id="ecl-menu-item-platforms">
- <a href="{{ route('profile.page.show', ['documentation']) }}"
+ <a href="{{  route('profile.page.show', ['documentation']) }}"
  class="ecl-link ecl-link--standalone ecl-menu__link"
  data-ecl-menu-link=""
- id="ecl-menu-item-platforms-link">Platforms</a>
+ id="ecl-menu-item-platforms-link">{{__('menu.Documentations')}}</a>
  <button class="ecl-button ecl-button--ghost ecl-menu__button-caret ecl-button--icon-only"
  type="button"
  data-ecl-menu-caret="" aria-label="Platforms"
@@ -190,25 +208,24 @@ class="ecl-icon ecl-icon--xs ecl-icon--rotate-180 ecl-button__icon ecl-button__i
 
  <div class="ecl-menu__mega" data-ecl-menu-mega="">
  <ul class="ecl-menu__sublist">
- @can('create statements')
- <li class="ecl-menu__subitem" data-ecl-menu-subitem="">
- <a href="{{ route('statement.create') }}"
- class="ecl-link ecl-link--standalone ecl-menu__sublink">
- Submit statements of reasons
- </a>
- </li>
- @endcan
+{{-- @can('create statements')--}}
+{{-- <li class="ecl-menu__subitem" data-ecl-menu-subitem="">--}}
+{{-- <a href="{{ route('statement.create') }}"--}}
+{{-- class="ecl-link ecl-link--standalone ecl-menu__sublink">--}}
+{{-- {{__('menu.Submit statements of reasons')}}--}}
+{{-- </a>--}}
+{{-- </li>--}}
+{{-- @endcan--}}
 
  <li class="ecl-menu__subitem" data-ecl-menu-subitem="">
- <a href="{{ route('profile.page.show', ['documentation']) }}"
+ <a href="{{  route('profile.page.show', ['documentation']) }}"
  class="ecl-link ecl-link--standalone ecl-menu__sublink">
- Global Documentation
+ {{__('menu.Global Documentation')}}
  </a>
  </li>
  <li class="ecl-menu__subitem" data-ecl-menu-subitem="">
  <a href="{{ route('profile.page.show', ['api-documentation']) }}"
- class="ecl-link ecl-link--standalone ecl-menu__sublink">API
- Documentation</a>
+ class="ecl-link ecl-link--standalone ecl-menu__sublink">{{__('menu.API Documentation')}}</a>
  </li>
  </ul>
  </div>

diff --git a/resources/views/components/ecl/login-menu.blade.php b/resources/views/components/ecl/login-menu.blade.php
@@ -38,6 +38,10 @@
  @can('create statements')
  <x-ecl.menu-item icon="settings" :link="route('profile.api.index')"
  title="{{__('menu.API Token Management')}}"/>
+
+ <x-ecl.menu-item icon="edit" :link="route('statement.create')"
+ title="{{__('menu.Submit statements of reasons')}}"/>
+
  @endcan
  <hr class="ecl-site-header__login-separator">
  <x-ecl.menu-item link="/logout" title="{{__('menu.Logout')}}"/>