Revize e68ef64b

Re #7594 formátování kódu a chybové hlášky do angličtiny

app/FrontModule/component/User/SettingsForm.latte

@@ -1 +1 @@
 <div class="row">
-    <div class="col-4">
+    <div class="col-12">
         {control form}
     </div>
 </div>

app/FrontModule/component/User/SettingsForm.php

@@ -71 +71 @@
 
         if ($result)
         {
-            $this->presenter->flashMessage('Uživatel byl úspěšně upraven.', EFlashMessage::SUCCESS);
+            $this->presenter->flashMessage('Settings were saved successfully.', EFlashMessage::SUCCESS);
             $this->presenter->redirect('Homepage:userSettings');
         } else
         {
-            $form->addError('Uživatele se nepodařilo upravit.');
+            $form->addError('There was an error updating user settings.');
         }
     }
 
@@ -90 +90 @@
         $userSelection = $this->userRepository->findById($this->presenter->getUser()->getId());
         $userRow = $userSelection->fetch();
 
-        if ($userRow) {
+        if ($userRow)
+        {
             $defaultValues['email'] = $userRow->{UserRepository::COLUMN_EMAIL};
         }
 

app/FrontModule/templates/@layout.latte

@@ -57 +57 @@
 
 <!--Content-->
 <div class="content">
-    <div n:foreach="$flashes as $flash" n:class="alert, 'alert-' . $flash->type">{$flash->message}</div>
+    <div n:foreach="$flashes as $flash" n:class="alert, 'alert-' . $flash->type, alert-dismissible, fade, show" role="alert">
+        {$flash->message}
+        <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+            <span aria-hidden="true">&times;</span>
+        </button>
+    </div>
 
     {include content}
 </div>

app/FrontModule/templates/Homepage/userSettings.latte

@@ -1 +1 @@
 {block content}
     <div class="row">
-        <div class="col">
+        <div class="col-4">
             <fieldset>
-                <legend>Change user email or password</legend>
+                <legend>User details</legend>
 
                 {control userSettingsForm}
             </fieldset>

app/model/facade/UserFacade.php

@@ -72 +72 @@
         return $userRow;
     }
 
-    public function saveUserSettings(array $values, int $id){
+    /**
+     * Uložení nastavení uživatele
+     *
+     * @param array $values
+     * @param int $id
+     * @return false|\Nette\Database\Table\ActiveRow
+     */
+    public function saveUserSettings(array $values, int $id)
+    {
         unset($values[UserEditForm::PASSWORD_CONFIRM]);
 
 
@@ -86 +94 @@
 
         $userRow = $this->userRepository->findById($id)->fetch();
 
-        if ($userRow) {
+        if ($userRow)
+        {
             $userRow->update($values);
         }
 

app/templates/@menu.latte

@@ -31 +31 @@
     {/if}
     <div class="navbar-nav nav-item">
         {if $user->loggedIn}
-            <a class="nav-link" n:href=":Front:Homepage:logout">Logout</a>
             <a class="nav-link" n:href=":Front:Homepage:userSettings">User settings</a>
+            <a class="nav-link" n:href=":Front:Homepage:logout">Logout</a>
         {else}
             <a class="nav-link" n:href=":Front:Homepage:login">Login</a>
         {/if}