Remove profile / add extra javascript files from cycle2

collective · May 21, 2015 · 5975e0c · 5975e0c
1 parent a0b37c5
commit 5975e0c
Show file tree

Hide file tree

Showing 26 changed files with 162 additions and 98 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -6,10 +6,13 @@ There's a frood who really knows where his towel is.
 1.0a2 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Remove profile (unregister resources) and add extra javascript files from cyle2. (closes `#1`_)
+  [rodfersou]
 
 
 1.0a1 (2014-10-20)
 ------------------
 
 - Initial release.
+
+.. _`#1`: https://github.com/collective/collective.js.cycle2/issues/1
diff --git a/setup.py b/setup.py
@@ -40,6 +40,7 @@
     include_package_data=True,
     zip_safe=False,
     install_requires=[
+        'plone.api',
         'Products.CMFPlone >=4.2',
         'Products.GenericSetup',
         'setuptools',

diff --git a/src/collective/js/cycle2/configure.zcml b/src/collective/js/cycle2/configure.zcml
@@ -2,19 +2,15 @@
     xmlns="http://namespaces.zope.org/zope"
     xmlns:browser="http://namespaces.zope.org/browser"
     xmlns:five="http://namespaces.zope.org/five"
-    xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
     i18n_domain="collective.js.cycle2">
 
   <five:registerPackage package="." />
 
-  <genericsetup:registerProfile
-      name="default"
-      title="collective.js.cycle2"
-      directory="profiles/default"
-      description="Integration of Cycle2 jQuery plugin in Plone."
-      provides="Products.GenericSetup.interfaces.EXTENSION"
-      />
+  <include package=".upgrades" />
 
-  <browser:resourceDirectory name="collective.js.cycle2" directory="static" />
+  <browser:resourceDirectory
+    name="collective.js.cycle2"
+    directory="resources"
+    />
 
 </configure>
diff --git a/src/collective/js/cycle2/interfaces.py b/src/collective/js/cycle2/interfaces.py
diff --git a/src/collective/js/cycle2/profiles/default/browserlayer.xml b/src/collective/js/cycle2/profiles/default/browserlayer.xml
diff --git a/src/collective/js/cycle2/profiles/default/jsregistry.xml b/src/collective/js/cycle2/profiles/default/jsregistry.xml
diff --git a/src/collective/js/cycle2/profiles/default/metadata.xml b/src/collective/js/cycle2/profiles/default/metadata.xml
diff --git a/src/collective/js/cycle2/resources/jquery.cycle2.caption2.min.js b/src/collective/js/cycle2/resources/jquery.cycle2.caption2.min.js
diff --git a/src/collective/js/cycle2/resources/jquery.cycle2.carousel.min.js b/src/collective/js/cycle2/resources/jquery.cycle2.carousel.min.js
diff --git a/.../js/cycle2/static/jquery.cycle2.center.js → .../cycle2/resources/jquery.cycle2.center.js b/.../js/cycle2/static/jquery.cycle2.center.js → .../cycle2/resources/jquery.cycle2.center.js
diff --git a/...cycle2/static/jquery.cycle2.center.min.js → ...le2/resources/jquery.cycle2.center.min.js b/...cycle2/static/jquery.cycle2.center.min.js → ...le2/resources/jquery.cycle2.center.min.js
diff --git a/src/collective/js/cycle2/resources/jquery.cycle2.flip.min.js b/src/collective/js/cycle2/resources/jquery.cycle2.flip.min.js
diff --git a/src/collective/js/cycle2/resources/jquery.cycle2.ie-fade.min.js b/src/collective/js/cycle2/resources/jquery.cycle2.ie-fade.min.js
diff --git a/...lective/js/cycle2/static/jquery.cycle2.js → ...tive/js/cycle2/resources/jquery.cycle2.js b/...lective/js/cycle2/static/jquery.cycle2.js → ...tive/js/cycle2/resources/jquery.cycle2.js
diff --git a/...ive/js/cycle2/static/jquery.cycle2.min.js → .../js/cycle2/resources/jquery.cycle2.min.js b/...ive/js/cycle2/static/jquery.cycle2.min.js → .../js/cycle2/resources/jquery.cycle2.min.js
diff --git a/src/collective/js/cycle2/resources/jquery.cycle2.scrollVert.min.js b/src/collective/js/cycle2/resources/jquery.cycle2.scrollVert.min.js
diff --git a/src/collective/js/cycle2/resources/jquery.cycle2.shuffle.min.js b/src/collective/js/cycle2/resources/jquery.cycle2.shuffle.min.js
diff --git a/...e/js/cycle2/static/jquery.cycle2.swipe.js → ...s/cycle2/resources/jquery.cycle2.swipe.js b/...e/js/cycle2/static/jquery.cycle2.swipe.js → ...s/cycle2/resources/jquery.cycle2.swipe.js
diff --git a/.../cycle2/static/jquery.cycle2.swipe.min.js → ...cle2/resources/jquery.cycle2.swipe.min.js b/.../cycle2/static/jquery.cycle2.swipe.min.js → ...cle2/resources/jquery.cycle2.swipe.min.js
diff --git a/src/collective/js/cycle2/resources/jquery.cycle2.tile.min.js b/src/collective/js/cycle2/resources/jquery.cycle2.tile.min.js
diff --git a/src/collective/js/cycle2/resources/jquery.cycle2.video.min.js b/src/collective/js/cycle2/resources/jquery.cycle2.video.min.js
diff --git a/src/collective/js/cycle2/testing.py b/src/collective/js/cycle2/testing.py
@@ -15,9 +15,6 @@ def setUpZope(self, app, configurationContext):
         import collective.js.cycle2
         self.loadZCML(package=collective.js.cycle2)
 
-    def setUpPloneSite(self, portal):
-        self.applyProfile(portal, 'collective.js.cycle2:default')
-
 FIXTURE = Fixture()
 INTEGRATION_TESTING = IntegrationTesting(
     bases=(FIXTURE,),

diff --git a/src/collective/js/cycle2/tests/test_setup.py b/src/collective/js/cycle2/tests/test_setup.py