Skip to content
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.

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

Add layouts to plg_user_terms #23787

Merged
merged 4 commits into from Feb 19, 2019

Conversation

Projects
None yet
9 participants
@Ruud68
Copy link
Contributor

Ruud68 commented Feb 7, 2019

Pull Request for Issue # n/a.

Summary of Changes

the layouts for plg_user_terms (label and termsnote) are hardcoded into the field and cannot be overwritten by a template override
This PR adds layouts for both the label and for the termsnote (message). these layouts can be overwritten via template overrides.

Testing Instructions

  1. enable the terms userm plugin
  2. set a joomla article as terms article in the plugin
    on the front-end user registration page the terms box should show

Apply this PR

[test] on the front-end user regsitration page the terms box should be exactly the same as without this PR.

  1. create a template override via the template (e.g. protostar):
    -> tab Create Overrides
    -> column Layouts
    -> select plugins > user

Edit the created override file: ./templates/protostar/html/layouts/plugins/user/terms/message.php
4. change the class from alert-info to alert-warning

[Result 1] refresh on the front-end the new user registration form

Edit the created override file: ./templates/protostar/html/layouts/plugins/user/terms/label.php
5. change <span class="star">&#160;*</span></label> to <span class="star">&copy;*</span></label>

[Result 2] refresh on the front-end the new user registration form

New result

image

Actual result

Make sure that after applying the PR everything works as before.

Documentation Changes Required

$attribs = array();
$attribs['class'] = 'modal';
$attribs['rel'] = '{handler: \'iframe\', size: {x:800, y:500}}';

This comment has been minimized.

@dgrammatiko

dgrammatiko Feb 7, 2019

Contributor

Can you please move this to use Bootstrap Modal instead of the Mootools?

This comment has been minimized.

@Ruud68

Ruud68 Feb 8, 2019

Author Contributor

no, my aim is to do one change a time. The aim of this PR is to add layout overrides for this plugin, just as I did for the plg_system_privacyconsent, not to change the logic.

This comment has been minimized.

@dgrammatiko

dgrammatiko Feb 14, 2019

Contributor

It's 2019, we shouldn't use Mootools.-

This comment has been minimized.

@Ruud68

Ruud68 Feb 14, 2019

Author Contributor

what is the code change needed for switching from mootools to bootstrap modal?

This comment has been minimized.

@mbabker

mbabker Feb 14, 2019

Member

See #22926 for an example.

Converting from MooTools to Bootstrap is a change for another PR. Please do not include it here.

This comment has been minimized.

@Ruud68

Ruud68 Feb 14, 2019

Author Contributor

Thanks @mbabker and agree

@tecpromotion

This comment has been minimized.

Copy link
Contributor

tecpromotion commented Feb 8, 2019

I have tested this item successfully on c56805f

I have tested this item successfully on 3.9.2.


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/23787.

@Ruud68

This comment has been minimized.

Copy link
Contributor Author

Ruud68 commented Feb 8, 2019

Thanks for testing @tecpromotion :) Appreciate it!


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/23787.

Show resolved Hide resolved layouts/plugins/user/terms/label.php Outdated
@viocassel

This comment has been minimized.

Copy link
Contributor

viocassel commented Feb 9, 2019

I have tested this item successfully on 13a7114


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/23787.

@Ruud68

This comment has been minimized.

Copy link
Contributor Author

Ruud68 commented Feb 9, 2019

Thanks for testing @viocassel

@Ruud68

This comment has been minimized.

Copy link
Contributor Author

Ruud68 commented Feb 14, 2019

@Quy I see two successful tests, only one is counted? Do you know why and what is needed for this to go RTC?


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/23787.

@Bakual

This comment has been minimized.

Copy link
Contributor

Bakual commented Feb 14, 2019

When a new commit is made after a test, you need to retest it. The old tests don't count anymore.

@Ruud68

This comment has been minimized.

Copy link
Contributor Author

Ruud68 commented Feb 14, 2019

@Bakual which is strange, because the one counted as successful is the one before the last change? anyway @viocassel and @tecpromotion just to make sure, can you both (re) test #please :)

@Bakual

This comment has been minimized.

Copy link
Contributor

Bakual commented Feb 14, 2019

It shows the one from Vio as successful one. The first one from Stefan is discarded since you did two commits afterwards.
image
So @tecpromotion or someone else has to test (again).

@tecpromotion

This comment has been minimized.

Copy link
Contributor

tecpromotion commented Feb 18, 2019

I have tested this item successfully on 7ff2f05

I have tested this item successfully on 3.9.3.


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/23787.

@viocassel

This comment has been minimized.

Copy link
Contributor

viocassel commented Feb 18, 2019

I have tested this item successfully on 7ff2f05


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/23787.

@HLeithner HLeithner merged commit 49eacdc into joomla:staging Feb 19, 2019

4 checks passed

JTracker/HumanTestResults Human Test Results: 2 Successful 0 Failed.
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/drone/pr the build was successful
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@HLeithner

This comment has been minimized.

Copy link
Member

HLeithner commented Feb 19, 2019

thx

@HLeithner HLeithner added this to the Joomla 3.9.4 milestone Feb 19, 2019

@Ruud68 Ruud68 deleted the Ruud68:plgusertermslayouts branch Feb 22, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.