-
-
Notifications
You must be signed in to change notification settings - Fork 76
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Branch: refs/heads/master Date: 2018-03-27T20:58:27-03:00 Author: Franco Pellegrini (frapell) <frapell@gmail.com> Commit: plone/mockup@215568b Use full path for tinymce fonts. plone/Products.CMFPlone#2359 Files changed: M mockup/patterns/tinymce/less/pattern.tinymce.less Repository: mockup Branch: refs/heads/master Date: 2018-03-29T09:20:19+02:00 Author: Jens W. Klein (jensens) <jk@kleinundpartner.at> Commit: plone/mockup@0b9f2b9 Merge pull request #836 from plone/gh-2359 Use full path for tinymce fonts. Files changed: M mockup/patterns/tinymce/less/pattern.tinymce.less
- Loading branch information
Showing
1 changed file
with
65 additions
and
185 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,206 +1,86 @@ | ||
| Repository: Products.CMFPlone | ||
| Repository: mockup | ||
|
|
||
|
|
||
| Branch: refs/heads/5.1.x | ||
| Date: 2018-03-28T16:57:00+02:00 | ||
| Author: Jens W. Klein (jensens) <jk@kleinundpartner.at> | ||
| Commit: https://github.com/plone/Products.CMFPlone/commit/257c4ad60a6bd54ca2fc0c73d00e0f3c6ee49535 | ||
| Branch: refs/heads/master | ||
| Date: 2018-03-27T20:58:27-03:00 | ||
| Author: Franco Pellegrini (frapell) <frapell@gmail.com> | ||
| Commit: https://github.com/plone/mockup/commit/215568b270c2b2e30c4c64f356a6762aa854e1e8 | ||
|
|
||
| A not yet installed product must not return any upgrade info | ||
| Use full path for tinymce fonts. plone/Products.CMFPlone#2359 | ||
|
|
||
| Files changed: | ||
| M CHANGES.rst | ||
| M Products/CMFPlone/controlpanel/browser/quickinstaller.py | ||
| M Products/CMFPlone/controlpanel/tests/test_controlpanel_installer.py | ||
| M mockup/patterns/tinymce/less/pattern.tinymce.less | ||
|
|
||
| diff --git a/CHANGES.rst b/CHANGES.rst | ||
| index da37420d9..a8731d67a 100644 | ||
| --- a/CHANGES.rst | ||
| +++ b/CHANGES.rst | ||
| @@ -20,6 +20,10 @@ New features: | ||
|
|
||
| Bug fixes: | ||
| diff --git a/mockup/patterns/tinymce/less/pattern.tinymce.less b/mockup/patterns/tinymce/less/pattern.tinymce.less | ||
| index 24b91daa..e489678e 100644 | ||
| --- a/mockup/patterns/tinymce/less/pattern.tinymce.less | ||
| +++ b/mockup/patterns/tinymce/less/pattern.tinymce.less | ||
| @@ -5,6 +5,22 @@ | ||
| @import "@{mockupPath}/autotoc/pattern.autotoc.less"; | ||
| @import "@{mockupPath}/upload/less/pattern.upload.less"; | ||
|
|
||
| +- Fix controlpanel quickinstaller view: | ||
| + A not yet installed product must not return any upgrade info. | ||
| + [jensens] | ||
| +@font-face{ | ||
| + font-family:'tinymce'; | ||
| + src:url('@{bowerPath}tinymce-builded/js/tinymce/skins/lightgray/fonts/tinymce.eot'); | ||
| + src:url('@{bowerPath}tinymce-builded/js/tinymce/skins/lightgray/fonts/tinymce.eot?#iefix') format('embedded-opentype'),url('@{bowerPath}tinymce-builded/js/tinymce/skins/lightgray/fonts/tinymce.woff') format('woff'),url('@{bowerPath}tinymce-builded/js/tinymce/skins/lightgray/fonts/tinymce.ttf') format('truetype'),url('@{bowerPath}tinymce-builded/js/tinymce/skins/lightgray/fonts/tinymce.svg#tinymce') format('svg'); | ||
| + font-weight:normal; | ||
| + font-style:normal | ||
| +} | ||
| + | ||
| - Fix to make plone/plone.session#11 work: | ||
| Make test for installation of plone.session more explicit. | ||
| [jensens] | ||
| diff --git a/Products/CMFPlone/controlpanel/browser/quickinstaller.py b/Products/CMFPlone/controlpanel/browser/quickinstaller.py | ||
| index d975f8ff3..6ae4845fb 100644 | ||
| --- a/Products/CMFPlone/controlpanel/browser/quickinstaller.py | ||
| +++ b/Products/CMFPlone/controlpanel/browser/quickinstaller.py | ||
| @@ -347,6 +347,8 @@ def upgrade_info(self, product_id): | ||
| # No GS profile, not supported. | ||
| return {} | ||
| profile_id = profile['id'] | ||
| + if not self.is_profile_installed(profile_id): | ||
| + return {} | ||
| profile_version = str(self.ps.getVersionForProfile(profile_id)) | ||
| if profile_version == 'latest': | ||
| profile_version = self.get_latest_upgrade_step(profile_id) | ||
| diff --git a/Products/CMFPlone/controlpanel/tests/test_controlpanel_installer.py b/Products/CMFPlone/controlpanel/tests/test_controlpanel_installer.py | ||
| index f93f92e51..b15a41529 100644 | ||
| --- a/Products/CMFPlone/controlpanel/tests/test_controlpanel_installer.py | ||
| +++ b/Products/CMFPlone/controlpanel/tests/test_controlpanel_installer.py | ||
| @@ -233,11 +233,9 @@ def test_get_product_version(self): | ||
| def test_upgrade_info(self): | ||
| # an unknown product | ||
| self.assertEqual(self.installer.upgrade_info('foo'), {}) | ||
| - # an uninstalled product | ||
| + # a not yet/ uninstalled product | ||
| info = self.installer.upgrade_info('plone.session') | ||
| - self.assertFalse(info['available']) | ||
| - self.assertTrue(info['required']) | ||
| - self.assertEqual(info['installedVersion'], UNKNOWN) | ||
| + self.assertEqual(self.installer.upgrade_info('plone.session'), {}) | ||
| # an installed product | ||
| info = self.installer.upgrade_info('plone.app.dexterity') | ||
| self.assertFalse(info['available']) | ||
| @@ -263,10 +261,10 @@ def test_upgrade_product(self): | ||
| # an unknown product | ||
| self.assertFalse(self.installer.upgrade_product('foo')) | ||
|
|
||
| - # We do not complain about an uninstalled product. | ||
| + # We do not complain about a not-yet/ uninstalled product. | ||
| self.assertTrue(self.installer.upgrade_product('plone.session')) | ||
| info = self.installer.upgrade_info('plone.session') | ||
| - self.assertEqual(info['installedVersion'], UNKNOWN) | ||
| + self.assertEqual(info, {}) | ||
|
|
||
| # We do not complain about an up to date product. | ||
| self.assertTrue(self.installer.upgrade_product('plone.app.dexterity')) | ||
| @@ -283,18 +281,19 @@ def test_upgrade_product(self): | ||
| info = self.installer.upgrade_info('plone.app.dexterity') | ||
| self.assertEqual(info['installedVersion'], info['newVersion']) | ||
|
|
||
| - # Try a Product too. | ||
| + # Try a Product too (not yet installed). | ||
| info = self.installer.upgrade_info('Products.CMFPlacefulWorkflow') | ||
| - self.assertEqual(info['installedVersion'], UNKNOWN) | ||
| + self.assertEqual(info, {}) | ||
| self.assertTrue(self.installer.upgrade_product( | ||
| - 'Products.CMFPlacefulWorkflow')) | ||
| + 'Products.CMFPlacefulWorkflow') | ||
| + ) | ||
| info = self.installer.upgrade_info('Products.CMFPlacefulWorkflow') | ||
| - self.assertEqual(info['installedVersion'], UNKNOWN) | ||
| + self.assertEqual(info, {}) | ||
| info = self.installer.upgrade_info('CMFPlacefulWorkflow') | ||
| - self.assertEqual(info['installedVersion'], UNKNOWN) | ||
| + self.assertEqual(info, {}) | ||
| self.assertTrue(self.installer.upgrade_product('CMFPlacefulWorkflow')) | ||
| info = self.installer.upgrade_info('CMFPlacefulWorkflow') | ||
| - self.assertEqual(info['installedVersion'], UNKNOWN) | ||
| + self.assertEqual(info, {}) | ||
| # fake a version | ||
| ps = self.portal.portal_setup | ||
| ps.setLastVersionForProfile( | ||
| +@font-face{ | ||
| + font-family:'tinymce-small'; | ||
| + src:url('@{bowerPath}tinymce-builded/js/tinymce/skins/lightgray/fonts/tinymce-small.eot'); | ||
| + src:url('@{bowerPath}tinymce-builded/js/tinymce/skins/lightgray/fonts/tinymce-small.eot?#iefix') format('embedded-opentype'),url('@{bowerPath}tinymce-builded/js/tinymce/skins/lightgray/fonts/tinymce-small.woff') format('woff'),url('@{bowerPath}tinymce-builded/js/tinymce/skins/lightgray/fonts/tinymce-small.ttf') format('truetype'),url('@{bowerPath}tinymce-builded/js/tinymce/skins/lightgray/fonts/tinymce-small.svg#tinymce') format('svg'); | ||
| + font-weight:normal; | ||
| + font-style:normal | ||
| +} | ||
| + | ||
| div.linkModal { | ||
| .pattern-relateditems-container{ | ||
| padding-top: 0; | ||
|
|
||
|
|
||
| Repository: Products.CMFPlone | ||
| Repository: mockup | ||
|
|
||
|
|
||
| Branch: refs/heads/5.1.x | ||
| Date: 2018-03-28T17:41:23+02:00 | ||
| Author: agitator (agitator) <agitator@users.noreply.github.com> | ||
| Commit: https://github.com/plone/Products.CMFPlone/commit/92297bb4bfc2d4fa8cf2a8c34338b373e6d275c3 | ||
| Branch: refs/heads/master | ||
| Date: 2018-03-29T09:20:19+02:00 | ||
| Author: Jens W. Klein (jensens) <jk@kleinundpartner.at> | ||
| Commit: https://github.com/plone/mockup/commit/0b9f2b9c7114617e52d86954768030a532a8d6e2 | ||
|
|
||
| Merge pull request #2362 from plone/jensens/fix-quickinstaller-view | ||
| Merge pull request #836 from plone/gh-2359 | ||
|
|
||
| A not yet installed product must not return any upgrade info | ||
| Use full path for tinymce fonts. | ||
|
|
||
| Files changed: | ||
| M CHANGES.rst | ||
| M Products/CMFPlone/controlpanel/browser/quickinstaller.py | ||
| M Products/CMFPlone/controlpanel/tests/test_controlpanel_installer.py | ||
| M mockup/patterns/tinymce/less/pattern.tinymce.less | ||
|
|
||
| diff --git a/CHANGES.rst b/CHANGES.rst | ||
| index da37420d9..a8731d67a 100644 | ||
| --- a/CHANGES.rst | ||
| +++ b/CHANGES.rst | ||
| @@ -20,6 +20,10 @@ New features: | ||
|
|
||
| Bug fixes: | ||
| diff --git a/mockup/patterns/tinymce/less/pattern.tinymce.less b/mockup/patterns/tinymce/less/pattern.tinymce.less | ||
| index 24b91daa..e489678e 100644 | ||
| --- a/mockup/patterns/tinymce/less/pattern.tinymce.less | ||
| +++ b/mockup/patterns/tinymce/less/pattern.tinymce.less | ||
| @@ -5,6 +5,22 @@ | ||
| @import "@{mockupPath}/autotoc/pattern.autotoc.less"; | ||
| @import "@{mockupPath}/upload/less/pattern.upload.less"; | ||
|
|
||
| +- Fix controlpanel quickinstaller view: | ||
| + A not yet installed product must not return any upgrade info. | ||
| + [jensens] | ||
| +@font-face{ | ||
| + font-family:'tinymce'; | ||
| + src:url('@{bowerPath}tinymce-builded/js/tinymce/skins/lightgray/fonts/tinymce.eot'); | ||
| + src:url('@{bowerPath}tinymce-builded/js/tinymce/skins/lightgray/fonts/tinymce.eot?#iefix') format('embedded-opentype'),url('@{bowerPath}tinymce-builded/js/tinymce/skins/lightgray/fonts/tinymce.woff') format('woff'),url('@{bowerPath}tinymce-builded/js/tinymce/skins/lightgray/fonts/tinymce.ttf') format('truetype'),url('@{bowerPath}tinymce-builded/js/tinymce/skins/lightgray/fonts/tinymce.svg#tinymce') format('svg'); | ||
| + font-weight:normal; | ||
| + font-style:normal | ||
| +} | ||
| + | ||
| - Fix to make plone/plone.session#11 work: | ||
| Make test for installation of plone.session more explicit. | ||
| [jensens] | ||
| diff --git a/Products/CMFPlone/controlpanel/browser/quickinstaller.py b/Products/CMFPlone/controlpanel/browser/quickinstaller.py | ||
| index d975f8ff3..6ae4845fb 100644 | ||
| --- a/Products/CMFPlone/controlpanel/browser/quickinstaller.py | ||
| +++ b/Products/CMFPlone/controlpanel/browser/quickinstaller.py | ||
| @@ -347,6 +347,8 @@ def upgrade_info(self, product_id): | ||
| # No GS profile, not supported. | ||
| return {} | ||
| profile_id = profile['id'] | ||
| + if not self.is_profile_installed(profile_id): | ||
| + return {} | ||
| profile_version = str(self.ps.getVersionForProfile(profile_id)) | ||
| if profile_version == 'latest': | ||
| profile_version = self.get_latest_upgrade_step(profile_id) | ||
| diff --git a/Products/CMFPlone/controlpanel/tests/test_controlpanel_installer.py b/Products/CMFPlone/controlpanel/tests/test_controlpanel_installer.py | ||
| index f93f92e51..b15a41529 100644 | ||
| --- a/Products/CMFPlone/controlpanel/tests/test_controlpanel_installer.py | ||
| +++ b/Products/CMFPlone/controlpanel/tests/test_controlpanel_installer.py | ||
| @@ -233,11 +233,9 @@ def test_get_product_version(self): | ||
| def test_upgrade_info(self): | ||
| # an unknown product | ||
| self.assertEqual(self.installer.upgrade_info('foo'), {}) | ||
| - # an uninstalled product | ||
| + # a not yet/ uninstalled product | ||
| info = self.installer.upgrade_info('plone.session') | ||
| - self.assertFalse(info['available']) | ||
| - self.assertTrue(info['required']) | ||
| - self.assertEqual(info['installedVersion'], UNKNOWN) | ||
| + self.assertEqual(self.installer.upgrade_info('plone.session'), {}) | ||
| # an installed product | ||
| info = self.installer.upgrade_info('plone.app.dexterity') | ||
| self.assertFalse(info['available']) | ||
| @@ -263,10 +261,10 @@ def test_upgrade_product(self): | ||
| # an unknown product | ||
| self.assertFalse(self.installer.upgrade_product('foo')) | ||
|
|
||
| - # We do not complain about an uninstalled product. | ||
| + # We do not complain about a not-yet/ uninstalled product. | ||
| self.assertTrue(self.installer.upgrade_product('plone.session')) | ||
| info = self.installer.upgrade_info('plone.session') | ||
| - self.assertEqual(info['installedVersion'], UNKNOWN) | ||
| + self.assertEqual(info, {}) | ||
|
|
||
| # We do not complain about an up to date product. | ||
| self.assertTrue(self.installer.upgrade_product('plone.app.dexterity')) | ||
| @@ -283,18 +281,19 @@ def test_upgrade_product(self): | ||
| info = self.installer.upgrade_info('plone.app.dexterity') | ||
| self.assertEqual(info['installedVersion'], info['newVersion']) | ||
|
|
||
| - # Try a Product too. | ||
| + # Try a Product too (not yet installed). | ||
| info = self.installer.upgrade_info('Products.CMFPlacefulWorkflow') | ||
| - self.assertEqual(info['installedVersion'], UNKNOWN) | ||
| + self.assertEqual(info, {}) | ||
| self.assertTrue(self.installer.upgrade_product( | ||
| - 'Products.CMFPlacefulWorkflow')) | ||
| + 'Products.CMFPlacefulWorkflow') | ||
| + ) | ||
| info = self.installer.upgrade_info('Products.CMFPlacefulWorkflow') | ||
| - self.assertEqual(info['installedVersion'], UNKNOWN) | ||
| + self.assertEqual(info, {}) | ||
| info = self.installer.upgrade_info('CMFPlacefulWorkflow') | ||
| - self.assertEqual(info['installedVersion'], UNKNOWN) | ||
| + self.assertEqual(info, {}) | ||
| self.assertTrue(self.installer.upgrade_product('CMFPlacefulWorkflow')) | ||
| info = self.installer.upgrade_info('CMFPlacefulWorkflow') | ||
| - self.assertEqual(info['installedVersion'], UNKNOWN) | ||
| + self.assertEqual(info, {}) | ||
| # fake a version | ||
| ps = self.portal.portal_setup | ||
| ps.setLastVersionForProfile( | ||
| +@font-face{ | ||
| + font-family:'tinymce-small'; | ||
| + src:url('@{bowerPath}tinymce-builded/js/tinymce/skins/lightgray/fonts/tinymce-small.eot'); | ||
| + src:url('@{bowerPath}tinymce-builded/js/tinymce/skins/lightgray/fonts/tinymce-small.eot?#iefix') format('embedded-opentype'),url('@{bowerPath}tinymce-builded/js/tinymce/skins/lightgray/fonts/tinymce-small.woff') format('woff'),url('@{bowerPath}tinymce-builded/js/tinymce/skins/lightgray/fonts/tinymce-small.ttf') format('truetype'),url('@{bowerPath}tinymce-builded/js/tinymce/skins/lightgray/fonts/tinymce-small.svg#tinymce') format('svg'); | ||
| + font-weight:normal; | ||
| + font-style:normal | ||
| +} | ||
| + | ||
| div.linkModal { | ||
| .pattern-relateditems-container{ | ||
| padding-top: 0; | ||
|
|
||
|
|