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] Replace "label" classes with the new "badge" ones #20328

Merged
merged 242 commits into from
Jun 14, 2018
Merged

[4.0] Replace "label" classes with the new "badge" ones #20328

merged 242 commits into from
Jun 14, 2018

Conversation

htmgarcia
Copy link
Contributor

@htmgarcia htmgarcia commented May 9, 2018

Pull Request for Issue # .

Summary of Changes

Replace "label" classes (not available in Bootstrap 4) with the new "badge" ones in frontend and backend

Testing Instructions

You can test in several places.
As example. Preview single articles that include tags in frontend

Expected result

The tags should have styling (color, background, etc) (with "badge" classes)

Actual result

The tags looks like regular links (with "label" classes)

Documentation Changes Required

Replacing the "label" classes with "badge" ones. That summarize this PR.

Michael Babker and others added 30 commits January 20, 2018 11:11
* [com_content] - archived legacy sef fix

* cs
* Fix filter by multiple categories

* Remove debug code
* Do not add unnecessary parameters in the archive link

* Remove php notice

* Unset parameter month=0 when year is not set
…19488)

* move to protocol relative links to https

* fix one broken font link
… with association enabled (#19295)"

This reverts commit 5994eb1.
Revert routing changes in 3.8.4
Revert content archive routing
@htmgarcia
Copy link
Contributor Author

@brianteeman @wilsonge may we merge this one, pretty please?

@brianteeman
Copy link
Contributor

@htmgarcia it can't be merged until it passes all the tests

it still has zero user tests

@htmgarcia
Copy link
Contributor Author

@brianteeman
Copy link
Contributor

tests are reset when the code changes which you did when you resolved the conflicts

@Quy
Copy link
Contributor

Quy commented May 18, 2018

Found some more. Please see screenshot.

badge

@Quy
Copy link
Contributor

Quy commented May 21, 2018

There are 3 more in the screenshot that have to be replaced.

@@ -29,7 +29,7 @@
<?php echo $option->label; ?>
</td>
<td>
<span class="label label-<?php echo $option->state ? 'success' : 'important'; ?>">
<span class="badge badge-<?php echo $option->state ? 'success' : 'important'; ?>">
Copy link
Contributor

Choose a reason for hiding this comment

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

label-important is now badge-danger.

@Quy
Copy link
Contributor

Quy commented May 21, 2018

Sorry these should be the last ones.

COM_JOOMLAUPDATE_VIEW_DEFAULT_DESCRIPTION_BREAK="*Extensions marked with <span class='label label-important'>No</span> or <span class='label'>Missing Compatibility Tag</span> might break your website. Please consult with the developer before upgrading."
COM_JOOMLAUPDATE_VIEW_DEFAULT_DESCRIPTION_MISSING_TAG="*Extensions marked with <span class='label'>Missing Compatibility Tag</span> indicate the developer did not add a compatibility tag in the respective extension's XML."
COM_JOOMLAUPDATE_VIEW_DEFAULT_DESCRIPTION_UPDATE_REQUIRED="*Extensions marked with <span class='label label-warning'>Yes (X.X.X)</span> might require an update."

@joomla-cms-bot joomla-cms-bot added the Language Change This is for Translators label May 22, 2018
@Quy
Copy link
Contributor

Quy commented May 22, 2018

I have tested this item ✅ successfully on 59ed416


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

@wilsonge wilsonge merged commit 08936ac into joomla:4.0-dev Jun 14, 2018
@wilsonge
Copy link
Contributor

Nice work! Thanks :)

@zero-24 zero-24 added this to the Joomla 4.0 milestone Jun 15, 2018
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.