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

[FIX] web: fix calendar header buttons' position #144169

Closed

Conversation

edi-odoo
Copy link
Contributor

@edi-odoo edi-odoo commented Nov 29, 2023

In https://github.com/odoo/enterprise/pull/51755/commits/5a0ae6e0767497dff2f8a2f38bf362998aacc232 we moved the "Share availabilities" button from the control panel to the calendar's header, but we'd like it to come before the toggleSideBar button, so we need to replace the left margin on the button by a right margin on the h5.

Requires:

task-3617561
part of task-3575827

Before After
Screenshot 2023-11-29 at 13 20 52 Screenshot 2023-11-29 at 12 50 55

I confirm I have signed the CLA and read the PR guidelines at www.odoo.com/submit-pr

@robodoo
Copy link
Contributor

robodoo commented Nov 29, 2023

@C3POdoo C3POdoo added the RD research & development, internal work label Nov 29, 2023
@edi-odoo edi-odoo force-pushed the 17.0-appointment-button-fix-edi branch 10 times, most recently from 17c6e8c to 11f350f Compare December 12, 2023 09:30
@edi-odoo edi-odoo force-pushed the 17.0-appointment-button-fix-edi branch 3 times, most recently from 7d9db36 to 2bff611 Compare December 14, 2023 08:43
@Brieuc-brd Brieuc-brd force-pushed the 17.0-appointment-button-fix-edi branch 3 times, most recently from 966e52b to 9e88e34 Compare February 15, 2024 08:40
Copy link
Contributor

@mano-odoo mano-odoo left a comment

Choose a reason for hiding this comment

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

Thanks for your work, just some nitpicks below 😄 Aside from this it LGTM

@Brieuc-brd Brieuc-brd force-pushed the 17.0-appointment-button-fix-edi branch 2 times, most recently from 6a8f00b to f8c5068 Compare February 19, 2024 13:47
@Brieuc-brd
Copy link
Contributor

@mano-odoo 👋
I've updated the branch ;)
The diff : https://github.com/odoo/odoo/compare/9e88e347315269e0f8617dbccf8e046836c2088d..6a8f00b0896894b0b8ba830b6ee2d60db402dc4b

@mano-odoo mano-odoo self-requested a review February 19, 2024 16:37
@Brieuc-brd Brieuc-brd force-pushed the 17.0-appointment-button-fix-edi branch 2 times, most recently from c55e274 to f68c3b6 Compare February 20, 2024 09:49
@Brieuc-brd
Copy link
Contributor

Hey @mano-odoo 👋
I've reintroduced the double scroll, since this issue should be fixed in another PR.
Could you take a look at it ? :)

The diffs :

@Brieuc-brd Brieuc-brd force-pushed the 17.0-appointment-button-fix-edi branch from f68c3b6 to 17f52b8 Compare February 20, 2024 12:22
Copy link
Contributor

@mano-odoo mano-odoo left a comment

Choose a reason for hiding this comment

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

lgtm

@Brieuc-brd Brieuc-brd marked this pull request as ready for review February 20, 2024 15:22
@C3POdoo C3POdoo requested review from a team, FrancoisGe and Iucapad and removed request for a team February 20, 2024 15:24
@Brieuc-brd Brieuc-brd requested a review from a team February 20, 2024 15:26
@Brieuc-brd Brieuc-brd changed the base branch from 17.0 to master March 8, 2024 15:56
@Brieuc-brd Brieuc-brd force-pushed the 17.0-appointment-button-fix-edi branch 3 times, most recently from 1146382 to 6615ac3 Compare March 11, 2024 08:02
@Brieuc-brd
Copy link
Contributor

The branch has been rebased and retargeted to master.
A few conflicts and small issues have been fixed:

  1. Added flex-grow-1 to o_calendar_renderer to fix layout issue (https://github.com/odoo/odoo/pull/144169/files#diff-f4a2674aebe77a89561386f7e8beb6523e7acf86260968d25ab66162eef48a43R5) :
Before After
Capture d’écran 2024-03-11 à 13 29 49 Capture d’écran 2024-03-11 à 13 02 22
  1. Moved JS adaptation, previously defined in addons/web/static/tests/views/calendar/calendar_view_tests.js, into addons/web/static/tests/legacy/views/calendar/calendar_view_tests.js since the test has been moved : f37c338#diff-1f22d3827d43a43f9ade8cea9f05c95926a6494d8fd066c8613bf767ecac9d90R4924-R4953

  2. Fixed a scroll issue in the sidebar (https://github.com/odoo/odoo/compare/417ee2d819a551bdfd08a686c0c498f68b036922..1146382096fd2bbee0e0fbdfd65acc22f3c7d2d1) :

Before After
Capture d’écran 2024-03-11 à 13 30 40 Capture d’écran 2024-03-11 à 13 30 16

In order to move the "Share availabilities" button between the header
and the sidebar toggler on desktop - but also keeping the button on the
bottom of the screen on mobile - we've adapted the grid and extended its
use to mobile views.

By using the grid layout we have more control over scrolling issues and
different elements appearing or disappearing in each variant of the
calendar view without breaking the layout.

task-3617561
part of task-3575827
@Brieuc-brd Brieuc-brd force-pushed the 17.0-appointment-button-fix-edi branch from 6615ac3 to 928107e Compare March 12, 2024 08:15
Copy link
Contributor

@jeh-odoo jeh-odoo left a comment

Choose a reason for hiding this comment

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

robodoo pushed a commit that referenced this pull request Mar 14, 2024
In order to move the "Share availabilities" button between the header
and the sidebar toggler on desktop - but also keeping the button on the
bottom of the screen on mobile - we've adapted the grid and extended its
use to mobile views.

By using the grid layout we have more control over scrolling issues and
different elements appearing or disappearing in each variant of the
calendar view without breaking the layout.

task-3617561
part of task-3575827

closes #144169

Related: odoo/enterprise#51755
Signed-off-by: Jérémy Hennecart (jeh) <jeh@odoo.com>
robodoo pushed a commit that referenced this pull request Mar 14, 2024
In order to move the "Share availabilities" button between the header
and the sidebar toggler on desktop - but also keeping the button on the
bottom of the screen on mobile - we've adapted the grid and extended its
use to mobile views.

By using the grid layout we have more control over scrolling issues and
different elements appearing or disappearing in each variant of the
calendar view without breaking the layout.

task-3617561
part of task-3575827

closes #144169

Related: odoo/enterprise#51755
Signed-off-by: Jérémy Hennecart (jeh) <jeh@odoo.com>
robodoo pushed a commit that referenced this pull request Mar 14, 2024
In order to move the "Share availabilities" button between the header
and the sidebar toggler on desktop - but also keeping the button on the
bottom of the screen on mobile - we've adapted the grid and extended its
use to mobile views.

By using the grid layout we have more control over scrolling issues and
different elements appearing or disappearing in each variant of the
calendar view without breaking the layout.

task-3617561
part of task-3575827

closes #144169

Related: odoo/enterprise#51755
Signed-off-by: Jérémy Hennecart (jeh) <jeh@odoo.com>
robodoo pushed a commit that referenced this pull request Mar 14, 2024
In order to move the "Share availabilities" button between the header
and the sidebar toggler on desktop - but also keeping the button on the
bottom of the screen on mobile - we've adapted the grid and extended its
use to mobile views.

By using the grid layout we have more control over scrolling issues and
different elements appearing or disappearing in each variant of the
calendar view without breaking the layout.

task-3617561
part of task-3575827

closes #144169

Related: odoo/enterprise#51755
Signed-off-by: Jérémy Hennecart (jeh) <jeh@odoo.com>
robodoo pushed a commit that referenced this pull request Mar 14, 2024
In order to move the "Share availabilities" button between the header
and the sidebar toggler on desktop - but also keeping the button on the
bottom of the screen on mobile - we've adapted the grid and extended its
use to mobile views.

By using the grid layout we have more control over scrolling issues and
different elements appearing or disappearing in each variant of the
calendar view without breaking the layout.

task-3617561
part of task-3575827

closes #144169

Related: odoo/enterprise#51755
Signed-off-by: Jérémy Hennecart (jeh) <jeh@odoo.com>
@robodoo robodoo closed this Mar 14, 2024
@robodoo robodoo added the 17.2 label Mar 14, 2024
@fw-bot fw-bot deleted the 17.0-appointment-button-fix-edi branch March 28, 2024 13:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
17.2 RD research & development, internal work
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants