[fc] Repository: plone.schemaeditor

Branch: refs/heads/master Date: 2015-04-17T18:16:07+02:00 Author: JC Brand (jcbrand) <jc@opkode.com> Commit: plone/plone.schemaeditor@2f96e1c Rename pat-modal to pat-plone-modal. updates plone/mockup#483 Files changed: M plone/schemaeditor/browser/schema/schema_listing.pt M plone/schemaeditor/tests/robot/test_fields.robot Repository: plone.schemaeditor Branch: refs/heads/master Date: 2015-04-18T19:31:45+02:00 Author: JC Brand (jcbrand) <jc@opkode.com> Commit: plone/plone.schemaeditor@d63124b Add changelog entry Files changed: M CHANGES.rst Repository: plone.schemaeditor Branch: refs/heads/master Date: 2015-04-22T15:01:42-05:00 Author: Nathan Van Gheem (vangheem) <vangheem@gmail.com> Commit: plone/plone.schemaeditor@093e218 Merge pull request #23 from plone/pat-modal-rename Rename pat-modal to pat-plone-modal. Files changed: M CHANGES.rst M plone/schemaeditor/browser/schema/schema_listing.pt M plone/schemaeditor/tests/robot/test_fields.robot
plone · Apr 22, 2015 · 1d91bc5 · 1d91bc5
1 parent f955e05
commit 1d91bc5
Showing 1 changed file with 103 additions and 53 deletions.
diff --git a/last_commit.txt b/last_commit.txt
@@ -1,100 +1,150 @@
-Repository: plone.app.portlets
+Repository: plone.schemaeditor
 Branch: refs/heads/master
-Date: 2015-04-17T18:15:06+02:00
+Date: 2015-04-17T18:16:07+02:00
 Author: JC Brand (jcbrand) <jc@opkode.com>
-Commit: https://github.com/plone/plone.app.portlets/commit/7e5fea8e68a665469dcdb32bc01f9cfa7b3da4a4
+Commit: https://github.com/plone/plone.schemaeditor/commit/2f96e1c2557687bf89f6b0ed278ff8c7cdf796a4
 
 Rename pat-modal to pat-plone-modal. updates https://github.com/plone/mockup/issues/483
 
 Files changed:
-M plone/app/portlets/portlets/actions.pt
-
-diff --git a/plone/app/portlets/portlets/actions.pt b/plone/app/portlets/portlets/actions.pt
-index 4d9abbb..947a1cc 100644
---- a/plone/app/portlets/portlets/actions.pt
-+++ b/plone/app/portlets/portlets/actions.pt
-@@ -20,8 +20,8 @@
-           <a href="#"
-              tal:define="modal link/modal|nothing"
-              tal:attributes="href link/url;
--                             class python:'pat-modal' if modal else None;
--                             data-pat-modal python:modal if modal else None;">
-+                             class python:'pat-plone-modal' if modal else None;
-+                             data-pat-plone-modal python:modal if modal else None;">
+M plone/schemaeditor/browser/schema/schema_listing.pt
+M plone/schemaeditor/tests/robot/test_fields.robot
+
+diff --git a/plone/schemaeditor/browser/schema/schema_listing.pt b/plone/schemaeditor/browser/schema/schema_listing.pt
+index 5bfd79c..ca134f3 100644
+--- a/plone/schemaeditor/browser/schema/schema_listing.pt
++++ b/plone/schemaeditor/browser/schema/schema_listing.pt
+@@ -2,13 +2,13 @@
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+      tal:omit-tag="" i18n:domain="plone.schemaeditor">
+-  <a id="add-field" class="pat-modal"
++  <a id="add-field" class="pat-plone-modal"
+      href="${context/absolute_url}/@@add-field">
+     <button style="float: right; display: block;"
+            i18n:translate="add_new_field_hellip">Add new field&hellip;</button>
+   </a>
 
-             <span tal:condition="not:icon"
-                   tal:content="link/title">
+-  <a id="add-fieldset" class="pat-modal" tal:condition="context/enableFieldsets"
++  <a id="add-fieldset" class="pat-plone-modal" tal:condition="context/enableFieldsets"
+      href="${context/absolute_url}/@@add-fieldset">
+     <button style="float: right; display: block;"
+            i18n:translate="add_fieldset_hellip">Add new fieldset&hellip;</button>
+@@ -114,7 +114,7 @@
+
+               <div class="fieldControls"
+                    i18n:domain="plone.schemaeditor">
+-                  <a class="fieldSettings pat-modal"
++                  <a class="fieldSettings pat-plone-modal"
+                      tal:define="edit_url python:view.edit_url(widget.field)"
+                      tal:condition="edit_url"
+                      i18n:translate=""
+diff --git a/plone/schemaeditor/tests/robot/test_fields.robot b/plone/schemaeditor/tests/robot/test_fields.robot
+index 1fddc86..834c5c6 100644
+--- a/plone/schemaeditor/tests/robot/test_fields.robot
++++ b/plone/schemaeditor/tests/robot/test_fields.robot
+@@ -161,4 +161,4 @@ Add field
+
+ Open field settings
+     [Arguments]    ${field_id}
+-    Click Overlay Link  xpath=//div[@data-field_id='${field_id}']//a[@class='fieldSettings pat-modal']
++    Click Overlay Link  xpath=//div[@data-field_id='${field_id}']//a[@class='fieldSettings pat-plone-modal']
 
 
-Repository: plone.app.portlets
+Repository: plone.schemaeditor
 Branch: refs/heads/master
-Date: 2015-04-18T19:30:12+02:00
+Date: 2015-04-18T19:31:45+02:00
 Author: JC Brand (jcbrand) <jc@opkode.com>
