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

[4.0] Remove JHELP_ strings for com_categories #35534

Merged
merged 8 commits into from
Sep 23, 2021

Conversation

Bakual
Copy link
Contributor

@Bakual Bakual commented Sep 11, 2021

Pull Request for Issue #35416

Summary of Changes

This PR removes the JHELP_COMPONENTS_FOO_CATEGORIES, JHELP_COMPONENTS_FOO_CATEGORY_ADD and JHELP_COMPONENTS_FOO_CATEGORY_EDIT language strings and puts the reference keys into the respective category.xml as help entry.
com_categories already supports the category.xml file for expanding the category form. I've add additional code to support a help and listhelp node similar to com_menu and com_config.

3rd parties can also use an "url" attribute to specify the url of their help page.

Testing Instructions

Test the help buttons in the categories sections of the various core components (content, banner, contact, newsfeed, user notes)

Actual result BEFORE applying this Pull Request

Help buttons work

Expected result AFTER applying this Pull Request

Help buttons work, no change in behavior.

Documentation Changes Required

If help buttons are documented anywhere, this could be added.

@conconnl
Copy link
Member

Related too #35418 as well

@conconnl
Copy link
Member

I have tested this item ✅ successfully on 0f14956

Upload the PR Test zip.
Checked if all files were applied.
Tested, Banners, Content, Contacts, Newsfeeds, User Notes


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

@richard67 richard67 added this to the Joomla 4.0.4 milestone Sep 12, 2021
@RickR2H
Copy link
Member

RickR2H commented Sep 12, 2021

I have tested this item ✅ successfully on 0f14956

Tested on all the help buttons. All work!


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

@joomla-cms-bot joomla-cms-bot removed this from the Joomla 4.0.4 milestone Sep 13, 2021
@richard67
Copy link
Member

RTC


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

@joomla-cms-bot joomla-cms-bot added the RTC This Pull Request is Ready To Commit label Sep 13, 2021
@richard67 richard67 added this to the Joomla 4.0.4 milestone Sep 13, 2021
@wilsonge
Copy link
Contributor

Need conflicts resolved from the merge of the com_config one - sorry!

Thomas Hunziker added 2 commits September 21, 2021 19:55
# Conflicts:
#	administrator/language/en-GB/joomla.ini
#	api/language/en-GB/joomla.ini
@Bakual
Copy link
Contributor Author

Bakual commented Sep 21, 2021

Merged upstream and conflicts fixed

Kostelano added a commit to JPathRu/localisation that referenced this pull request Sep 21, 2021
@wilsonge wilsonge merged commit fe882f6 into joomla:4.0-dev Sep 23, 2021
@wilsonge
Copy link
Contributor

Thanks!

@joomla-cms-bot joomla-cms-bot removed the RTC This Pull Request is Ready To Commit label Sep 23, 2021
@Bakual Bakual deleted the 4_RemoveJHelpStringsCategories branch September 23, 2021 18:10
brianteeman pushed a commit to brianteeman/joomla-cms that referenced this pull request Oct 3, 2021
bembelimen added a commit that referenced this pull request Nov 21, 2021
* Add sensible inline help to Global Configuration

* Button to show/hide inline help

Example in backend com_config

* Add back the error handling

* Show how this can be done in the frontend, too

* Update build/media_source/system/js/inlinehelp.es6.js

Co-authored-by: Brian Teeman <[email protected]>

* Update build/media_source/system/js/inlinehelp.es6.js

Co-authored-by: Dimitris Grammatikogiannis <[email protected]>

* Address inconsistency of control and description DIV id's

The controls have IDs like `jform_example`.

The description DIVs had IDs like `jform[example]-desc`.

This is horribly inconsistent and a pain to work with.

Converted the description DIV IDs to the more consistent
form `jform_example-desc`.

* Toggle the aria-describedby attribute to follow the visibility of the description

* Use simpler English

* Make this into a proper BUTTON element and end–align it

* Update administrator/language/en-GB/joomla.ini

Co-authored-by: Quy <[email protected]>

* Update language string

* Update language/en-GB/com_config.ini

Co-authored-by: Brian Teeman <[email protected]>

* Clarify SEF URLs

* Apply suggestions from code review

DocBlock updates

Co-authored-by: Phil E. Taylor <[email protected]>

