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

Mockup update #2436

Closed
wants to merge 5 commits into from
Closed

Mockup update #2436

wants to merge 5 commits into from

Conversation

frapell
Copy link
Member

@frapell frapell commented May 30, 2018

Once plone/mockup#850 gets merged in, this brings the changes to Plone

@frapell
Copy link
Member Author

frapell commented May 30, 2018

There is no changelog entry because there is one already for "Mockup update"

@petschki
Copy link
Member

petschki commented Jul 9, 2018

I've merged current master and recompiled resources. Jenkins is now green.
as @jensens mentioned here plone/mockup#856 I'd also like to backport this to 5.1 branch.
If everybody agrees, I'll create a pull request with backporting this changes and update the existing pull request for p.a.upgrade plone/plone.app.upgrade#163 to add the resources in a to_513 profile

@sunew
Copy link
Contributor

sunew commented Sep 9, 2018

@frapell as far as I can see, these changes are already included in 5.1.x and in master?

master
9ba4a84 (Franco Pellegrini 2018-07-10 23:47:13 -0300 867) <records prefix="plone.resources/mockup-patterns-datatables"

5.1.x
0a479b9 (Franco Pellegrini 2018-07-10 23:17:42 -0300 867) <records prefix="plone.resources/mockup-patterns-datatables"

So we can close this one?

@sunew
Copy link
Contributor

sunew commented Sep 12, 2018

only difference is that this PR is using the minified resource. I assume thats an error?

   <records prefix="plone.resources/datatables.net-autofill-bs"
             interface='Products.CMFPlone.interfaces.IResourceRegistry'>
-      <value key="js">++plone++static/components/datatables.net-autofill-bs/js/autoFill.bootstrap.min.js</value>
+      <value key="js">++plone++static/components/datatables.net-autofill-bs/js/autoFill.bootstrap.js</value>
   </records>

@frapell
Copy link
Member Author

frapell commented Sep 13, 2018

@sunew It has been so long that I don't remember what happened with this to be honest... As per your question, yes, I guess we should be pulling the non minified version right?

@sunew
Copy link
Contributor

sunew commented Sep 13, 2018

@frapell I'm not sure what is the best approach :) But we will bundle the resources when building the plone bundles, so I guess non-minified is the way to go.

I close this one.

@sunew sunew closed this Sep 13, 2018
@jensens jensens deleted the mockup-datatables branch May 14, 2019 03:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants