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 520a91787357a8d45d5aeba643e09109bc49b024..8a803f2cbcd45ab4a53f4cfded8525be05e9f3f9 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 @@ -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 diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewSCALEWidget.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewSCALEWidget.xml index cf1193a420fb51c4498617188b234b31f15f0d57..13b181c0fafee0f797303cf082f9872520eb546f 100644 --- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewSCALEWidget.xml +++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewSCALEWidget.xml @@ -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> 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 5055b51c85c3565b36232aedcd8d4cd8630f0058..e344afc65e0cc278717ea2860996364c79cfe108 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 @@ -56,7 +56,7 @@ Description:\n \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 @@ Description:\n <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 @@ Description:\n <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 @@ -148,10 +160,22 @@ Description:\n ]]></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> </record> diff --git a/bt5/erp5_web/WorkflowTemplateItem/portal_workflow/publication_workflow/transitions/publish_action.xml b/bt5/erp5_web/WorkflowTemplateItem/portal_workflow/publication_workflow/transitions/publish_action.xml index 99d07db38b1345e0759fc8e56aeedbad22427ed1..483815fe5ca2b9d237acb2b55c7b0d82eac9a3f7 100644 --- a/bt5/erp5_web/WorkflowTemplateItem/portal_workflow/publication_workflow/transitions/publish_action.xml +++ b/bt5/erp5_web/WorkflowTemplateItem/portal_workflow/publication_workflow/transitions/publish_action.xml @@ -90,8 +90,6 @@ <value> <tuple> <string>Assignor</string> - <string>Assignee</string> - <string>Owner</string> </tuple> </value> </item> diff --git a/bt5/erp5_web/WorkflowTemplateItem/portal_workflow/publication_workflow/transitions/unpublish_action.xml b/bt5/erp5_web/WorkflowTemplateItem/portal_workflow/publication_workflow/transitions/unpublish_action.xml index 8340fdb73608bcea978b58ea2ba6d61498a50937..86f77eafc74e75088ab386d803be5f8330dc2cdc 100644 --- a/bt5/erp5_web/WorkflowTemplateItem/portal_workflow/publication_workflow/transitions/unpublish_action.xml +++ b/bt5/erp5_web/WorkflowTemplateItem/portal_workflow/publication_workflow/transitions/unpublish_action.xml @@ -90,8 +90,6 @@ <value> <tuple> <string>Assignor</string> - <string>Assignee</string> - <string>Owner</string> </tuple> </value> </item> diff --git a/bt5/erp5_web/bt/revision b/bt5/erp5_web/bt/revision index db3a73389dfbe06c2a031f6ace059a02548c6de4..3e990b743e961c843004fbca714976a274c86afd 100644 --- a/bt5/erp5_web/bt/revision +++ b/bt5/erp5_web/bt/revision @@ -1 +1 @@ -536 \ No newline at end of file +541 \ No newline at end of file