* [4.x] Tinymce updates (#35605)

See https://www.tiny.cloud/docs/changelog/ for details

This includes 5.9.0, 5.9.1 and 5.9.2

* typo in filename (#35613)

* Remove JHELP_ strings for com_config and move the ref_key to the config.xml of the respective component. (#35479)

Co-authored-by: Thomas Hunziker <[email protected]>

* [4.0] Fix modal data attributes (#35626)

* Update main.php

* Update Bootstrap.php

* [4.0] Remove JHELP_ strings for com_categories (#35534)

* Category custom fields marked as 'subform' act as if they are not (#35547)

* Subform–only fields cause saving a category to fail.

Part I: “Only Use In Subform” doesn't do anything

* Subform–only fields cause saving a category to fail.

Part II. PlgSystemFields::onContentPrepareForm doesn't actually work for com_categories

Close gh-35543

* Subform–only fields cause saving a category to fail.

Part II. PlgSystemFields::onContentPrepareForm doesn't actually work for com_categories

This should only apply on com_content categories, not
third party categories.

* Invert the if–block order

Co-authored-by: Richard Fath <[email protected]>

* Subform–only fields cause saving a category to fail.

Part II. PlgSystemFields::onContentPrepareForm doesn't actually work for com_categories

Okay, it could actually apply for any category,
not just com_content.

* Docblock

Co-authored-by: Richard Fath <[email protected]>

* [4.0] Replace JHELP_ String with hardcoded ref-key (#35429)

* Replace JHELP_ String with hardcoded ref-key

* Simplifying helpTOC.php so it doesn't need to reverse lookup the JHELP_ strings.

* Remove loading of joomla.ini and messing with language class property

* alpha-sort help strings

* Next batch

* Last batch

* Ooops

Co-authored-by: Thomas Hunziker <[email protected]>

* [4][CloudFlare Issues] Remove validation of the session by IP address (#35509)

> IMHO the commend of @arnepluhar in #35509 should also count as a successful test. He did it as a GitHub code review. The rules about what constitutes a valid test should expand to GitHub code reviews; these didn't even exist when the rules were decided upon back in the day and they make FAR MORE SENSE than comments filed on a PR!

Github is configured to allow maintainers merge only if all tests are successful.

Thanks all.

* Language Keys may have a : in it. (#35659)

* Button to show/hide inline help

Example in backend com_config

* Whoops, wrong merge option

* Lang string change

* Apply language string suggestion

* Remove empty line on language file,

* Add sensible inline help to Global Configuration

* Button to show/hide inline help

Example in backend com_config

* Add back the error handling

* Show how this can be done in the frontend, too

* Update build/media_source/system/js/inlinehelp.es6.js

Co-authored-by: Brian Teeman <[email protected]>

* Update build/media_source/system/js/inlinehelp.es6.js

Co-authored-by: Dimitris Grammatikogiannis <[email protected]>

* Address inconsistency of control and description DIV id's

The controls have IDs like `jform_example`.

The description DIVs had IDs like `jform[example]-desc`.

This is horribly inconsistent and a pain to work with.

Converted the description DIV IDs to the more consistent
form `jform_example-desc`.

* Toggle the aria-describedby attribute to follow the visibility of the description

* Use simpler English

* Make this into a proper BUTTON element and end–align it

* Update administrator/language/en-GB/joomla.ini

Co-authored-by: Quy <[email protected]>

* Update language string

* Update language/en-GB/com_config.ini

Co-authored-by: Brian Teeman <[email protected]>

* Clarify SEF URLs

* Apply suggestions from code review

DocBlock updates

Co-authored-by: Phil E. Taylor <[email protected]>

* Button to show/hide inline help

Example in backend com_config

* Whoops, wrong merge option

* Lang string change

* Apply language string suggestion

* Remove empty line on language file,

Co-authored-by: Brian Teeman <[email protected]>
Co-authored-by: Dimitris Grammatikogiannis <[email protected]>
Co-authored-by: Quy <[email protected]>
Co-authored-by: Phil E. Taylor <[email protected]>
Co-authored-by: Stefan Wendhausen <[email protected]>
Co-authored-by: Thomas Hunziker <[email protected]>
Co-authored-by: Thomas Hunziker <[email protected]>
Co-authored-by: Richard Fath <[email protected]>
Co-authored-by: Benjamin Trenkle <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Language Change This is for Translators
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants