Merge branch 'main' of http://git.pb.bib.de/PBBFA23CIV/EIANotesApp

Controller/UserController.php

@@ -28,9 +28,6 @@ class UserController
         }
         else {
             $this->view->setDoMethodName("showUserLoginForm");
-            ## $this->view->setVars([
-            ##    "errmsg" => $erg["message"]
-            ## ]);
             $this->showUserLoginForm();
         }
 

Views/Welcome/showWelcome.phtml

@@ -9,23 +9,23 @@ $this->notesModel = new \ppa\Model\NotesModel();
 $this->userModel = new \ppa\Model\UserModel();
 ?>    
 
-<h2>Willkommen in der Notiz App!</h2>
+<h2>Welcome in out Notes App!</h2>
 
-<p>Um loszulegen, wählen Sie bitte eine Option aus der Navigation.</p>
+<p>To start, simply select an option in the navigation bar.</p>
 
-<h2>Notiz App Statistiken</h2>
+<h2>Notes App statistics</h2>
 <b style="font-size: 20px; margin: 20px">
     <?php 
     echo $this->notesModel->getNoteCount();
     ?>
-    Notizen
+    Notes
 </b><br>
 
 <b style="font-size: 20px; margin: 20px">
     <?php 
     echo $this->userModel->getUserCount();
     ?>
-    Benutzer
+    Users
 </b>
 
 <?php include dirname(__DIR__).'/footer.phtml'; ?>

Views/header.phtml

@@ -14,8 +14,8 @@
 
             <nav class="top-nav">
                 <ul>
-                    <li><a href="?controller=Welcome&do=showWelcome">Willkommen</a></li>
-                    <li><a href="?controller=Notes&do=showNotes">Notizen</a></li>
+                    <li><a href="?controller=Welcome&do=showWelcome">Welcome!</a></li>
+                    <li><a href="?controller=Notes&do=showNotes">Notes</a></li>
                 </ul>
             </nav>