{{ $t("Powered by ProcessMaker AI") }}
+ 
{{ $t("Powered by Decisions AI") }}
+ 
diff --git a/resources/views/auth/layouts/auth.blade.php b/resources/views/auth/layouts/auth.blade.php
new file mode 100644
index 0000000000..6c32bd13a3
--- /dev/null
+++ b/resources/views/auth/layouts/auth.blade.php
@@ -0,0 +1,77 @@
+
+
+
+
+
+
+
+
+
+
+ @yield('title') - {{ __('ProcessMaker') }}
+
+ @include('auth.partials.login-critical-styles')
+ @include('auth.partials.auth-styles')
+
+ @if (hasPackage('package-accessibility'))
+ @include('package-accessibility::userway')
+ @endif
+ @yield('css')
+
+
+
+ @hasSection('skip-language-selector')
+ @else
+ @include('auth.partials.language-selector')
+ @endif
+ {{ __('Login') }} - {{ __('ProcessMaker') }}
-
+ @include('auth.partials.login-critical-styles')
+ @include('auth.partials.auth-styles')
+ @include('auth.partials.login-extra-styles')
+
@if (hasPackage('package-accessibility'))
@include('package-accessibility::userway')
@endif
@@ -18,41 +21,15 @@
+
+ @yield('js')
+ @stack('scripts')
+ @hasSection('skip-auth-language-scripts')
+ @else
+ @include('auth.partials.auth-language-scripts')
+ @endif
+
+
diff --git a/resources/views/auth/newLogin.blade.php b/resources/views/auth/newLogin.blade.php
index ba45536b0c..00d898893e 100644
--- a/resources/views/auth/newLogin.blade.php
+++ b/resources/views/auth/newLogin.blade.php
@@ -10,7 +10,10 @@
+
+
+
+ @php
+ $loginFooterSetting = \ProcessMaker\Models\Setting::byKey('login-footer');
+ @endphp
+ @if ($loginFooterSetting)
+
+ @endif
+
+
+
+
+ @php
+ $isMobile = (
+ isset($_SERVER['HTTP_USER_AGENT'])
+ && \ProcessMaker\Helpers\MobileHelper::isMobile($_SERVER['HTTP_USER_AGENT'])
+ ) ? true : false;
+ @endphp
+ @if (!$isMobile)
+
+
+
+ @component('components.logo')
+ @endcomponent
+
+ @yield('content')
+
+
+ @endif
+
+
+ {{ __("INTELLIGENT BUSINESS ORCHESTRATION") }}
+
+ {{ __("Built to Master") }}
+ {{ __("Complexity") }}
+
+
+ {{ __("Orchestrate workflows, systems, and AI at a moment’s notice. Turn constant change into your greatest competitive advantage by giving your team the freedom to build, test, and iterate in real time.") }}
+
+
- 
- 
+ @include('auth.partials.language-selector')
-
-
-
-
-
-
-
- @php
- $isMobile = (
- isset($_SERVER['HTTP_USER_AGENT'])
- && \ProcessMaker\Helpers\MobileHelper::isMobile($_SERVER['HTTP_USER_AGENT'])
- ) ? true : false;
- @endphp
- @if (!$isMobile)
-
-
-
- @endif
- {{ __("Business process automation") }}
-{{ __("made") }} {{ __("efficient") }}
-
- {{ __("All the tools to empower anyone to quickly automate processes, from custom forms to unique enterprise workflows and complex business rules.") }}
-
-
-
-
@php
@@ -136,182 +150,29 @@ class="d-flex justify-content-end position-absolute language-button-container">
const togglePassword = document.querySelector('#togglePassword');
const password = document.querySelector('#password');
+ const capsLockWarning = document.querySelector('#capsLockWarning');
togglePassword.addEventListener('click', function (e) {
const type = password.getAttribute('type') === 'password' ? 'text' : 'password';
password.setAttribute('type', type);
this.classList.toggle('fa-eye-slash');
-});
-
-
-
-
-@foreach(GlobalScripts::getScripts() as $script)
- @if (strpos($script, '/vendor/processmaker/packages/package-dynamic-ui/js/global.js') !== 0)
-
- @endif
-@endforeach
-
-
-
+
+@include('auth.partials.auth-language-scripts')
diff --git a/resources/views/auth/partials/auth-language-scripts-minimal.blade.php b/resources/views/auth/partials/auth-language-scripts-minimal.blade.php
new file mode 100644
index 0000000000..ffd2e23558
--- /dev/null
+++ b/resources/views/auth/partials/auth-language-scripts-minimal.blade.php
@@ -0,0 +1,10 @@
+@foreach(GlobalScripts::getScripts() as $script)
+ @if (strpos($script, '/vendor/processmaker/packages/package-dynamic-ui/js/global.js') !== 0)
+
+ @endif
+@endforeach
+
+
diff --git a/resources/views/auth/partials/auth-language-scripts.blade.php b/resources/views/auth/partials/auth-language-scripts.blade.php
new file mode 100644
index 0000000000..691bb566d0
--- /dev/null
+++ b/resources/views/auth/partials/auth-language-scripts.blade.php
@@ -0,0 +1,4 @@
+
+
+
+@include('auth.partials.auth-language-scripts-minimal')
diff --git a/resources/views/auth/partials/auth-styles.blade.php b/resources/views/auth/partials/auth-styles.blade.php
new file mode 100644
index 0000000000..c3da7e4abf
--- /dev/null
+++ b/resources/views/auth/partials/auth-styles.blade.php
@@ -0,0 +1,375 @@
+
diff --git a/resources/views/auth/partials/language-selector.blade.php b/resources/views/auth/partials/language-selector.blade.php
new file mode 100644
index 0000000000..f41d2bc710
--- /dev/null
+++ b/resources/views/auth/partials/language-selector.blade.php
@@ -0,0 +1,8 @@
+
+
+
+ @php
+ $isMobile = (
+ isset($_SERVER['HTTP_USER_AGENT'])
+ && \ProcessMaker\Helpers\MobileHelper::isMobile($_SERVER['HTTP_USER_AGENT'])
+ ) ? true : false;
+ @endphp
+ @if (!$isMobile)
+
+
+
@component('components.logo')
@endcomponent
@@ -79,7 +56,13 @@ class="d-flex justify-content-end position-absolute language-button-container">
-
+
-
+
+
+
+ {{ __('Caps lock is on') }}
+
+
@@ -90,31 +73,62 @@ class="d-flex justify-content-end position-absolute language-button-container">
@endif
-
-
-
-
+
-
+
@endif
- @foreach ($addons as $addon)
- @include($addon->view, $addon->data)
- @endforeach
+ @if (count($addons))
+
+ @foreach ($addons as $addon)
+ @include($addon->view, $addon->data)
+ @endforeach
+
+ @endif
@if(isset($footer))
{!! $footer !!}
@endif
+
+ @endif
+
+ {{ __("INTELLIGENT BUSINESS ORCHESTRATION") }}
+
+ {{ __("Built to Master") }}
+ {{ __("Complexity") }}
+
+
+ {{ __("Orchestrate workflows, systems, and AI at a moment’s notice. Turn constant change into your greatest competitive advantage by giving your team the freedom to build, test, and iterate in real time.") }}
+
+
+
+
+
diff --git a/resources/views/auth/partials/login-critical-styles.blade.php b/resources/views/auth/partials/login-critical-styles.blade.php
new file mode 100644
index 0000000000..414cf61815
--- /dev/null
+++ b/resources/views/auth/partials/login-critical-styles.blade.php
@@ -0,0 +1,11 @@
+
diff --git a/resources/views/auth/partials/login-extra-styles.blade.php b/resources/views/auth/partials/login-extra-styles.blade.php
new file mode 100644
index 0000000000..a4ced842e2
--- /dev/null
+++ b/resources/views/auth/partials/login-extra-styles.blade.php
@@ -0,0 +1,107 @@
+
diff --git a/resources/views/auth/passwords/change.blade.php b/resources/views/auth/passwords/change.blade.php
index 7216d85de6..1f36c391d6 100644
--- a/resources/views/auth/passwords/change.blade.php
+++ b/resources/views/auth/passwords/change.blade.php
@@ -1,67 +1,64 @@
-@extends('layouts.minimal')
+@extends('auth.layouts.auth')
+
+@section('skip-auth-language-scripts', 'skip')
+
@section('title')
{{ __('Change Password') }}
@endsection
-@section('content')
-
-
-
- @php
- $loginLogo = \ProcessMaker\Models\Setting::getLogin();
- $isDefault = \ProcessMaker\Models\Setting::loginIsDefault();
- $class = $isDefault ? 'login-logo-default' : 'login-logo-custom';
- @endphp
- 
-
-
-
-
+@section('content')
+
-
-
-
+
@endsection
+@section('css')
+
+@endsection
+
@section('js')
@@ -71,82 +68,66 @@
-@endsection
-@section('css')
-
+ ProcessMaker.apiClient.put('password/change', this.formData)
+ .then(response => {
+ if (response.status === 200) {
+ window.location.href = '/';
+ }
+ })
+ .catch(error => {
+ this.errors = error.response.data.errors;
+ });
+ },
+ }
+ });
+
+@include('auth.partials.auth-language-scripts-minimal')
@endsection
diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php
index 5467fdc25b..255675788c 100644
--- a/resources/views/auth/passwords/email.blade.php
+++ b/resources/views/auth/passwords/email.blade.php
@@ -1,72 +1,44 @@
-@extends('layouts.minimal')
+@extends('auth.layouts.auth')
@section('title')
-{{__('Forgot Your Password?')}}
+{{ __('Password Assistance') }}
@endsection
@section('content')
+
+
-{{ __('Password Assistance') }}
+{{ __("Please enter your email address and we'll send you a reset link.") }}
+
-
- @component('components.logo')
- @endcomponent
-
{{__('Forgot Your Password?')}}
-{{__("Enter your email address and we'll send you a reset link.")}}
+