Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master

Conflicts: skolehjem/resources/lang/dk/msg.php skolehjem/resources/lang/en/msg.php
2020-08-12 13:10:37 +02:00
parent 4a8b22d6dd 6671cd6aa8
commit e06504b5fb
6 changed files with 33 additions and 2 deletions
@@ -51,7 +51,8 @@ return[
    "indstillinger" => "Indstillinger",
    "ændrebillede" => "Skift billede",
    "ændrer" => "Skift",
-    "profilbillede" => "Upload profil billede"
+    "profilbillede" => "Upload profil billede",
+    "omkring" => "Omkring",



@@ -60,5 +60,6 @@ return[
    "indstillinger" => "Settings",
    "ændrebillede" => "Change picture",
    "ændrer" => "Change",
-    "profilbillede" => "Upload profile picture"
+    "profilbillede" => "Upload profile picture",
+    "Omkring" => "About",
 ];
@@ -0,0 +1,10 @@
+@extends("app.layout.base")
+@section("title")
+    Aktiviteter
+@endsection
+
+@section("content")
+    <main>
+        <h1 class="text-center sde-blue mb-0" style="margin-bottom: 2rem">{{ __('msg.omkring') }}</h1>
+    </main>
+@endsection
@@ -71,6 +71,10 @@
        <img src="{{URL::asset('/images/icons/settings-hvid.svg')}}" alt="Indstillinger">
        {{ __('msg.indstillinger') }}
    </a>
+    <a href="{{ route('about.index') }}">
+        <img src="{{URL::asset('/images/icons/Logout.svg')}}" alt="Omkring">
+        {{ __('msg.omkring') }}
+    </a>
    <a href="{{ route('users.logout') }}">
        <img src="{{URL::asset('/images/icons/Logout.svg')}}" alt="Logud">
        {{ __('msg.logud') }}