-Commit: https://github.com/plone/plone.app.portlets/commit/ef5620ea3de48aad83fa8f0088fb0a0fee9bc558
+Commit: https://github.com/plone/plone.schemaeditor/commit/d63124be192d6b07775f66b34e6542b921ac0ad6
 
 Add changelog entry
 
 Files changed:
 M CHANGES.rst
 
 diff --git a/CHANGES.rst b/CHANGES.rst
-index 5efbc71..e4ce89d 100644
+index 3affee5..160f91d 100644
 --- a/CHANGES.rst
 +++ b/CHANGES.rst
-@@ -11,6 +11,9 @@ Changelog
-   This fixes https://github.com/plone/Products.CMFPlone/issues/423
-   [davisagli]
+@@ -7,6 +7,9 @@ Changelog
+ - Fix translation and sorting of field names.
+   [MacYET, davisagli]
 
 +- pat-modal pattern has been renamed to pat-plone-modal
 +  [jcbrand]
 +
-
- 3.0.3 (2015-03-13)
+ 2.0.2 (2015-03-13)
  ------------------
+
 
 
-Repository: plone.app.portlets
+Repository: plone.schemaeditor
 Branch: refs/heads/master
-Date: 2015-04-22T15:01:39-05:00
+Date: 2015-04-22T15:01:42-05:00
 Author: Nathan Van Gheem (vangheem) <vangheem@gmail.com>
-Commit: https://github.com/plone/plone.app.portlets/commit/0fd64f56b9c5900dc2ce6ce459a6a47a186c1b2f
+Commit: https://github.com/plone/plone.schemaeditor/commit/093e21817d39bde3636caef0f828f6702c849e9b
 
-Merge pull request #48 from plone/pat-modal-rename
+Merge pull request #23 from plone/pat-modal-rename
 
 Rename pat-modal to pat-plone-modal.
 
 Files changed:
 M CHANGES.rst
-M plone/app/portlets/portlets/actions.pt
+M plone/schemaeditor/browser/schema/schema_listing.pt
+M plone/schemaeditor/tests/robot/test_fields.robot
 
 diff --git a/CHANGES.rst b/CHANGES.rst
-index 5efbc71..e4ce89d 100644
+index 3affee5..160f91d 100644
 --- a/CHANGES.rst
 +++ b/CHANGES.rst
-@@ -11,6 +11,9 @@ Changelog
-   This fixes https://github.com/plone/Products.CMFPlone/issues/423
-   [davisagli]
+@@ -7,6 +7,9 @@ Changelog
+ - Fix translation and sorting of field names.
+   [MacYET, davisagli]
 
 +- pat-modal pattern has been renamed to pat-plone-modal
 +  [jcbrand]
 +
-
- 3.0.3 (2015-03-13)
+ 2.0.2 (2015-03-13)
  ------------------
-diff --git a/plone/app/portlets/portlets/actions.pt b/plone/app/portlets/portlets/actions.pt
-index 4d9abbb..947a1cc 100644
---- a/plone/app/portlets/portlets/actions.pt
-+++ b/plone/app/portlets/portlets/actions.pt
-@@ -20,8 +20,8 @@
-           <a href="#"
-              tal:define="modal link/modal|nothing"
-              tal:attributes="href link/url;
--                             class python:'pat-modal' if modal else None;
--                             data-pat-modal python:modal if modal else None;">
-+                             class python:'pat-plone-modal' if modal else None;
-+                             data-pat-plone-modal python:modal if modal else None;">
 
-             <span tal:condition="not:icon"
-                   tal:content="link/title">
+diff --git a/plone/schemaeditor/browser/schema/schema_listing.pt b/plone/schemaeditor/browser/schema/schema_listing.pt
+index 5bfd79c..ca134f3 100644
+--- a/plone/schemaeditor/browser/schema/schema_listing.pt
++++ b/plone/schemaeditor/browser/schema/schema_listing.pt
+@@ -2,13 +2,13 @@
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+      tal:omit-tag="" i18n:domain="plone.schemaeditor">
+-  <a id="add-field" class="pat-modal"
++  <a id="add-field" class="pat-plone-modal"
+      href="${context/absolute_url}/@@add-field">
+     <button style="float: right; display: block;"
+            i18n:translate="add_new_field_hellip">Add new field&hellip;</button>
+   </a>
+
+-  <a id="add-fieldset" class="pat-modal" tal:condition="context/enableFieldsets"
++  <a id="add-fieldset" class="pat-plone-modal" tal:condition="context/enableFieldsets"
+      href="${context/absolute_url}/@@add-fieldset">
+     <button style="float: right; display: block;"
+            i18n:translate="add_fieldset_hellip">Add new fieldset&hellip;</button>
+@@ -114,7 +114,7 @@
+
+               <div class="fieldControls"
+                    i18n:domain="plone.schemaeditor">
+-                  <a class="fieldSettings pat-modal"
++                  <a class="fieldSettings pat-plone-modal"
+                      tal:define="edit_url python:view.edit_url(widget.field)"
+                      tal:condition="edit_url"
+                      i18n:translate=""
+diff --git a/plone/schemaeditor/tests/robot/test_fields.robot b/plone/schemaeditor/tests/robot/test_fields.robot
+index 1fddc86..834c5c6 100644
+--- a/plone/schemaeditor/tests/robot/test_fields.robot
++++ b/plone/schemaeditor/tests/robot/test_fields.robot
+@@ -161,4 +161,4 @@ Add field
+
+ Open field settings
+     [Arguments]    ${field_id}
+-    Click Overlay Link  xpath=//div[@data-field_id='${field_id}']//a[@class='fieldSettings pat-modal']
++    Click Overlay Link  xpath=//div[@data-field_id='${field_id}']//a[@class='fieldSettings pat-plone-modal']