[Erp5-report] r13209 - in /erp5/trunk/bt5/erp5_web: SkinTemplateItem/portal_skins/erp5_web_...
nobody at svn.erp5.org
nobody at svn.erp5.org
Sat Mar 3 16:00:30 CET 2007
Author: bartek
Date: Sat Mar 3 16:00:23 2007
New Revision: 13209
URL: http://svn.erp5.org?rev=13209&view=rev
Log:
Changes the way to search searchable types in the system.
Modified:
erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewContributeRenderer.xml
erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewSCALEWidget.xml
erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewSearchRenderer.xml
erp5/trunk/bt5/erp5_web/WorkflowTemplateItem/portal_workflow/publication_workflow/transitions/publish_action.xml
erp5/trunk/bt5/erp5_web/WorkflowTemplateItem/portal_workflow/publication_workflow/transitions/unpublish_action.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=13209&r1=13208&r2=13209&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewContributeRenderer.xml (original)
+++ erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewContributeRenderer.xml Sat Mar 3 16:00:23 2007
@@ -59,7 +59,7 @@
<div class="tabbertab">\n
<h2>Contribute</h2>\n
<div class="fieldset">\n
- <div tal:define="search_type_list here/WebSite_getSearchableTypeList">\n
+ <div tal:define="search_type_list here/ERP5Site_getSearchableDocumentTypeList">\n
<label for="doctype" i18n:translate="" i18n:domain="ui">Type</label>\n
<select size="1" name="doctype" id="doctype" onchange="toggleMakeTemplateButton(this);">\n
<option value="" i18n:translate="" i18n:domain="ui">-- Select Document Type --</option>\n
Modified: erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewSCALEWidget.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewSCALEWidget.xml?rev=13209&r1=13208&r2=13209&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewSCALEWidget.xml (original)
+++ erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewSCALEWidget.xml Sat Mar 3 16:00:23 2007
@@ -57,17 +57,18 @@
</div>\n
\n
<div id="dashboard">\n
+<!--\n
<div class="box left" tal:define="global TASK_LEN python: 20">\n
<tal:block metal:use-macro="here/WebSite_viewDashboardRenderer/macros/act"/>\n
</div>\n
- <div class="box left" tal:define="NEWS_LEN python: 20">\n
+ <div class="box left" tal:define="NEWS_LEN python: 20">\n
<tal:block metal:use-macro="here/WebSite_viewDashboardRenderer/macros/learn"/>\n
</div>\n
\n
<div class="box left">\n
<tal:block metal:use-macro="here/WebSite_viewDashboardRenderer/macros/evaluate"/>\n
</div>\n
-\n
+-->\n
</div>
]]></string> </value>
Modified: erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewSearchRenderer.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewSearchRenderer.xml?rev=13209&r1=13208&r2=13209&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewSearchRenderer.xml (original)
+++ erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewSearchRenderer.xml Sat Mar 3 16:00:23 2007
@@ -56,7 +56,7 @@
\n
<tal:block metal:define-macro="main">\n
<tal:block metal:use-macro="here/global_definitions_au/macros/main"/>\n
- <div class="tabber" id="mytabber1" tal:define="search_type_list here/WebSite_getSearchableTypeList">\n
+ <div class="tabber" id="mytabber1">\n
\n
<div class="tabbertab">\n
<h2 value="" i18n:translate="" i18n:domain="ui">Search</h2>\n
@@ -64,11 +64,23 @@
<div>\n
<input type="text" size="40" name="new_advanced_search_text" id="SearchableText" class="autofocus"/>\n
<tal:block i18n:translate="" i18n:domain="ui">in</tal:block>\n
- <select size="1" class="input" name="search_portal_type">\n
- <option value="all" selected value="" i18n:translate="" i18n:domain="ui">Any Documents</option>\n
- <option tal:repeat="portal_type search_type_list"\n
- tal:content="portal_type"\n
- tal:attributes="value portal_type"/>\n
+ <select size="1" class="input" name="new_advanced_search_portal_type">\n
+ <tal:block metal:define-macro="search_type_option_list">\n
+ <option value="" selected value="" i18n:translate="" i18n:domain="ui">Everything</option>\n
+ <option value="all" selected value="" i18n:translate="" i18n:domain="ui">All Documents</option>\n
+ <tal:block tal:repeat="portal_item here/ERP5Site_getSearchableDocumentTypeItemList">\n
+ <option tal:attributes="value python:portal_item[1]"\n
+ tal:content="python:portal_item[0]">Standard Type</option>\n
+ </tal:block>\n
+ <option value="" i18n:translate="" i18n:domain="ui">-- Directory --</option>\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
+ <tal:block tal:repeat="portal_item here/ERP5Site_getQuickSearchableTypeItemList">\n
+ <option tal:attributes="value python:portal_item[1]"\n
+ tal:content="python:portal_item[0]">Standard Type</option>\n
+ </tal:block>\n
+ </tal:block>\n
</select>\n
<input type="submit" name="searches/WebSite_viewQuickSearchResultList:method" value="Search"/>\n
</div>\n
@@ -129,15 +141,15 @@
<div class="tabbertab">\n
<h2 i18n:translate="" i18n:domain="ui">Query</h2>\n
<div>\n
- <textarea cols="40" rows="2" name="description"></textarea>\n
+ <textarea cols="80" rows="4" name="query_description"></textarea>\n
<tal:block i18n:translate="" i18n:domain="ui">in</tal:block>\n
<select size="1" class="input" name="query_portal_type">\n
<option value="all" selected value="" i18n:translate="" i18n:domain="ui">Any Documents</option>\n
- <option tal:repeat="portal_type search_type_list"\n
- tal:content="portal_type"\n
- tal:attributes="value portal_type"/>\n
+ <option tal:repeat="portal_type_item here/ERP5Site_getSearchableDocumentTypeItemList"\n
+ tal:content="python:portal_type_item[0]"\n
+ tal:attributes="value python:portal_type_item[1]"/>\n
</select>\n
- <input type="submit" name="Base_postQuery:method" value="Send Query to Expert"/>\n
+ <input type="submit" name="WebSite_postQueryWithType:method" value="Send Query to Expert"/>\n
<div class="clear"></div>\n
</div>\n
</div>\n
@@ -149,8 +161,20 @@
]]></string> </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>WebSite_viewSearchRenderer</string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_web/WorkflowTemplateItem/portal_workflow/publication_workflow/transitions/publish_action.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/WorkflowTemplateItem/portal_workflow/publication_workflow/transitions/publish_action.xml?rev=13209&r1=13208&r2=13209&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/WorkflowTemplateItem/portal_workflow/publication_workflow/transitions/publish_action.xml (original)
+++ erp5/trunk/bt5/erp5_web/WorkflowTemplateItem/portal_workflow/publication_workflow/transitions/publish_action.xml Sat Mar 3 16:00:23 2007
@@ -90,8 +90,6 @@
<value>
<tuple>
<string>Assignor</string>
- <string>Assignee</string>
- <string>Owner</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_web/WorkflowTemplateItem/portal_workflow/publication_workflow/transitions/unpublish_action.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/WorkflowTemplateItem/portal_workflow/publication_workflow/transitions/unpublish_action.xml?rev=13209&r1=13208&r2=13209&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/WorkflowTemplateItem/portal_workflow/publication_workflow/transitions/unpublish_action.xml (original)
+++ erp5/trunk/bt5/erp5_web/WorkflowTemplateItem/portal_workflow/publication_workflow/transitions/unpublish_action.xml Sat Mar 3 16:00:23 2007
@@ -90,8 +90,6 @@
<value>
<tuple>
<string>Assignor</string>
- <string>Assignee</string>
- <string>Owner</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_web/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/bt/revision?rev=13209&r1=13208&r2=13209&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/bt/revision (original)
+++ erp5/trunk/bt5/erp5_web/bt/revision Sat Mar 3 16:00:23 2007
@@ -1,1 +1,1 @@
-536
+541
More information about the Erp5-report
mailing list