diff --git a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/tabber.css.xml b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/tabber.css.xml index 8feb983466ad4a915e055e6a0b7a1440f6b07af1..2a155918136ce92445f01e2144b9c0050d770c3a 100644 --- a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/tabber.css.xml +++ b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/tabber.css.xml @@ -280,11 +280,16 @@ margin-right: 1em;\n \n .tabbertab .advanced_search_fields div{\n padding: 1px;\n + margin-left: 1.5em;\n }\n \n .tabbertab .advanced_search_fields input{\n }\n \n +.tabbertab .advanced_search_fields .hidden_label {\n + margin-left: 16em;\n +}\n +\n </tal:block>\n diff --git a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/template_erp5_egov.css.xml b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/template_erp5_egov.css.xml index 8e6e3bf6558f204fac6452b1f743617eb30a2da1..630ddbc62a23050273b515e54ef813bc7219c73d 100644 --- a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/template_erp5_egov.css.xml +++ b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/template_erp5_egov.css.xml @@ -527,6 +527,7 @@ div.section_title{\n div#main_content fieldset {\n margin: 0;\n border:none;\n + padding: 0;\n }\n \n .content #fieldset_center,\n @@ -581,6 +582,20 @@ fieldset.register_informations{\n width:800px !important;\n }\n \n +.document .section_explanation{\n + background: white !important;\n + width:791px !important;\n + line-height: 3em;\n + marging-left: 2em;\n +}\n +\n +div.section_explanation{\n + padding-left: 0.5em;\n +}\n +\n +\n +\n +\n fieldset.white_background .input,\n fieldset.register_informations .input{\n padding: 0 2em 0 2em;\n diff --git a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/template_erp5_egov_workspace.css.xml b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/template_erp5_egov_workspace.css.xml index 21739263f6876ab244b37d33b08cfa7bf58557f1..8488f7b4a181c9976cd7872f763944131a87f6ec 100644 --- a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/template_erp5_egov_workspace.css.xml +++ b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/template_erp5_egov_workspace.css.xml @@ -87,7 +87,7 @@ div#main_content fieldset legend {\n div#main_content fieldset label {\n margin: 0;\n display: block;\n - width: 11em;\n + width: 20em;\n text-align: right;\n float: left;\n text-transform: capitalize;\n diff --git a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewWorkspaceWidgets.css.xml b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewWorkspaceWidgets.css.xml index 83aded161e43ad1b571e754cf33f5ef679bf06c5..7ddcef3f53147f78d8be3587dbdb22a847996856 100644 --- a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewWorkspaceWidgets.css.xml +++ b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewWorkspaceWidgets.css.xml @@ -64,7 +64,7 @@ \n \n .widget_space div.field{\n - clear:none !important;\n + /*clear:none !important;*/\n min-width:185px;\n /*width:47%;*/\n }\n diff --git a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/eGov_viewAdvancedSearchDialog.xml b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/eGov_viewAdvancedSearchDialog.xml index e41112e45388f617baf355d58c9f6d9a06cc4214..46f74a61d2686084ccff93eacf7d4c2a88941905 100644 --- a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/eGov_viewAdvancedSearchDialog.xml +++ b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/eGov_viewAdvancedSearchDialog.xml @@ -83,7 +83,9 @@ <item> <key> <string>center</string> </key> <value> - <list/> + <list> + <string>Search</string> + </list> </value> </item> <item> @@ -153,6 +155,10 @@ <key> <string>update_action</string> </key> <value> <string></string> </value> </item> + <item> + <key> <string>update_action_title</string> </key> + <value> <string></string> </value> + </item> </dictionary> </pickle> </record> diff --git a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/eGov_viewAdvancedSearchDialog/Search.xml b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/eGov_viewAdvancedSearchDialog/Search.xml new file mode 100644 index 0000000000000000000000000000000000000000..88adfeba3e24d5e777288073eacc5ccbf616b6ed --- /dev/null +++ b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/eGov_viewAdvancedSearchDialog/Search.xml @@ -0,0 +1,178 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <global name="InputButtonField" module="Products.ERP5Form.InputButtonField"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>id</string> </key> + <value> <string>Search</string> </value> + </item> + <item> + <key> <string>message_values</string> </key> + <value> + <dictionary/> + </value> + </item> + <item> + <key> <string>overrides</string> </key> + <value> + <dictionary> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>image</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>tales</string> </key> + <value> + <dictionary> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>image</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>values</string> </key> + <value> + <dictionary> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string>hidden_label</string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> <string>Search</string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>image</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>name</string> </key> + <value> <string>WebSite_viewQuickSearchResultList:method</string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>search</string> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_egov/bt/change_log b/bt5/erp5_egov/bt/change_log index 5d0ac07901db8c832599e405bfafaafbfa7e141d..e0a3ebc25d6c79c08389f3c9fccc89028ed0954a 100644 --- a/bt5/erp5_egov/bt/change_log +++ b/bt5/erp5_egov/bt/change_log @@ -1,3 +1,7 @@ +2010-07-06 mayoro +* correct display of advanced search dialog +* correct display of explanation in attachments + 2010-07-06 mohamadou * add assignee default role on procedure portal type role information diff --git a/bt5/erp5_egov/bt/revision b/bt5/erp5_egov/bt/revision index 38bfa57c0c565322877ca643e61ea7e8e2a64553..ce7f605a46ac20bbe5529f34b8e6b6d19e5e0da1 100644 --- a/bt5/erp5_egov/bt/revision +++ b/bt5/erp5_egov/bt/revision @@ -1 +1 @@ -681 \ No newline at end of file +683 \ No newline at end of file