From c697cccb7a7064ba7eed4156ff109a03dae6a187 Mon Sep 17 00:00:00 2001 From: Jean-Paul Smets <jp@nexedi.com> Date: Wed, 13 Jun 2007 18:32:54 +0000 Subject: [PATCH] Renames au_macros to follow conventions git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@14816 20353a03-c40f-0410-a6d1-a30d3c3de9de --- ...ml => WebSite_viewContributePropertyRenderer.xml} | 12 +++--------- .../WebSite_viewContributeRenderer.xml | 9 ++++++--- .../WebSite_viewSearchRenderer.xml | 2 +- 3 files changed, 10 insertions(+), 13 deletions(-) rename bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/{au_macros.xml => WebSite_viewContributePropertyRenderer.xml} (94%) diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/au_macros.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewContributePropertyRenderer.xml similarity index 94% rename from bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/au_macros.xml rename to bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewContributePropertyRenderer.xml index 22350680b3..e7c946b3ca 100644 --- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/au_macros.xml +++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewContributePropertyRenderer.xml @@ -81,13 +81,7 @@ </option>\n </select>\n </div>\n -</div> \n -\n -\n -<!-- \n -# vim: filetype=html syntax=html shiftwidth=2 \n --->\n - +</div> ]]></string> </value> </item> @@ -101,11 +95,11 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>au_macros</string> </value> + <value> <string>WebSite_viewContributePropertyRenderer</string> </value> </item> <item> <key> <string>title</string> </key> - <value> <string>XXX - Integrate in wherever appropriate</string> </value> + <value> <string>Contribute Subwidgets</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewContributeRenderer.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewContributeRenderer.xml index 653799bf72..2aa3d5d241 100644 --- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewContributeRenderer.xml +++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewContributeRenderer.xml @@ -78,9 +78,12 @@ </select>\n <input type="file" name="contribute_file" size="30" />\n </div>\n + <!--<a onclick="setMailString();" id="mail_contribute_button" href="mailto:dms@dms.nexedi.com?subject=Contribution&body=">\n + <img src="au_icons/kmail.png" align="right" alt="contribute by mail" title="contribute by mail"/>\n + </a>-->\n <div style="float:left"\n tal:define="contribute_prefix string:contribute_">\n - <div metal:use-macro="here/au_macros/macros/contribute_properties">\n + <div metal:use-macro="here/WebSite_viewContributePropertyRenderer/macros/contribute_properties">\n Theme\n </div>\n </div>\n @@ -112,7 +115,7 @@ <a href="" target="_blank" onclick="return setLink(this)" value="" i18n:translate="" i18n:domain="ui">preview</a>\n </div>\n <tal:block tal:define="contribute_prefix string:link_">\n - <div metal:use-macro="here/au_macros/macros/contribute_properties">\n + <div metal:use-macro="here/WebSite_viewContributePropertyRenderer/macros/contribute_properties">\n Theme\n </div>\n </tal:block>\n @@ -146,7 +149,7 @@ title = \'Online Content:\',\n ),\n dict(\n - portal_type_list = here.getPortalFileDocumentTypeList(),\n + portal_type_list = here.getPortalFileDocumentTypeList() + here.getPortalTemplateDocumentTypeList(),\n id = \'content\',\n title = \'Offline Content:\',\n ),\n diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewSearchRenderer.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewSearchRenderer.xml index 4b61dbc9bd..0f35a9f1a4 100644 --- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewSearchRenderer.xml +++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewSearchRenderer.xml @@ -80,7 +80,7 @@ Description:\n <option value="Person" i18n:translate="" i18n:domain="ui">Person</option>\n <option value="Organisation" i18n:translate="" i18n:domain="ui">Organisation</option>\n <option value="" i18n:translate="" i18n:domain="ui">-- Quick Search --</option>\n - <option tal:repeat="ptype here/ERP5Site_getQuickSearchableTypeList"\n + <option tal:repeat="ptype here/ERP5Site_getQuickSearchableTypeList | nothing"\n tal:attributes="value ptype" tal:content="python:ptype"\n i18n:translate="" i18n:domain="ui">Standard Type</option>\n </tal:block>\n -- 2.30.9