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.

Sign up for GitHub

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

Jump to bottom

45503 implement AreaButler in detail page template #765

Merged
merged 13 commits into from
Apr 18, 2024
Merged

45503 implement AreaButler in detail page template #765

merged 13 commits into from
Apr 18, 2024

Conversation

dai-eastgate
Copy link
Contributor

related to #748
changed log:
Add AreaButler on detail page template

@coveralls
Copy link

coveralls commented Mar 7, 2024 •
edited
Loading

Pull Request Test Coverage Report for Build 8700162975

Details

  • 0 of 1 (0.0%) changed or added relevant line in 1 file are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage decreased (-0.008%) to 79.513%
Changes Missing Coverage Covered Lines Changed/Added Lines %
plugin/DataView/DataViewSimilarEstates.php 0 1 0.0%
Totals Coverage Status
Change from base Build 8686426139: -0.008%
Covered Lines: 8131
Relevant Lines: 10226
💛 - Coveralls

@fredericalpers fredericalpers added this to the v4.22 milestone Mar 7, 2024
@fredericalpers fredericalpers added the QA Issue or Pull request that is in review label Mar 7, 2024
@fredericalpers fredericalpers linked an issue Mar 7, 2024 that may be closed by this pull request
Implement AreaButler in detail page template #748
Closed
3 tasks
andernath
andernath reviewed Apr 10, 2024
View reviewed changes
Copy link
Contributor

@andernath andernath left a comment

Choose a reason for hiding this comment

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

@dai-eastgate Please take a look at my suggestion

css/onoffice-default.css Outdated

.oo-area-butler {
position: relative;
height: 500px;
}
Copy link
Contributor

Choose a reason for hiding this comment

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

I think this fits more in onoffice-defaultview.css
Whats your opinion?

@dai-eastgate
Copy link
Contributor Author

@andernath I will check it

@fredericalpers fredericalpers modified the milestones: v4.22, v4.20 Apr 11, 2024
@dai-eastgate
Copy link
Contributor Author

@andernath

  • I found that the issue P#71173 Make CSS local to templates #235 mentioned not adding CSS to the onoffice_defaultview.css file because it can lead to the breaking of personalized templates.
    => So please check the information before you want to move the CSS to the onoffice_defaultview.css file. If you still want to update the CSS in this file, I will fix it.
  • Please explain the disadvantages of placing CSS in onoffice-default.css

@andernath
Merge branch '45503-implement-areabutler-in-detail-page-template' of h…
ce3cbb0 
…ttps://github.com/onOffice-Web-Org/oo-wp-plugin into 45503-implement-areabutler-in-detail-page-template

� Conflicts:
�	css/onoffice-default.css
@fredericalpers fredericalpers modified the milestones: v4.20, v4.19 Apr 15, 2024
@andernath
Copy link
Contributor

andernath commented Apr 15, 2024 •
edited
Loading

  • I found that the issue P#71173 Make CSS local to templates #235 mentioned not adding CSS to the onoffice_defaultview.css file because it can lead to the breaking of personalized templates.
    => So please check the information before you want to move the CSS to the onoffice_defaultview.css file. If you still want to update the CSS in this file, I will fix it.

Oh Thanks for investigating! I see we should not use onoffice_defaultview.css neither onoffice-default.css
Instead of these, template.dist/onoffice-style.css seems to be the right one.

  • Please explain the disadvantages of placing CSS in onoffice-default.css

I got suspicious because of the file naming and classes inside. But anyway, thanks to your hint, we've found out where we need to insert styling changes:
template.dist/onoffice-style.css

Don't worry. I will add this change. So Frederic can start testing. :)

andernath
andernath previously approved these changes Apr 15, 2024
View reviewed changes
@github-actions GitHub Actions
Copy link

Steps to install the approved version:

  1. Download onoffice-4.18.1-26-g7b5c1aae-please-unpack.zip from https://github.com/onOffice-Web-Org/oo-wp-plugin/actions/runs/8686593351.
  2. Unpack the downloaded file to get another .zip file.
  3. Upload that inner .zip file to WordPress.

@dai-eastgate
Copy link
Contributor Author

dai-eastgate commented Apr 15, 2024 •
edited
Loading

@andernath For this new AreaButler feature, placing the CSS in template.dist/onoffice-style.css makes sense, but for old users, be careful placing the CSS in template.dist/onoffice-style.css because this may affect backward compatibility. This is video demo

backward_compatibility_765.mp4

@fredericalpers
Copy link
Member

fredericalpers commented Apr 15, 2024 •
edited by dai-eastgate
Loading

@dai-eastgate After reviewing there are a few changes that have to be made :)

  • Add a H2-Headline with the text AreaButler
  • Add styling as for the other sections padding-bottom: 15px; padding-top: 15px; border-bottom: 2px solid #efefef;

Thank you in advance

@dai-eastgate
Copy link
Contributor Author

dai-eastgate commented Apr 16, 2024 •
edited
Loading

  • Add a H2-Headline with the text AreaButler
  • Add styling as for the other sections padding-bottom: 15px; padding-top: 15px; border-bottom: 2px solid #efefef;

@fredericalpers I have updated CSS. This is video demo:

Evidence765_part2.mp4

Note: Currently I cannot access https://areabutler.dev.areabutler.de/ on the onOffice Enterprise so the map for AreaButler is not displayed, instead it is showing as "loading"
Please check and let me know your opinion. Thanks!

@github-actions GitHub Actions
Copy link

Steps to install the approved version:

  1. Download onoffice-4.18.1-31-gfd40a401-please-unpack.zip from https://github.com/onOffice-Web-Org/oo-wp-plugin/actions/runs/8700233102.
  2. Unpack the downloaded file to get another .zip file.
  3. Upload that inner .zip file to WordPress.

@fredericalpers fredericalpers merged commit cdffff2 into master Apr 18, 2024
6 checks passed
@fredericalpers fredericalpers deleted the 45503-implement-areabutler-in-detail-page-template branch April 18, 2024 07:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andernath andernath andernath approved these changes

Assignees
No one assigned
Labels
QA Issue or Pull request that is in review
Projects
None yet
Milestone
v4.19
Development

Successfully merging this pull request may close these issues.

Implement AreaButler in detail page template
4 participants
@dai-eastgate @coveralls @andernath @fredericalpers