[Erp5-report] r32909 ivan - in /erp5/trunk/bt5/erp5_web: SkinTemplateItem/portal_skins/erp5...
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Feb 22 10:05:57 CET 2010
Author: ivan
Date: Mon Feb 22 10:05:57 2010
New Revision: 32909
URL: http://svn.erp5.org?rev=32909&view=rev
Log:
Use generic contribute script.
Modified:
erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewContributeRenderer.xml
erp5/trunk/bt5/erp5_web/bt/revision
Modified: erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewContributeRenderer.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewContributeRenderer.xml?rev=32909&r1=32908&r2=32909&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewContributeRenderer.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewContributeRenderer.xml [utf8] Mon Feb 22 10:05:57 2010
@@ -50,75 +50,126 @@
<tal:block metal:use-macro="here/global_definitions/macros/header_definitions"/>\n
</tal:block>\n
\n
+<!-- Contribute file tab -->\n
+\n
<div class="tabber" id="mytabber2">\n
+<form action="Base_contribute" \n
+ enctype="multipart/form-data" \n
+ method="post"\n
+ name="contribute_file_form">\n
<div class="tabbertab">\n
- <h2 i18n:translate="" i18n:domain="ui">Contribute</h2>\n
+ <h2 i18n:translate="" \n
+ i18n:domain="ui">Contribute</h2>\n
<div class="fieldset">\n
<div>\n
- <label for="contribute_portal_type" i18n:translate="" i18n:domain="ui">Type</label>\n
- <select size="1" name="contribute_portal_type" id="portal_type" onchange="toggleMakeTemplateButton(this);">\n
- <option value="" i18n:translate="" i18n:domain="ui">-- Select Document Type --</option>\n
+ <label for="portal_type" \n
+ i18n:translate="" \n
+ i18n:domain="ui">Type</label>\n
+ <select size="1" \n
+ name="portal_type" \n
+ id="portal_type" \n
+ onchange="toggleMakeTemplateButton(this);">\n
+ <option value="" \n
+ i18n:translate="" \n
+ i18n:domain="ui">-- Select Document Type --</option>\n
<tal:block tal:repeat="ptype here/getPortalTemplateDocumentTypeList">\n
- <option \n
- tal:content="ptype" tal:attributes="value ptype"\n
- value="" i18n:translate="" i18n:domain="ui">Report</option>\n
+ <option tal:content="ptype" \n
+ tal:attributes="value ptype"\n
+ value="" \n
+ i18n:translate="" \n
+ i18n:domain="ui"/>\n
</tal:block>\n
- <option value="" i18n:translate="" i18n:domain="ui">-- Any Other Document Type --</option>\n
+ <option value="" \n
+ i18n:translate="" \n
+ i18n:domain="ui">-- Any Other Document Type --</option>\n
</select>\n
- <input type="file" name="contribute_file" size="30" />\n
+ <input type="hidden" \n
+ name="synchronous_metadata_discovery" \n
+ value="1"/>\n
+ <input type="hidden" \n
+ name="redirect_to_document" \n
+ value="1"/>\n
+ <input type="file" \n
+ name="file" size="30" />\n
</div>\n
- <!--<a onclick="setMailString();" id="mail_contribute_button" href="mailto:dms at 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
+\n
<div style="float:left"\n
- tal:define="contribute_prefix string:contribute_">\n
- <div metal:use-macro="here/WebSite_viewContributePropertyRenderer/macros/contribute_properties">\n
- Theme\n
- </div>\n
+ tal:define="contribute_prefix string:">\n
+ <div metal:use-macro="here/WebSite_viewContributePropertyRenderer/macros/contribute_properties"/>\n
</div>\n
\n
<div style="float:right; margin-top:10px;">\n
- <a onclick="setMailString();" id="mail_contribute_button"\n
- href="mailto:dms at dms.nexedi.com?subject=Contribution&body="\n
+ <a onclick="setMailString();" \n
+ id="mail_contribute_button"\n
tal:define="ingestion_address here/portal_preferences/getPreferredDocumentEmailIngestionAddress|nothing"\n
tal:condition="ingestion_address"\n
tal:attributes="href string:${ingestion_address}?subject=Contribution&body=">\n
<img src="send_by_mail" border="0"/>\n
- <tal:block i18n:translate="" i18n:domain="ui">Click here to contribute by email.</tal:block></a>\n
- \n
- <input i18n:domain="ui" i18n:attributes="value" type="submit" name="Memo_makeOOoTemplate:method" value="Make Template" id="maketemplatebutton" disabled="disabled"\n
- style="width:100px;background-image:none;"/>\n
- \n
- <input i18n:domain="ui" i18n:attributes="value" type="submit" name="WebSite_contributeContent:method" value="Contribute"/>\n
+ <tal:block \n
+ i18n:translate="" \n
+ i18n:domain="ui">Click here to contribute by email.</tal:block></a>\n
+\n
+ <input i18n:domain="ui" \n
+ i18n:attributes="value" \n
+ type="submit" \n
+ name="Base_contribute:method" \n
+ value="Contribute"/>\n
</div>\n
- \n
- \n
</div>\n
\n
<div class="clear"></div>\n
- </div>\n
+</div>\n
+</form>\n
\n
- <div class="tabbertab">\n
- <h2 i18n:translate="" i18n:domain="ui">Link</h2>\n
- <div class="fieldset tabbertabcont">\n
- <div>\n
- <label for="url" value="" i18n:translate="" i18n:domain="ui">URL</label>\n
- <input type="text" name="link_url" id="url" size="80" value="http://" />\n
- <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/WebSite_viewContributePropertyRenderer/macros/contribute_properties">\n
- Theme\n
- </div>\n
- </tal:block>\n
- <div>\n
- <label for="link_description" value="" i18n:translate="" i18n:domain="ui">Description</label>\n
- <textarea cols="80" rows="2" name="link_description"></textarea>\n
- </div>\n
+<!-- Contribute link tab -->\n
+<div class="tabbertab">\n
+<form action="Base_contribute" \n
+ enctype="multipart/form-data" \n
+ method="post"\n
+ name="contribute_url_form">\n
+ <h2 i18n:translate="" i18n:domain="ui">Link</h2>\n
+ <div class="fieldset tabbertabcont">\n
+ <div>\n
+ <label for="url" \n
+ i18n:translate="" \n
+ i18n:domain="ui">URL</label>\n
+ <input type="text" \n
+ name="url" \n
+ id="url" \n
+ size="80" \n
+ value="http://" />\n
+ <a href="" \n
+ target="_blank" \n
+ onclick="return setLink(this)" \n
+ value="" \n
+ i18n:translate="" \n
+ i18n:domain="ui">Preview</a>\n
</div>\n
- <input i18n:domain="ui" i18n:attributes="value" style="float:right" type="submit" name="WebSite_linkContent:method" value="Contribute"/>\n
- <div class="clear"></div>\n
- </div>\n
+ <tal:block tal:define="contribute_prefix string:">\n
+ <div metal:use-macro="here/WebSite_viewContributePropertyRenderer/macros/contribute_properties"/>\n
+ </tal:block>\n
+ <div>\n
+ <label for="description" \n
+ i18n:translate="" \n
+ i18n:domain="ui">Description</label>\n
+ <textarea cols="80" \n
+ rows="2" \n
+ name="description"></textarea>\n
+ </div>\n
+ </div>\n
+\n
+ <input type="hidden" \n
+ name="redirect_url" \n
+ tal:attributes="value python: here.getWebSiteValue().absolute_url()"/> \n
+ <input i18n:domain="ui" \n
+ i18n:attributes="value" \n
+ style="float:right" \n
+ type="submit" \n
+ name="Base_contribute:method" \n
+ value="Contribute"/>\n
+ <div class="clear"></div>\n
+ </form>\n
+ </div>\n
\n
<div class="tabbertab"\n
tal:define="user here/portal_membership/getAuthenticatedMember">\n
Modified: erp5/trunk/bt5/erp5_web/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/bt/revision?rev=32909&r1=32908&r2=32909&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_web/bt/revision [utf8] Mon Feb 22 10:05:57 2010
@@ -1,1 +1,1 @@
-907
+908
More information about the Erp5-report
mailing list