From 91e58e21876971ad77b8bd3ca3254ba6902da516 Mon Sep 17 00:00:00 2001
From: Krzysztof Strzelecki <ks37365@st.amu.edu.pl>
Date: Fri, 31 Jan 2020 14:16:11 +0100
Subject: [PATCH] =?UTF-8?q?poprawki=20widok=C3=B3w,=20ujednolicenie=20etyk?=
 =?UTF-8?q?iet=20przycisk=C3=B3w?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/views/equipmentAdd.blade.php       | 2 +-
 resources/views/equipmentEdit.blade.php      | 2 +-
 resources/views/fireFightersAdd.blade.php    | 2 +-
 resources/views/fireFightersEdit.blade.php   | 2 +-
 resources/views/fireStationEdit.blade.php    | 2 +-
 resources/views/inc/addFireStation.blade.php | 2 +-
 resources/views/login.blade.php              | 7 +++++--
 resources/views/register.blade.php           | 4 ++--
 resources/views/trainings.blade.php          | 2 +-
 resources/views/userProfileEdit.blade.php    | 2 +-
 resources/views/vehiclesAdd.blade.php        | 2 +-
 resources/views/vehiclesEdit.blade.php       | 2 +-
 12 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/resources/views/equipmentAdd.blade.php b/resources/views/equipmentAdd.blade.php
index 5f3535e..e2cadd3 100644
--- a/resources/views/equipmentAdd.blade.php
+++ b/resources/views/equipmentAdd.blade.php
@@ -27,7 +27,7 @@
         </div>
 
 		<div class="form-group">
-            <button style="cursor:pointer" type="submit" class="btn btn-primary">Zatwierdź</button>
+            <button style="cursor:pointer" type="submit" class="btn btn-primary">Utwórz</button>
         </div>
         @include('inc.formerrors')
     </form>
diff --git a/resources/views/equipmentEdit.blade.php b/resources/views/equipmentEdit.blade.php
index d798c61..85bbd25 100644
--- a/resources/views/equipmentEdit.blade.php
+++ b/resources/views/equipmentEdit.blade.php
@@ -30,7 +30,7 @@
         </div>
 
 		<div class="form-group">
-            <button style="cursor:pointer" type="submit" class="btn btn-primary">Zatwierdź</button>
+            <button style="cursor:pointer" type="submit" class="btn btn-primary">Zapisz</button>
         </div>
         @include('inc.formerrors')
     </form>
diff --git a/resources/views/fireFightersAdd.blade.php b/resources/views/fireFightersAdd.blade.php
index 1dfb004..08a0185 100644
--- a/resources/views/fireFightersAdd.blade.php
+++ b/resources/views/fireFightersAdd.blade.php
@@ -59,7 +59,7 @@
         </div>
 
         <div class="form-group">
-            <button style="cursor:pointer" type="submit" class="btn btn-primary">Submit</button>
+            <button style="cursor:pointer" type="submit" class="btn btn-primary">Utwórz</button>
         </div>
         @include('inc.formerrors')
     </form>
diff --git a/resources/views/fireFightersEdit.blade.php b/resources/views/fireFightersEdit.blade.php
index 743fc41..f919d03 100644
--- a/resources/views/fireFightersEdit.blade.php
+++ b/resources/views/fireFightersEdit.blade.php
@@ -36,7 +36,7 @@
 
 
         <div class="form-group">
-            <button style="cursor:pointer" type="submit" class="btn btn-primary">Edytuj</button>
+            <button style="cursor:pointer" type="submit" class="btn btn-primary">Zapisz</button>
         </div>
         @include('inc.formerrors')
     </form>
diff --git a/resources/views/fireStationEdit.blade.php b/resources/views/fireStationEdit.blade.php
index 67f48ac..a50b992 100644
--- a/resources/views/fireStationEdit.blade.php
+++ b/resources/views/fireStationEdit.blade.php
@@ -95,7 +95,7 @@
 
 
         <div class="form-group">
-            <button style="cursor:pointer" type="submit" class="btn btn-primary">Submit</button>
+            <button style="cursor:pointer" type="submit" class="btn btn-primary">Zapisz</button>
         </div>
         @include('inc.formerrors')
     </form>
diff --git a/resources/views/inc/addFireStation.blade.php b/resources/views/inc/addFireStation.blade.php
index 1d04f60..39fc31e 100644
--- a/resources/views/inc/addFireStation.blade.php
+++ b/resources/views/inc/addFireStation.blade.php
@@ -94,7 +94,7 @@
         
 
         <div class="form-group">
