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

EZP-30214: Add Content Tree to Bookmarks, Trash & Search #877

Merged
merged 7 commits into from
Mar 11, 2019
Merged

EZP-30214: Add Content Tree to Bookmarks, Trash & Search #877

merged 7 commits into from
Mar 11, 2019

Conversation

tischsoic
Copy link
Contributor

@tischsoic tischsoic commented Mar 5, 2019 •
edited
Loading

Question Answer
Tickets https://jira.ez.no/browse/EZP-30214
Bug fix? yes
New feature? no
BC breaks? no
Tests pass? yes
Doc needed? no
License GPL-2.0

Screenshots

screen shot 2019-03-08 at 10 39 16

screen shot 2019-03-08 at 10 39 31

screen shot 2019-03-08 at 10 39 45

screen shot 2019-03-08 at 10 40 02

screen shot 2019-03-08 at 10 40 26

screen shot 2019-03-08 at 10 46 43

Checklist:

  • Coding standards ($ composer fix-cs)
  • Ready for Code Review

@tischsoic tischsoic self-assigned this Mar 5, 2019
@tischsoic tischsoic requested a review from dew326 March 5, 2019 14:22
@webhdx
Copy link
Contributor

webhdx commented Mar 5, 2019

Can't we move it the container that has left sidebar in it, can we? This would simplify things a lot since we would have it only in one place. If not - we have to put it in separate file and include that file to avoid code duplication.

@tischsoic tischsoic force-pushed the EZP-30214-content-tree-does-not-open-in-Bookmarks-Trash-Search branch from 7340cdf to a9cb27b Compare March 5, 2019 14:26
@dew326
Copy link
Member

dew326 commented Mar 5, 2019

Well, this would require some rework of styling, but I think if we want to have this in multiple places there is a lot of value to put this in the sidebar.

dew326
dew326 requested changes Mar 5, 2019
View reviewed changes
Copy link
Member

@dew326 dew326 left a comment

Choose a reason for hiding this comment

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

Just for avoid merging: We should try moving this to the sidebar.

@tischsoic tischsoic changed the title Add Content Tree to Bookmarks, Trash & Search [WIP] EZP-30214: Add Content Tree to Bookmarks, Trash & Search Mar 7, 2019
@tischsoic tischsoic force-pushed the EZP-30214-content-tree-does-not-open-in-Bookmarks-Trash-Search branch from 70e3b18 to 67cb0ce Compare March 8, 2019 08:06
@tischsoic tischsoic force-pushed the EZP-30214-content-tree-does-not-open-in-Bookmarks-Trash-Search branch from 67cb0ce to 93b220c Compare March 8, 2019 08:21
@tischsoic tischsoic changed the title [WIP] EZP-30214: Add Content Tree to Bookmarks, Trash & Search EZP-30214: Add Content Tree to Bookmarks, Trash & Search Mar 8, 2019
tischsoic
tischsoic commented Mar 8, 2019
View reviewed changes
src/bundle/Resources/views/admin/bookmark/list.html.twig
@@ -115,6 +117,10 @@
</div>
{% endblock %}

{% block react_modules %}
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I moved Content Tree container div to parent twig, but I've left JS in lower templates as I don't want to load them globally.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

If anyone has idea how to solve this problem I would readily hear it. :)

@tischsoic
Copy link
Contributor Author

tischsoic commented Mar 8, 2019 •
edited
Loading

Content Tree container moved to left_sidebar - ping @dew326 @webhdx

@tischsoic tischsoic requested a review from webhdx March 11, 2019 09:36
@tischsoic
Copy link
Contributor Author

ping @webhdx @dew326

m-tyrala
m-tyrala approved these changes Mar 11, 2019
View reviewed changes
Copy link
Contributor

@m-tyrala m-tyrala left a comment

Choose a reason for hiding this comment

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

QA approve 🎸

@lserwatka lserwatka merged commit aedfd55 into master Mar 11, 2019
@lserwatka lserwatka deleted the EZP-30214-content-tree-does-not-open-in-Bookmarks-Trash-Search branch March 11, 2019 13:15
webhdx added a commit that referenced this pull request Mar 11, 2019
@webhdx
Revert "EZP-30214: Add Content Tree to Bookmarks, Trash & Search (#877)"
4c65aed 
This reverts commit aedfd55.
@webhdx
Copy link
Contributor

webhdx commented Mar 11, 2019

Please ignore above revert commit - I accidentally clicked revert button which created a revert branch.

konradoboza pushed a commit to konradoboza/ezplatform-admin-ui that referenced this pull request May 29, 2019
@tischsoic
EZP-30214: Add Content Tree to Bookmarks, Trash & Search (ezsystems#877)
c26be38 
* Add Content Tree to Bookmarks, Trash & Search

* Delete admin.location.content.tree.js

* Move Contnet Tree container div to left_sidebar twig block

* Restore fix

* Add Content Tree to Drafts view

* Add scrollable-table wrapper

* Change side-menu width to calculateRem(80px)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@m-tyrala m-tyrala m-tyrala approved these changes

@dew326 dew326 dew326 approved these changes

@webhdx webhdx Awaiting requested review from webhdx

Assignees

@tischsoic tischsoic

Labels
Bug Ready for QA Ready for review
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@tischsoic @webhdx @dew326 @m-tyrala @lserwatka