Skip to content

[4.0] Correcting WebAuthn display in login menu item #32196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
richard67 merged 3 commits into from
Feb 1, 2021
Merged

[4.0] Correcting WebAuthn display in login menu item #32196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3520837
[4.0] Correcting WebAuthn display in login menu item
infograf768 Jan 30, 2021
6cd62f7
keeping svg in case of
infograf768 Jan 30, 2021
85c9df0
reverting changes in default_login.php correcting login modules to be
infograf768 Jan 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions administrator/modules/mod_login/tmpl/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ class="btn btn-secondary w-100 mt-4 <?php echo $button['class'] ?? '' ?>"
<span class="<?php echo $button['icon'] ?>"></span>
<?php elseif (!empty($button['image'])): ?>
<?php echo $button['image']; ?>
<?php elseif (!empty($button['svg'])): ?>
<?php echo $button['svg']; ?>
<?php endif; ?>
<?php echo Text::_($button['label']) ?>
</button>
Expand Down
2 changes: 1 addition & 1 deletion components/com_users/tmpl/login/default_login.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
<div class="com-users-login__submit control-group">
<div class="controls">
<button type="button"
class="btn btn-secondary <?php echo $button['class'] ?? '' ?>"
class="btn btn-secondary w-100 <?php echo $button['class'] ?? '' ?>"
Copy link
Contributor

@nikosdion nikosdion Jan 30, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change is OK with me. If a third party plugin needs to override the width it can do so with CSS.

<?php foreach ($dataAttributeKeys as $key): ?>
<?php echo $key ?>="<?php echo $button[$key] ?>"
<?php endforeach; ?>
Expand Down
2 changes: 2 additions & 0 deletions modules/mod_login/tmpl/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@ class="btn btn-secondary w-100 mt-4 <?php echo $button['class'] ?? '' ?>"
<span class="<?php echo $button['icon'] ?>"></span>
<?php elseif (!empty($button['image'])): ?>
<?php echo $button['image']; ?>
<?php elseif (!empty($button['svg'])): ?>
<?php echo $button['svg']; ?>
<?php endif; ?>
<?php echo Text::_($button['label']) ?>
</button>
Expand Down
2 changes: 1 addition & 1 deletion plugins/system/webauthn/src/PluginTraits/AdditionalLoginButtons.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ public function onUserLoginButtons(string $form): array
'id' => $randomId,
'data-webauthn-form' => $form,
'data-webauthn-url' => $url,
'image' => $image,
'svg' => $image,
'class' => 'plg_system_webauthn_login_button',
],
];
Expand Down