-            <button style="cursor:pointer" type="submit" class="btn btn-primary">Submit</button>
+            <button style="cursor:pointer" type="submit" class="btn btn-primary">Utwórz</button>
         </div>
         @include('inc.formerrors')
     </form>
diff --git a/resources/views/login.blade.php b/resources/views/login.blade.php
index 8e1301d..281d3a4 100644
--- a/resources/views/login.blade.php
+++ b/resources/views/login.blade.php
@@ -11,6 +11,9 @@
     </div>
     @endif
 
+    @if( auth()->check())
+    Jesteś już zalogowany.
+    @else
     <h2>Zaloguj się</h2>
 
     <form method="POST" action="/login">
@@ -21,7 +24,7 @@
         </div>
 
         <div class="form-group">
-            <label for="password">Password:</label>
+            <label for="password">Hasło:</label>
             <input type="password" class="form-control" id="password" name="password">
         </div>
 
@@ -32,5 +35,5 @@
     </form>
 
 <a href="/forgottenPassword">Nie pamiętam hasła<a>
-
+    @endif
 @endsection
diff --git a/resources/views/register.blade.php b/resources/views/register.blade.php
index b210e45..7b6a5fd 100644
--- a/resources/views/register.blade.php
+++ b/resources/views/register.blade.php
@@ -3,7 +3,7 @@
 
 @section('center-area')
     @parent
-    <h2>Register</h2>
+    <h2>Rejestracja</h2>
     <form method="POST" action="/register">
         {{ csrf_field() }}
         <div class="form-group">
@@ -45,7 +45,7 @@
         </div>
 
         <div class="form-group">
-            <button style="cursor:pointer" type="submit" class="btn btn-primary">Submit</button>
+            <button style="cursor:pointer" type="submit" class="btn btn-primary">Zarejestruj</button>
         </div>
         @include('inc.formerrors')
     </form>
diff --git a/resources/views/trainings.blade.php b/resources/views/trainings.blade.php
index d8a3cc9..ae79309 100644
--- a/resources/views/trainings.blade.php
+++ b/resources/views/trainings.blade.php
@@ -120,7 +120,7 @@
             title: "Podaj nową nazwę",
             width: 'auto',
             input: 'text',
-            confirmButtonText: 'Tak',
+            confirmButtonText: 'Zapisz',
             cancelButtonText: 'Anuluj',
             showCancelButton: true,
             inputValidator: (value) => {
diff --git a/resources/views/userProfileEdit.blade.php b/resources/views/userProfileEdit.blade.php
index d949ce2..24c8290 100644
--- a/resources/views/userProfileEdit.blade.php
+++ b/resources/views/userProfileEdit.blade.php
@@ -41,7 +41,7 @@
         </div>
 
 		<div class="form-group">
-            <button style="cursor:pointer" type="submit" class="btn btn-primary">Zatwierdź</button>
+            <button style="cursor:pointer" type="submit" class="btn btn-primary">Zapisz</button>
         </div>
         @include('inc.formerrors')
     </form>
diff --git a/resources/views/vehiclesAdd.blade.php b/resources/views/vehiclesAdd.blade.php
index c2832fe..b425ced 100644
--- a/resources/views/vehiclesAdd.blade.php
+++ b/resources/views/vehiclesAdd.blade.php
@@ -120,7 +120,7 @@
         </div>
 
 		<div class="form-group">
-            <button style="cursor:pointer" type="submit" class="btn btn-primary">Zatwierdź</button>
+            <button style="cursor:pointer" type="submit" class="btn btn-primary">Utwórz</button>
         </div>
         @include('inc.formerrors')
     </form>
diff --git a/resources/views/vehiclesEdit.blade.php b/resources/views/vehiclesEdit.blade.php
index fd01112..41341ed 100644
--- a/resources/views/vehiclesEdit.blade.php
+++ b/resources/views/vehiclesEdit.blade.php
@@ -123,7 +123,7 @@
         </div>
 
 		<div class="form-group">
-            <button style="cursor:pointer" type="submit" class="btn btn-primary">Zatwierdź zmiany</button>
+            <button style="cursor:pointer" type="submit" class="btn btn-primary">Zapisz</button>
         </div>
         @include('inc.formerrors')
     </form>