From e667ddf3331ff3f66072feb11039793102d6af04 Mon Sep 17 00:00:00 2001 From: Roly Gutierrez Date: Thu, 3 Sep 2026 12:54:21 -0400 Subject: [PATCH] feat(FOUR-33062): apply Decisions branding to 2FA views Replace legacy ProcessMaker layout in the two-step authentication screens with the shared Decisions auth styling. - Add auth/layouts/two-factor.blade.php with Decisions background, slogan panel, and auth partials without app-login.js - Refactor auth/2fa/otp.blade.php to extend the new layout while preserving existing form behavior, links, and scripts - Refactor auth/2fa/auth_app_qr.blade.php to use the same layout - Remove legacy assets and inline CSS (new_background.png, slogan.svg, processmaker_do_more.svg) https://processmaker.atlassian.net/browse/FOUR-33062 --- .../views/auth/2fa/auth_app_qr.blade.php | 135 +++------ resources/views/auth/2fa/otp.blade.php | 258 ++++++------------ .../views/auth/layouts/two-factor.blade.php | 64 +++++ 3 files changed, 179 insertions(+), 278 deletions(-) create mode 100644 resources/views/auth/layouts/two-factor.blade.php diff --git a/resources/views/auth/2fa/auth_app_qr.blade.php b/resources/views/auth/2fa/auth_app_qr.blade.php index cd370d4557..e1362e6e9e 100644 --- a/resources/views/auth/2fa/auth_app_qr.blade.php +++ b/resources/views/auth/2fa/auth_app_qr.blade.php @@ -1,68 +1,39 @@ - - - - - - - - - - {{ __('Configure the authenticator app') }} - - - - -
-
-
-
-
- @php - $isMobile = ( - isset($_SERVER['HTTP_USER_AGENT']) - && \ProcessMaker\Helpers\MobileHelper::isMobile($_SERVER['HTTP_USER_AGENT']) - ) ? true : false; - @endphp - @if (!$isMobile) -
- ProcessMaker - -
- @endif -
-
-
-
- @component('components.logo') - @endcomponent -

-

-
- {{__('Configure the authenticator app')}} -
-
- {{__('1.- Download the Google Authenticator App')}} -
-
- {{__('2.- On the Google Authenticator app click on the + icon')}} -
-
- {{__('3.- Select "Scan QR code" option')}} -
-
- QR -
-
- -
-
-
-
-
+@extends('auth.layouts.two-factor') + +@section('title') +{{ __('Configure the authenticator app') }} +@endsection + +@section('content') +
+
+ {{__('Configure the authenticator app')}}
+
+ {{__('1.- Download the Google Authenticator App')}} +
+
+ {{__('2.- On the Google Authenticator app click on the + icon')}} +
+
+ {{__('3.- Select "Scan QR code" option')}} +
+
+QR +
+
+ + {{ __('Log in as another user') }} + +
+
+
+
- +@endsection + +@push('scripts') - - +@endpush diff --git a/resources/views/auth/2fa/otp.blade.php b/resources/views/auth/2fa/otp.blade.php index b08295a3c0..4d88d52878 100644 --- a/resources/views/auth/2fa/otp.blade.php +++ b/resources/views/auth/2fa/otp.blade.php @@ -1,101 +1,85 @@ - - - - - - - - - - {{ __('Enter Security Code') }} - - - - -
-
-
-
-
- @php - $isMobile = ( - isset($_SERVER['HTTP_USER_AGENT']) - && \ProcessMaker\Helpers\MobileHelper::isMobile($_SERVER['HTTP_USER_AGENT']) - ) ? true : false; - @endphp - @if (!$isMobile) -
- ProcessMaker - -
- @endif -
-
-
-
- @component('components.logo') - @endcomponent -
-
- @if (session()->has('2fa-message') && !session()->has('2fa-error')) -
{{ session()->get('2fa-message')}}
- @endif - @if (session()->has('2fa-error')) -
{{ session()->get('2fa-error')}}
- @endif +@extends('auth.layouts.two-factor') -
- -
- - - @if ($errors->has('code')) - - {{ $errors->first('code') }} - - @endif -
-
-
-
- - {{ __('Send Again') }} - -
- @if (in_array(\ProcessMaker\TwoFactorAuthentication::AUTH_APP, - config('password-policies.2fa_method', []))) -
- - {{ __('Authenticator app') }} - -
- @endif -
-
- -
-
-
-
-
+@section('title') +{{ __('Enter Security Code') }} +@endsection + +@section('css') + +@endsection + +@section('content') +
+ @if (session()->has('2fa-message') && !session()->has('2fa-error')) +
{{ session()->get('2fa-message')}}
+ @endif + @if (session()->has('2fa-error')) +
{{ session()->get('2fa-error')}}
+ @endif + +
+ +
+ + + @if ($errors->has('code')) + + {{ $errors->first('code') }} + + @endif +
+
+
+
+ + {{ __('Send Again') }} + +
+
+ @if (in_array(\ProcessMaker\TwoFactorAuthentication::AUTH_APP, + config('password-policies.2fa_method', []))) + + {{ __('Authenticator app') }} + +
+ @endif + + {{ __('Log in as another user') }} +
-
- +
+ +
+ +@endsection + +@push('scripts') - - +@endpush diff --git a/resources/views/auth/layouts/two-factor.blade.php b/resources/views/auth/layouts/two-factor.blade.php new file mode 100644 index 0000000000..51ab52c96e --- /dev/null +++ b/resources/views/auth/layouts/two-factor.blade.php @@ -0,0 +1,64 @@ + + + + + + + + + + @yield('title') + + @include('auth.partials.login-critical-styles') + @include('auth.partials.auth-styles') + + @yield('css') + + +
+
+
+
+ +
+ @php + $loginFooterSetting = \ProcessMaker\Models\Setting::byKey('login-footer'); + @endphp + @if ($loginFooterSetting) +
{!! $loginFooterSetting->config['html'] !!}
+ @endif +
+
+ @stack('scripts') + +