[Erp5-report] r44264 gabriel - in /erp5/trunk/bt5/erp5_web_ung_ui_test: PathTemplateItem/po...

nobody at svn.erp5.org nobody at svn.erp5.org
Mon Mar 14 20:49:44 CET 2011


Author: gabriel
Date: Mon Mar 14 20:49:44 2011
New Revision: 44264

URL: http://svn.erp5.org?rev=44264&view=rev
Log:
create macro to remove code duplicated

Added:
    erp5/trunk/bt5/erp5_web_ung_ui_test/SkinTemplateItem/portal_skins/erp5_web_ung_ui_test/Zuite_CommonTemplateForUNG.xml
Modified:
    erp5/trunk/bt5/erp5_web_ung_ui_test/PathTemplateItem/portal_tests/ung_zuite/testGadgetInUNGDocs.xml
    erp5/trunk/bt5/erp5_web_ung_ui_test/PathTemplateItem/portal_tests/ung_zuite/testUNGLogin.xml
    erp5/trunk/bt5/erp5_web_ung_ui_test/PathTemplateItem/portal_tests/ung_zuite/testUNGSettings.xml
    erp5/trunk/bt5/erp5_web_ung_ui_test/bt/revision

Modified: erp5/trunk/bt5/erp5_web_ung_ui_test/PathTemplateItem/portal_tests/ung_zuite/testGadgetInUNGDocs.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_ui_test/PathTemplateItem/portal_tests/ung_zuite/testGadgetInUNGDocs.xml?rev=44264&r1=44263&r2=44264&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_ui_test/PathTemplateItem/portal_tests/ung_zuite/testGadgetInUNGDocs.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_ui_test/PathTemplateItem/portal_tests/ung_zuite/testGadgetInUNGDocs.xml [utf8] Mon Mar 14 20:49:44 2011
@@ -47,7 +47,7 @@
     <thead>\n
       <tr><td rowspan="1" colspan="3" tal:content="template/getId"/></tr>\n
     </thead><tbody>\n
-      <tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/init" />\n
+      <tal:block metal:use-macro="here/Zuite_CommonTemplateForUNG/macros/init" />\n
       <tr>\n
         <td>openAndWait</td>\n
         <td>${base_url}/ERP5Site_cleanUpUNGKnowledgePadList</td>\n
@@ -55,7 +55,7 @@
       </tr>\n
       <tr>\n
         <td>openAndWait</td>\n
-        <td>${base_url}/web_site_module/ung/WebSite_logout</td>\n
+        <td>${ung_url}/WebSite_logout</td>\n
         <td></td>\n
       </tr>\n
       <tr>\n

Modified: erp5/trunk/bt5/erp5_web_ung_ui_test/PathTemplateItem/portal_tests/ung_zuite/testUNGLogin.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_ui_test/PathTemplateItem/portal_tests/ung_zuite/testUNGLogin.xml?rev=44264&r1=44263&r2=44264&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_ui_test/PathTemplateItem/portal_tests/ung_zuite/testUNGLogin.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_ui_test/PathTemplateItem/portal_tests/ung_zuite/testUNGLogin.xml [utf8] Mon Mar 14 20:49:44 2011
@@ -47,10 +47,10 @@
     <thead>\n
       <tr><td rowspan="1" colspan="3" tal:content="template/getId"/></tr>\n
     </thead><tbody>\n
-      <tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/init" />\n
+      <tal:block metal:use-macro="here/Zuite_CommonTemplateForUNG/macros/init" />\n
       <tr>\n
         <td>openAndWait</td>\n
-        <td>${base_url}/web_site_module/ung/WebSite_logout</td>\n
+        <td>${ung_url}/WebSite_logout</td>\n
         <td></td>\n
       </tr>\n
       <tr>\n
@@ -95,7 +95,7 @@
       </tr>\n
       <tr>\n
         <td>clickAndWait</td>\n
-        <td>//a[@href="${base_url}/web_site_module/ung/WebSite_logout"]</td>\n
+        <td>//a[@href="${ung_url}/WebSite_logout"]</td>\n
         <td></td>\n
       </tr>\n
       <tr>\n

Modified: erp5/trunk/bt5/erp5_web_ung_ui_test/PathTemplateItem/portal_tests/ung_zuite/testUNGSettings.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_ui_test/PathTemplateItem/portal_tests/ung_zuite/testUNGSettings.xml?rev=44264&r1=44263&r2=44264&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_ui_test/PathTemplateItem/portal_tests/ung_zuite/testUNGSettings.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_ui_test/PathTemplateItem/portal_tests/ung_zuite/testUNGSettings.xml [utf8] Mon Mar 14 20:49:44 2011
@@ -47,10 +47,10 @@
     <thead>\n
       <tr><td rowspan="1" colspan="3" tal:content="template/getId"/></tr>\n
     </thead><tbody>\n
-      <tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/init" />\n
+      <tal:block metal:use-macro="here/Zuite_CommonTemplateForUNG/macros/init" />\n
       <tr>\n
         <td>openAndWait</td>\n
-        <td>${base_url}/web_site_module/ung/WebSite_logout</td>\n
+        <td>${ung_url}/WebSite_logout</td>\n
         <td></td>\n
       </tr>\n
       <tr>\n

Added: erp5/trunk/bt5/erp5_web_ung_ui_test/SkinTemplateItem/portal_skins/erp5_web_ung_ui_test/Zuite_CommonTemplateForUNG.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_ui_test/SkinTemplateItem/portal_skins/erp5_web_ung_ui_test/Zuite_CommonTemplateForUNG.xml?rev=44264&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_ui_test/SkinTemplateItem/portal_skins/erp5_web_ung_ui_test/Zuite_CommonTemplateForUNG.xml (added)
+++ erp5/trunk/bt5/erp5_web_ung_ui_test/SkinTemplateItem/portal_skins/erp5_web_ung_ui_test/Zuite_CommonTemplateForUNG.xml [utf8] Mon Mar 14 20:49:44 2011
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_bind_names</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>_asgns</string> </key>
+                        <value>
+                          <dictionary>
+                            <item>
+                                <key> <string>name_subpath</string> </key>
+                                <value> <string>traverse_subpath</string> </value>
+                            </item>
+                          </dictionary>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>_text</string> </key>
+            <value> <unicode encoding="cdata"><![CDATA[
+
+<tal:block xmlns:tal="http://xml.zope.org/namespaces/tal"\n
+           xmlns:metal="http://xml.zope.org/namespaces/metal">\n
+  <tal:block metal:define-macro="init">\n
+    <tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/init" />\n
+    <tr>\n
+      <td>store</td>\n
+      <td>${base_url}/web_site_module/ung</td>\n
+      <td>ung_url</td>\n
+    </tr>\n
+  </tal:block>\n
+</tal:block>
+
+]]></unicode> </value>
+        </item>
+        <item>
+            <key> <string>content_type</string> </key>
+            <value> <string>text/html</string> </value>
+        </item>
+        <item>
+            <key> <string>expand</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>Zuite_CommonTemplateForUNG</string> </value>
+        </item>
+        <item>
+            <key> <string>output_encoding</string> </key>
+            <value> <string>utf-8</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <unicode></unicode> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

Modified: erp5/trunk/bt5/erp5_web_ung_ui_test/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_ui_test/bt/revision?rev=44264&r1=44263&r2=44264&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_ui_test/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_ui_test/bt/revision [utf8] Mon Mar 14 20:49:44 2011
@@ -1 +1 @@
-2
\ No newline at end of file
+3
\ No newline at end of file



More information about the Erp5-report mailing list