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

Intelligently adjust menubar for D7 toolbar toggle #12937

Merged
merged 1 commit into from
Oct 16, 2018

Conversation

colemanw
Copy link
Member

@colemanw colemanw commented Oct 15, 2018

Overview

Civi menubar was being set to width 97% to make room for the Drupal Toolbar toggle. The 2 problems with that are:

  • 97% is imprecise - what we really wanted was 100% minus the width of the toolbar toggle.
  • Some Drupal sites do not use the toolbar module.

Before

Civi menubar set to width 97% unconditionally.

After

Civi menubar set to 100% minus the width of the toolbar toggle, but only if the toolbar toggle is actually present on the screen.

@civibot
Copy link

civibot bot commented Oct 15, 2018

(Standard links)

@civibot civibot bot added the master label Oct 15, 2018
@eileenmcnaughton
Copy link
Contributor

@colemanw this makes sense - do you know of a case when the if would be false?

@homotechsual
Copy link
Contributor

homotechsual commented Oct 16, 2018

(CiviCRM Review Template DEL-1.1)

  • Explain (r-explain)

  • Test results (r-test)

    • PASS: The test results have failures, but these have been individually inspected and found to be irrelevant.
  • Code quality (r-code)

    • PASS: The functionality, purpose, and style of the code seems clear+sensible.
  • Documentation (r-doc)

    • PASS: The changes do not require documentation.
  • Maintainability (r-maint)

    • PASS: The change sufficiently improves test coverage, or the change is trivial enough that it does not require tests.
  • Run it (r-run)

    • PASS: Ran on CiviCRM 5.6.0 with the following combinations:
      • With Shoreditch with the Admin Menu module - Civi menu is full width.
      • With Shoreditch without the Admin Menu module - Civi menu has gap to show the expander/toggle.
      • With Shoreditch without the Admin Menu module with the core Toolbar module disabled - Civi menu is full width.
      • Without Shoreditch with the Admin Menu module - Civi menu is full width.
      • Without Shoreditch without the Admin Menu module - Civi menu has gap to show the expander/toggle.
      • Without Shoreditch without the Admin Menu module with the core Toolbar module disabled - Civi menu is full width.
  • User impact (r-user)

    • PASS: The change would be intuitive or unnoticeable for a majority of users who work with this feature.
  • Technical impact (r-tech)

    • PASS: The change preserves compatibility with existing callers/code/downstream.

@homotechsual
Copy link
Contributor

this makes sense - do you know of a case when the if would be false?

@eileenmcnaughton the if will return false if the core toolbar module is disabled or if the admin_menu module is being used instead.

@colemanw colemanw merged commit 8b1412d into civicrm:master Oct 16, 2018
@eileenmcnaughton eileenmcnaughton deleted the d7toolbar branch October 16, 2018 19:45
@eileenmcnaughton
Copy link
Contributor

Thanks for the review @MikeyMJCO really helpful

davialexandre added a commit to compucorp/civicrm-core that referenced this pull request Nov 1, 2018
davialexandre added a commit to compucorp/civicrm-core that referenced this pull request Nov 1, 2018
davialexandre added a commit to compucorp/civicrm-core that referenced this pull request Nov 9, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants