diff --git a/public/js/settings.js b/public/js/settings.js
index 3f57644..67d43d0 100644
--- a/public/js/settings.js
+++ b/public/js/settings.js
@@ -16,9 +16,9 @@ function openPopup(id) {
active = 2;
setActiveSetting(2);
document.querySelector('.popup .email_change').removeAttribute('id');
- document.querySelector('.popup #heading').innerHTML = "Change E-Mail";
+ document.querySelector('.popup #heading').innerHTML = "Change Email";
document.querySelector('.popup .warningtext').innerHTML = null;
- document.querySelector('.popup #desc').innerHTML = "Enter your new E-Mail below as well as confirming it.
E-Mails are primarily used to reset passwords.";
+ document.querySelector('.popup #desc').innerHTML = "Enter your new Email below as well as confirming it.
Emails are primarily used to reset passwords.";
break;
case 3:
active = 3;
diff --git a/resources/views/admin/users.blade.php b/resources/views/admin/users.blade.php
index a9f73fa..6a75881 100644
--- a/resources/views/admin/users.blade.php
+++ b/resources/views/admin/users.blade.php
@@ -294,9 +294,9 @@
Username: {{ $user->name }}
@if ($user->admin) -E-Mail: Admin E-Mail Hidden
+Email: Admin Email Hidden
@else -E-Mail: {{ $user->email }}
+Email: {{ $user->email }}
@endifID: {{ $user->id }}
DOB: {{ Carbon\Carbon::parse($user->dob)->format('d/m/Y') }}
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 3f58b4c..981ef71 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -14,7 +14,7 @@