Merge pull request #147 from collective/add-toolbar-icon

Add toolbar icon
collective · Apr 11, 2019 · 46d2046 · 46d2046
2 parents 21a7594 + 13d1bf0
commit 46d2046
Show file tree

Hide file tree

Showing 8 changed files with 88 additions and 52 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,6 +4,9 @@ Changelog
 2.1.0 (unreleased)
 ------------------
 
+- Added style bundle with toolbar icon
+  [agitator]
+
 - fix bug where lines longer than 998 in XML or CSV attachmentments can get wrapped
   [nngu6036]
 

diff --git a/src/collective/easyform/browser/actions_listing.pt b/src/collective/easyform/browser/actions_listing.pt
@@ -19,8 +19,6 @@
       <input tal:replace="structure context/@@authenticator/authenticator" />
       <script type="text/javascript"
               tal:attributes="src context/++resource++schemaeditor.js"></script>
-      <link media="screen" type="text/css" rel="stylesheet"
-            tal:attributes="href context/++resource++easyform.css" />
     </metal:top-slot>
 
     <metal:fields-slot metal:fill-slot="fields">

diff --git a/src/collective/easyform/browser/easyform.css b/src/collective/easyform/browser/easyform.css
@@ -61,3 +61,9 @@
 #content #form legend {
     display: none;
 }
+
+#edit-zone #plone-contentmenu-factories .plonetoolbar-contenttype .contenttype-easyform::before {
+    font-family: 'Glyphicons Halflings';
+    content: '\e028';
+    top: 2px;
+}
diff --git a/src/collective/easyform/browser/fields_listing.pt b/src/collective/easyform/browser/fields_listing.pt
@@ -25,8 +25,6 @@
       <input tal:replace="structure context/@@authenticator/authenticator" />
       <script type="text/javascript"
               tal:attributes="src context/++resource++schemaeditor.js"></script>
-      <link media="screen" type="text/css" rel="stylesheet"
-            tal:attributes="href context/++resource++easyform.css" />
     </metal:top-slot>
 
     <metal:fields-slot metal:fill-slot="fields">

diff --git a/src/collective/easyform/configure.zcml b/src/collective/easyform/configure.zcml
@@ -16,6 +16,7 @@
   <include file="subscribers.zcml" />
   <include file="validators.zcml" />
   <include file="vocabularies.zcml" />
+  <include file="upgrades.zcml" />
 
   <include package=".browser" />
 
@@ -44,53 +45,6 @@
         provides="Products.GenericSetup.interfaces.EXTENSION"
         />
 
-  <genericsetup:upgradeSteps
-      source="1000"
-      destination="1001"
-      profile="collective.easyform:default">
-    <genericsetup:upgradeDepends
-        title="Reload profile to register new vocabulary name"
-        description=""
-        import_profile="collective.easyform:default"
-        import_steps="plone.app.registry"
-        run_deps="false"
-        />
-  </genericsetup:upgradeSteps>
-  <genericsetup:upgradeSteps
-      source="1001"
-      destination="1002"
-      profile="collective.easyform:default">
-    <genericsetup:upgradeDepends
-        title="Remove ProtectedEmail and ProtectedTextLine as addable fields"
-        description="https://github.com/collective/collective.easyform/issues/94"
-        import_profile="collective.easyform:default"
-        import_steps="plone.app.registry"
-        run_deps="false"
-        />
-  </genericsetup:upgradeSteps>
-  <genericsetup:upgradeSteps
-      source="1002"
-      destination="1003"
-      profile="collective.easyform:default">
-    <genericsetup:upgradeDepends
-        title="Add Browserlayer"
-        import_profile="collective.easyform:default"
-        import_steps="browserlayer"
-        run_deps="false"
-        />
-  </genericsetup:upgradeSteps>
-  <genericsetup:upgradeSteps
-      source="1003"
-      destination="1004"
-      profile="collective.easyform:default">
-    <genericsetup:upgradeDepends
-        title="Changed permission of saveddata action"
-        import_profile="collective.easyform:default"
-        import_steps="actions"
-        run_deps="false"
-        />
-  </genericsetup:upgradeSteps>
-
   <utility
       factory=".setuphandlers.HiddenProfiles"
       name="collective.easyform-hiddenprofiles"

diff --git a/src/collective/easyform/profiles/default/metadata.xml b/src/collective/easyform/profiles/default/metadata.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
 <metadata>
-  <version>1004</version>
+  <version>1005</version>
 </metadata>
diff --git a/src/collective/easyform/profiles/default/registry.xml b/src/collective/easyform/profiles/default/registry.xml
@@ -59,4 +59,14 @@
     </value>
   </record>
 
+  <records prefix="plone.bundles/easyform"
+           interface='Products.CMFPlone.interfaces.IBundleRegistry'>
+    <value key="enabled">True</value>
+    <value key="compile">False</value>
+    <value key="csscompilation">++resource++easyform.css</value>
+    <value key="depends">plone</value>
+    <value key="merge_with">default</value>
+  </records>
+
+
 </registry>
diff --git a/src/collective/easyform/upgrades.zcml b/src/collective/easyform/upgrades.zcml
@@ -0,0 +1,67 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:five="http://namespaces.zope.org/five"
+    xmlns:i18n="http://namespaces.zope.org/i18n"
+    xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
+    i18n_domain="collective.easyform">
+
+  <genericsetup:upgradeSteps
+      source="1000"
+      destination="1001"
+      profile="collective.easyform:default">
+    <genericsetup:upgradeDepends
+        title="Reload profile to register new vocabulary name"
+        description=""
+        import_profile="collective.easyform:default"
+        import_steps="plone.app.registry"
+        run_deps="false"
+        />
+  </genericsetup:upgradeSteps>
+  <genericsetup:upgradeSteps
+      source="1001"
+      destination="1002"
+      profile="collective.easyform:default">
+    <genericsetup:upgradeDepends
+        title="Remove ProtectedEmail and ProtectedTextLine as addable fields"
+        description="https://github.com/collective/collective.easyform/issues/94"
+        import_profile="collective.easyform:default"
+        import_steps="plone.app.registry"
+        run_deps="false"
+        />
+  </genericsetup:upgradeSteps>
+  <genericsetup:upgradeSteps
+      source="1002"
+      destination="1003"
+      profile="collective.easyform:default">
+    <genericsetup:upgradeDepends
+        title="Add Browserlayer"
+        import_profile="collective.easyform:default"
+        import_steps="browserlayer"
+        run_deps="false"
+        />
+  </genericsetup:upgradeSteps>
+  <genericsetup:upgradeSteps
+      source="1003"
+      destination="1004"
+      profile="collective.easyform:default">
+    <genericsetup:upgradeDepends
+        title="Changed permission of saveddata action"
+        import_profile="collective.easyform:default"
+        import_steps="actions"
+        run_deps="false"
+        />
+  </genericsetup:upgradeSteps>
+  <genericsetup:upgradeSteps
+      source="1004"
+      destination="1005"
+      profile="collective.easyform:default">
+    <genericsetup:upgradeDepends
+        title="Reload profile to register bundle"
+        description=""
+        import_profile="collective.easyform:default"
+        import_steps="plone.app.registry"
+        run_deps="false"
+        />
+  </genericsetup:upgradeSteps>
+
+</configure>