Commit cb697a13 authored by Fabien Morin's avatar Fabien Morin

- checks that the user can't valid if all required documents are not uploaded

- add two widgets to the user home page, one for his documents, and an other for his pending requests
- align on the left the form instead of center it
- change listbox page templates to be able to handle the listboxName_fieldName
fields
- change the place of the admin box action select because konqueror could not handle this position case : tab action weren't clicable. Now it's a little bit more ugly, but it works on konqueror 3.5.9, firefox 2.0.0.12 and opera 9.26
- change a little connection procedure, and add the track requests fields for logged users
- add title on transition to have an history more confortable to read and translated

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@19779 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent e52e79d5
...@@ -71,6 +71,9 @@ ...@@ -71,6 +71,9 @@
The view_document_url is used to define the URL to return to\n The view_document_url is used to define the URL to return to\n
after editing the document.\n after editing the document.\n
"""\n """\n
from Products.DCWorkflow.DCWorkflow import ValidationFailed\n
request=context.REQUEST\n
\n
\n \n
next_url_dict = {\n next_url_dict = {\n
\'DeclarationDeTVA_view\' : \'DeclarationTVA_viewAttachmentList\',\n \'DeclarationDeTVA_view\' : \'DeclarationTVA_viewAttachmentList\',\n
...@@ -82,8 +85,15 @@ successful_edit_redirect_url = \'%s/%s\' % (context.absolute_url(), next_url_dic ...@@ -82,8 +85,15 @@ successful_edit_redirect_url = \'%s/%s\' % (context.absolute_url(), next_url_dic
# if the current step is DeclarationTVA_viewAttachmentList, the document must\n # if the current step is DeclarationTVA_viewAttachmentList, the document must\n
# be submitted\n # be submitted\n
if form_id == \'DeclarationTVA_viewAttachmentList\':\n if form_id == \'DeclarationTVA_viewAttachmentList\':\n
context.submit()\n try : \n
request=context.REQUEST\n context.portal_workflow.doActionFor(context,\n
\'submit_action\')\n
except ValidationFailed, message: \n
return request[\'RESPONSE\'].redirect(\n
"%s/%s?portal_status_message=%s" %\n
(context.absolute_url(), form_id, message))\n
\n
\n
result = request[\'RESPONSE\'].redirect(successful_edit_redirect_url) \n result = request[\'RESPONSE\'].redirect(successful_edit_redirect_url) \n
return result\n return result\n
\n \n
...@@ -146,12 +156,15 @@ return context.Base_edit(form_id=form_id, \n ...@@ -146,12 +156,15 @@ return context.Base_edit(form_id=form_id, \n
<string>editable_mode</string> <string>editable_mode</string>
<string>silent_mode</string> <string>silent_mode</string>
<string>field_prefix</string> <string>field_prefix</string>
<string>next_url_dict</string> <string>Products.DCWorkflow.DCWorkflow</string>
<string>ValidationFailed</string>
<string>_getattr_</string> <string>_getattr_</string>
<string>context</string> <string>context</string>
<string>request</string>
<string>next_url_dict</string>
<string>_getitem_</string> <string>_getitem_</string>
<string>successful_edit_redirect_url</string> <string>successful_edit_redirect_url</string>
<string>request</string> <string>message</string>
<string>result</string> <string>result</string>
</tuple> </tuple>
</value> </value>
......
...@@ -65,8 +65,15 @@ ...@@ -65,8 +65,15 @@
</item> </item>
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>document = context.portal_catalog.getResultValue(uid=new_request_number)\n <value> <string>if request_number is not None:\n
if document is not None:\n document = context.portal_catalog.getResultValue(uid=request_number)\n
if document is not None:\n
if document.getValidationState() == \'draft\':\n
return document.Base_redirect(form_id=\'view\')\n
return document.Base_redirect(form_id=\'PDFDocument_viewHistory\')\n
else:\n
document = context.portal_catalog.getResultValue(id=id)\n
if document is not None:\n
if document.getValidationState() == \'draft\':\n if document.getValidationState() == \'draft\':\n
return document.Base_redirect(form_id=\'view\')\n return document.Base_redirect(form_id=\'view\')\n
return document.Base_redirect(form_id=\'PDFDocument_viewHistory\')\n return document.Base_redirect(form_id=\'PDFDocument_viewHistory\')\n
...@@ -91,7 +98,7 @@ return context.Base_redirect(form_id=\'view\', keep_items = {\'portal_status_mes ...@@ -91,7 +98,7 @@ return context.Base_redirect(form_id=\'view\', keep_items = {\'portal_status_mes
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>new_request_number</string> </value> <value> <string>request_number=None, id=None, **kw</string> </value>
</item> </item>
<item> <item>
<key> <string>errors</string> </key> <key> <string>errors</string> </key>
...@@ -111,17 +118,19 @@ return context.Base_redirect(form_id=\'view\', keep_items = {\'portal_status_mes ...@@ -111,17 +118,19 @@ return context.Base_redirect(form_id=\'view\', keep_items = {\'portal_status_mes
<dictionary> <dictionary>
<item> <item>
<key> <string>co_argcount</string> </key> <key> <string>co_argcount</string> </key>
<value> <int>1</int> </value> <value> <int>2</int> </value>
</item> </item>
<item> <item>
<key> <string>co_varnames</string> </key> <key> <string>co_varnames</string> </key>
<value> <value>
<tuple> <tuple>
<string>new_request_number</string> <string>request_number</string>
<string>id</string>
<string>kw</string>
<string>None</string>
<string>_getattr_</string> <string>_getattr_</string>
<string>context</string> <string>context</string>
<string>document</string> <string>document</string>
<string>None</string>
<string>msg</string> <string>msg</string>
</tuple> </tuple>
</value> </value>
...@@ -134,7 +143,10 @@ return context.Base_redirect(form_id=\'view\', keep_items = {\'portal_status_mes ...@@ -134,7 +143,10 @@ return context.Base_redirect(form_id=\'view\', keep_items = {\'portal_status_mes
<item> <item>
<key> <string>func_defaults</string> </key> <key> <string>func_defaults</string> </key>
<value> <value>
<tuple>
<none/> <none/>
<none/>
</tuple>
</value> </value>
</item> </item>
<item> <item>
......
...@@ -85,15 +85,9 @@ ...@@ -85,15 +85,9 @@
<key> <string>hidden</string> </key> <key> <string>hidden</string> </key>
<value> <value>
<list> <list>
<string>new_request_group</string> <string>listboxPendingRequest_modification_date</string>
<string>new_request_portal_type</string> <string>my_documents</string>
<string>new_request_submit</string> <string>listboxMyDocuments_modification_date</string>
<string>track_request_user</string>
<string>track_request_login</string>
<string>track_request_submit</string>
<string>home_page</string>
<string>pending_requests</string>
<string>listbox_creation_date</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -123,8 +117,8 @@ ...@@ -123,8 +117,8 @@
<key> <string>widget_space</string> </key> <key> <string>widget_space</string> </key>
<value> <value>
<list> <list>
<string>listbox</string> <string>listboxPendingRequest</string>
<string>my_documents</string> <string>listboxMyDocuments</string>
</list> </list>
</value> </value>
</item> </item>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>listbox</string> </value> <value> <string>listboxMyDocuments</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -335,16 +335,12 @@ ...@@ -335,16 +335,12 @@
<value> <value>
<list> <list>
<tuple> <tuple>
<string>portal_type</string> <string>title</string>
<string>Type</string> <string>Title</string>
</tuple> </tuple>
<tuple> <tuple>
<string>getOwner</string> <string>modification_date</string>
<string>Actor</string> <string>Modification Date</string>
</tuple>
<tuple>
<string>creation_date</string>
<string>Creation Date</string>
</tuple> </tuple>
</list> </list>
</value> </value>
...@@ -355,7 +351,7 @@ ...@@ -355,7 +351,7 @@
</item> </item>
<item> <item>
<key> <string>css_class</string> </key> <key> <string>css_class</string> </key>
<value> <string>hidden_label</string> </value> <value> <string>hidden_label my_documents</string> </value>
</item> </item>
<item> <item>
<key> <string>default_params</string> </key> <key> <string>default_params</string> </key>
...@@ -386,8 +382,8 @@ ...@@ -386,8 +382,8 @@
<value> <value>
<list> <list>
<tuple> <tuple>
<string>creation_date</string> <string>modification_date</string>
<string>Creation Date</string> <string>Modification Date</string>
</tuple> </tuple>
</list> </list>
</value> </value>
...@@ -412,7 +408,7 @@ ...@@ -412,7 +408,7 @@
</item> </item>
<item> <item>
<key> <string>lines</string> </key> <key> <string>lines</string> </key>
<value> <int>20</int> </value> <value> <int>50</int> </value>
</item> </item>
<item> <item>
<key> <string>list_action</string> </key> <key> <string>list_action</string> </key>
...@@ -432,7 +428,7 @@ ...@@ -432,7 +428,7 @@
</item> </item>
<item> <item>
<key> <string>page_template</string> </key> <key> <string>page_template</string> </key>
<value> <string>DeclarationDeTVA_ListBox_asPendingRequests</string> </value> <value> <string>WebSite_ListBox_asMyDocuments</string> </value>
</item> </item>
<item> <item>
<key> <string>portal_types</string> </key> <key> <string>portal_types</string> </key>
...@@ -459,8 +455,8 @@ ...@@ -459,8 +455,8 @@
<value> <value>
<list> <list>
<tuple> <tuple>
<string>creation_date</string> <string>modification_date</string>
<string>Creation Date</string> <string>Modification Date</string>
</tuple> </tuple>
</list> </list>
</value> </value>
...@@ -471,18 +467,28 @@ ...@@ -471,18 +467,28 @@
</item> </item>
<item> <item>
<key> <string>selection_name</string> </key> <key> <string>selection_name</string> </key>
<value> <string>pending_requests_selection</string> </value> <value> <string>my_documents_selection</string> </value>
</item> </item>
<item> <item>
<key> <string>sort</string> </key> <key> <string>sort</string> </key>
<value> <value>
<list/> <list>
<tuple>
<string>modification_date</string>
<string>Modification Date</string>
</tuple>
</list>
</value> </value>
</item> </item>
<item> <item>
<key> <string>sort_columns</string> </key> <key> <string>sort_columns</string> </key>
<value> <value>
<list/> <list>
<tuple>
<string>modification_date</string>
<string>Modification Date</string>
</tuple>
</list>
</value> </value>
</item> </item>
<item> <item>
...@@ -497,7 +503,7 @@ ...@@ -497,7 +503,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Attachments</string> </value> <value> <string>My Documents</string> </value>
</item> </item>
<item> <item>
<key> <string>url_columns</string> </key> <key> <string>url_columns</string> </key>
...@@ -522,7 +528,7 @@ ...@@ -522,7 +528,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>python: len(context.DeclarationTVA_getAttachmentListFromReportSelection())</string> </value> <value> <string>not:here/portal_membership/isAnonymousUser</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
...@@ -538,7 +544,7 @@ ...@@ -538,7 +544,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>method_name</string> </key> <key> <string>method_name</string> </key>
<value> <string>contentValues</string> </value> <value> <string>MyDocuments_listMethod</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>listbox_creation_date</string> </value> <value> <string>listboxMyDocuments_modification_date</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -342,7 +342,7 @@ ...@@ -342,7 +342,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Creation Date</string> </value> <value> <string>Modification Date</string> </value>
</item> </item>
</dictionary> </dictionary>
</value> </value>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>listbox</string> </value> <value> <string>listboxPendingRequest</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -343,12 +343,8 @@ ...@@ -343,12 +343,8 @@
<string>State</string> <string>State</string>
</tuple> </tuple>
<tuple> <tuple>
<string>getOwner</string> <string>modification_date</string>
<string>Actor</string> <string>Modification Date</string>
</tuple>
<tuple>
<string>creation_date</string>
<string>Creation Date</string>
</tuple> </tuple>
</list> </list>
</value> </value>
...@@ -390,8 +386,8 @@ ...@@ -390,8 +386,8 @@
<value> <value>
<list> <list>
<tuple> <tuple>
<string>creation_date</string> <string>modification_date</string>
<string>Creation Date</string> <string>Modification Date</string>
</tuple> </tuple>
</list> </list>
</value> </value>
...@@ -463,8 +459,8 @@ ...@@ -463,8 +459,8 @@
<value> <value>
<list> <list>
<tuple> <tuple>
<string>creation_date</string> <string>modification_date</string>
<string>Creation Date</string> <string>Modification Date</string>
</tuple> </tuple>
</list> </list>
</value> </value>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>listbox_creation_date</string> </value> <value> <string>listboxPendingRequest_modification_date</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -342,7 +342,7 @@ ...@@ -342,7 +342,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Creation Date</string> </value> <value> <string>Modificaiton Date</string> </value>
</item> </item>
</dictionary> </dictionary>
</value> </value>
......
<?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>new_request_submit</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>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>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>hiddenLabel</string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value> <string>Submit</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>name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>New Request</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
<?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>track_request_submit</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>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>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>hiddenLabel</string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value> <string>Submit</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>name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Track Request</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="ERP5Form" module="Products.ERP5Form.Form"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_objects</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>action</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>encoding</string> </key>
<value> <string>UTF-8</string> </value>
</item>
<item>
<key> <string>enctype</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>group_list</string> </key>
<value>
<list>
<string>left column transparent (Logo)</string>
<string>left column (Navigation)</string>
<string>left column (Contents)</string>
<string>left column (Search)</string>
<string>left column (Debug)</string>
<string>right column (Demo)</string>
<string>right column (Toolbox)</string>
<string>footer</string>
<string>hidden</string>
</list>
</value>
</item>
<item>
<key> <string>groups</string> </key>
<value>
<dictionary>
<item>
<key> <string>footer</string> </key>
<value>
<list>
<string>form_submission_wizard</string>
</list>
</value>
</item>
<item>
<key> <string>hidden</string> </key>
<value>
<list>
<string>admin_toolbox</string>
<string>website_logo</string>
<string>language_selector</string>
<string>breadcrumb</string>
<string>subsection_list</string>
<string>section_content_list</string>
<string>your_search_text</string>
<string>search_action</string>
<string>applicable_layout</string>
<string>about_box</string>
</list>
</value>
</item>
<item>
<key> <string>left column (Contents)</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>left column (Debug)</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>left column (Navigation)</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>left column (Search)</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>left column transparent (Logo)</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>right column (Demo)</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>right column (Toolbox)</string> </key>
<value>
<list/>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>copy_of_erp5_egov_form_layout</string> </value>
</item>
<item>
<key> <string>method</string> </key>
<value> <string>POST</string> </value>
</item>
<item>
<key> <string>name</string> </key>
<value> <string>erp5_egov_form_layout</string> </value>
</item>
<item>
<key> <string>pt</string> </key>
<value> <string>template_erp5_egov</string> </value>
</item>
<item>
<key> <string>row_length</string> </key>
<value> <int>6</int> </value>
</item>
<item>
<key> <string>stored_encoding</string> </key>
<value> <string>UTF-8</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Form Layout</string> </value>
</item>
<item>
<key> <string>unicode_mode</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>update_action</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
...@@ -129,6 +129,7 @@ p {\n ...@@ -129,6 +129,7 @@ p {\n
------------------------------------------------------------------ */\n ------------------------------------------------------------------ */\n
\n \n
span.draft {color: #be854d}\n span.draft {color: #be854d}\n
span.submitted {color: #be854d}\n
span.published,\n span.published,\n
span.validated {color: #078307}\n span.validated {color: #078307}\n
span.invalidated {color: #ab0303}\n span.invalidated {color: #ab0303}\n
......
...@@ -96,7 +96,7 @@ ul.tabbernav\n ...@@ -96,7 +96,7 @@ ul.tabbernav\n
margin:0;\n margin:0;\n
padding: 3px 0;\n padding: 3px 0;\n
border-bottom: 1px solid #aaa;\n border-bottom: 1px solid #aaa;\n
font: bold 12px Verdana, sans-serif;\n font: bold 1.2em Verdana, sans-serif;\n
}\n }\n
\n \n
ul.tabbernav li\n ul.tabbernav li\n
...@@ -116,7 +116,7 @@ ul.tabbernav li a\n ...@@ -116,7 +116,7 @@ ul.tabbernav li a\n
text-decoration: none;\n text-decoration: none;\n
}\n }\n
\n \n
ul.tabbernav li a:link { color: #000; }\n ul.tabbernav li a:link { color: #333333; }\n
ul.tabbernav li a:visited { color: #667; }\n ul.tabbernav li a:visited { color: #667; }\n
\n \n
ul.tabbernav li a:hover\n ul.tabbernav li a:hover\n
......
...@@ -309,7 +309,12 @@ form#main_form div#wrapper_header fieldset.widget .onright a{\n ...@@ -309,7 +309,12 @@ form#main_form div#wrapper_header fieldset.widget .onright a{\n
}\n }\n
\n \n
.archived_state{\n .archived_state{\n
color: #black; \n color: black; \n
}\n
\n
.cancelled_state,\n
.deleted_state{\n
color: red;\n
}\n }\n
\n \n
/* Special layout for search widget */\n /* Special layout for search widget */\n
...@@ -554,8 +559,8 @@ div.inline_label label{\n ...@@ -554,8 +559,8 @@ div.inline_label label{\n
float:none !important;\n float:none !important;\n
}\n }\n
\n \n
.adminSection,\n .document .actions,\n
.document .actions{\n .adminSection{\n
margin-left: auto;\n margin-left: auto;\n
margin-right: auto;\n margin-right: auto;\n
width: 802px !important;\n width: 802px !important;\n
...@@ -573,11 +578,15 @@ fieldset.white_background{\n ...@@ -573,11 +578,15 @@ fieldset.white_background{\n
background: white !important;\n background: white !important;\n
margin-right: auto !important;\n margin-right: auto !important;\n
margin-left: auto !important;\n margin-left: auto !important;\n
padding: 2em !important;\n padding: 2em 0 2em 0 !important;\n
border: 1px solid #999 !important;\n border: 1px solid #999 !important;\n
width:800px !important;\n width:800px !important;\n
}\n }\n
\n \n
fieldset.white_background .input{\n
padding: 0 2em 0 2em;\n
}\n
\n
.field .input .title{\n .field .input .title{\n
margin-top: 1em;\n margin-top: 1em;\n
margin-bottom:0.5em;\n margin-bottom:0.5em;\n
...@@ -613,6 +622,7 @@ fieldset.white_background{\n ...@@ -613,6 +622,7 @@ fieldset.white_background{\n
\n \n
.white_background .big_button .input{\n .white_background .big_button .input{\n
margin:0 !important;\n margin:0 !important;\n
padding: 0 !important;\n
}\n }\n
......
...@@ -91,7 +91,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n ...@@ -91,7 +91,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
\'%s/WebSite_viewSubmissionWizardRenderer.css\' % portal_path,\n \'%s/WebSite_viewSubmissionWizardRenderer.css\' % portal_path,\n
\'%s/WebSite_viewToolsRenderer.css\' % portal_path,\n \'%s/WebSite_viewToolsRenderer.css\' % portal_path,\n
\'%s/WebSite_viewWorkspaceWidgets.css\' % portal_path,\n \'%s/WebSite_viewWorkspaceWidgets.css\' % portal_path,\n
\'%s/DeclarationDeTVA_ListBox_asPendingRequests.css\' % portal_path,\n \'%s/WebSite_ListBox_asWorkspaceWidgets.css\' % portal_path,\n
\'%s/DeclarationDeTVA_ListBox_asAttachedFile.css\' % portal_path];\n \'%s/DeclarationDeTVA_ListBox_asAttachedFile.css\' % portal_path];\n
global js_list python:[\'%s/tabber.js\' % portal_path,]">\n global js_list python:[\'%s/tabber.js\' % portal_path,]">\n
<!-- \'%s/tabber-cookie.js\' % portal_path, must be added to js_list to use cookies to rembeber las tab used-->\n <!-- \'%s/tabber-cookie.js\' % portal_path, must be added to js_list to use cookies to rembeber las tab used-->\n
...@@ -99,7 +99,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n ...@@ -99,7 +99,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
<tal:block metal:use-macro="here/template_erp5_xhtml_style/macros/master">\n <tal:block metal:use-macro="here/template_erp5_xhtml_style/macros/master">\n
<tal:block metal:fill-slot="layout"\n <tal:block metal:fill-slot="layout"\n
tal:define="dummy python: request.set(\'editable_mode\', True)">\n tal:define="dummy python: request.set(\'editable_mode\', True)">\n
<div id="main_content">\n <div id="main_content" tal:attributes="class python:editable_mode and\n
\'editable_mode\' or \'not_editable_mode\'">\n
\n \n
<tal:block tal:condition="here/REQUEST/portal_status_message | nothing">\n <tal:block tal:condition="here/REQUEST/portal_status_message | nothing">\n
<!-- XXX Why no portal message displayed there ?\n <!-- XXX Why no portal message displayed there ?\n
......
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Python_magic</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_body</string> </key>
<value> <string>document_module = context.portal_url.getPortalObject().getDefaultModule(\'document_module\')\n
\n
# get user name\n
user_name = context.portal_membership.getAuthenticatedMember().getUserName()\n
\n
return context.portal_catalog(portal_type=context.getPortalDocumentTypeList(), \n
sort_on=\'creation_date\', \n
sort_order=\'reverse\',\n
owner=user_name);\n
\n
#document_module.searchFolder(portal_type=context.getPortalDocumentTypeList(), \n
# owner=user_name)\n
</string> </value>
</item>
<item>
<key> <string>_code</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_filepath</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>*args, **kw</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>func_code</string> </key>
<value>
<object>
<klass>
<global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
<value>
<tuple>
<string>args</string>
<string>kw</string>
<string>_getattr_</string>
<string>context</string>
<string>document_module</string>
<string>user_name</string>
</tuple>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>func_defaults</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>MyDocuments_listMethod</string> </value>
</item>
<item>
<key> <string>warnings</string> </key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
...@@ -67,10 +67,14 @@ ...@@ -67,10 +67,14 @@
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>declaration_module = context.portal_url.getPortalObject().getDefaultModule(\'declaration_tva_module\')\n <value> <string>declaration_module = context.portal_url.getPortalObject().getDefaultModule(\'declaration_tva_module\')\n
\n \n
validation_state_list=[\'draft\',\'submitted\', \'open\', \'paid\']\n
\n
# get user name\n # get user name\n
user_name = context.portal_membership.getAuthenticatedMember().getUserName()\n user_name = context.portal_membership.getAuthenticatedMember().getUserName()\n
\n \n
return declaration_module.searchFolder(portal_type=\'Declaration De TVA\', owner=user_name)\n return declaration_module.searchFolder(portal_type=\'Declaration De TVA\', \n
owner=user_name, \n
validation_state=validation_state_list)\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
...@@ -118,6 +122,7 @@ return declaration_module.searchFolder(portal_type=\'Declaration De TVA\', owner ...@@ -118,6 +122,7 @@ return declaration_module.searchFolder(portal_type=\'Declaration De TVA\', owner
<string>_getattr_</string> <string>_getattr_</string>
<string>context</string> <string>context</string>
<string>declaration_module</string> <string>declaration_module</string>
<string>validation_state_list</string>
<string>user_name</string> <string>user_name</string>
</tuple> </tuple>
</value> </value>
......
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_text</string> </key>
<value> <string encoding="cdata"><![CDATA[
<tal:block\n
xmlns:tal="http://xml.zope.org/namespaces/tal"\n
xmlns:metal="http://xml.zope.org/namespaces/metal"\n
xmlns:i18n="http://xml.zope.org/namespaces/i18n"\n
tal:define="field_id here/getId;\n
form_id python: here.getForm().id;\n
selection_name here/getSelectionName;\n
requested_selection_name here/getRequestedSelectionName;\n
selection_index here/getSelectionIndex;\n
selection here/getSelection;\n
portal_url_string here/getPortalUrlString;\n
real_context here/getContext;\n
context_url real_context/absolute_url;\n
md5_string here/getMD5Checksum;\n
line_list here/query;\n
is_domain_tree_mode here/isDomainTreeMode;\n
is_report_tree_mode here/isReportTreeMode;\n
is_domain_tree_supported here/isDomainTreeSupported;\n
is_report_tree_supported here/isReportTreeSupported;\n
show_select_column here/showSelectColumn;\n
show_search_line here/showSearchLine;\n
">\n
<!-- ListBox starts here. -->\n
<div class = "workspace_widget_listbox_title" tal:content="python:context.field.get_value(\'title\')" i18n:translate="" i18n:domain="ui">\n
listbox title\n
</div>\n
<tal:block tal:condition="python:len(line_list)">\n
<input type="hidden" name="list_selection_name" value="default" tal:attributes="value selection_name" />\n
<input type="hidden" name="list_selection_name" value="default"\n
tal:attributes="value selection_name;\n
name string:${field_id}_list_selection_name" />\n
<input tal:condition="md5_string" type="hidden" name="md5_object_uid_list" value="checksum" tal:attributes="value md5_string" />\n
\n
<tal:replace tal:content="nothing">\n
Because TAL cannot accept unbalanced tags, the support for a domain tree is realized by a macro.\n
The macro ListBoxContainer is a no-op, if not in domain tree mode. Otherwise, the macro constructs\n
a domain tree and extracts the body in an extra table.\n
</tal:replace>\n
\n
<tal:block tal:define="expand python: 0">\n
<tal:block metal:define-macro="ListBoxContainer">\n
<tal:block tal:condition="expand">\n
<tal:block tal:condition="not: is_domain_tree_mode">\n
<tal:block metal:define-slot="ListBoxBody" />\n
</tal:block>\n
</tal:block>\n
</tal:block>\n
</tal:block>\n
\n
<tal:block tal:define="expand python: 1">\n
<tal:block metal:use-macro="template/macros/ListBoxContainer">\n
<tal:block metal:fill-slot="ListBoxBody" tal:define="line_list python:line_list[:here.field.get_value(\'lines\')]">\n
<div class="workspace_widget_ListContent">\n
<ul>\n
<tal:block tal:repeat="line line_list"\n
tal:define="checked_uid_set here/getCheckedUidSet">\n
<tal:block tal:define="object python: line.getObject()">\n
<li>\n
<tal:block tal:repeat="value line/render">\n
<tal:block tal:condition="python:line.renderer.getSelectedColumnList()[repeat[\'value\'].index][0] == \'modification_date\'">\n
<br/>\n
<div class="clear">\n
</div>\n
<span class="modification_date" i18n:translate="" i18n:domain="ui">\n
last modification :\n
</span>\n
</tal:block>\n
<span tal:define="html python: value[0];\n
original_value python: value[1];\n
error python: value[2];\n
editable_field python: value[3];"\n
tal:attributes="class python: \'workspace_widget_%s\' % (line.renderer.getSelectedColumnList()[repeat[\'value\'].index][0])">\n
<tal:block tal:condition="python:line.renderer.getSelectedColumnList()[repeat[\'value\'].index][0] == \'title\'">\n
<tal:block tal:content="structure python:value[0]" />\n
</tal:block>\n
<tal:block tal:condition="python:line.renderer.getSelectedColumnList()[repeat[\'value\'].index][0] != \'title\'">\n
<input tal:condition="not: repeat/value/index"\n
type="hidden" value="1" name="listbox_uid:list"\n
tal:attributes="value python: line.getUid() or \'\';\n
name string:${field_id}_uid:list" />\n
<tal:block tal:condition="not: editable_field" tal:content="original_value" />\n
<tal:block tal:condition="editable_field" tal:content="structure python: editable_field.render(original_value)" />\n
</tal:block>\n
</span>\n
</tal:block>\n
</li>\n
</tal:block>\n
</tal:block>\n
</ul>\n
</div>\n
</tal:block>\n
</tal:block>\n
</tal:block>\n
<!-- ListBox ends here. -->\n
</tal:block>\n
<tal:block tal:condition="python:not len(line_list)">\n
<div class="no_prending_request_explanation" i18n:translate="" i18n:domain="ui">\n
You have no documents.\n
</div>\n
</tal:block>\n
</tal:block>\n
\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_ListBox_asMyDocuments</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
...@@ -68,6 +68,9 @@ ...@@ -68,6 +68,9 @@
show_search_line here/showSearchLine;\n show_search_line here/showSearchLine;\n
">\n ">\n
<!-- ListBox starts here. -->\n <!-- ListBox starts here. -->\n
<div class = "workspace_widget_listbox_title" tal:content="python:context.field.get_value(\'title\')" i18n:translate="" i18n:domain="ui">\n
listbox title\n
</div>\n
<tal:block tal:condition="python:len(line_list)">\n <tal:block tal:condition="python:len(line_list)">\n
<input type="hidden" name="list_selection_name" value="default" tal:attributes="value selection_name" />\n <input type="hidden" name="list_selection_name" value="default" tal:attributes="value selection_name" />\n
<input type="hidden" name="list_selection_name" value="default"\n <input type="hidden" name="list_selection_name" value="default"\n
...@@ -94,35 +97,43 @@ ...@@ -94,35 +97,43 @@
<tal:block tal:define="expand python: 1">\n <tal:block tal:define="expand python: 1">\n
<tal:block metal:use-macro="template/macros/ListBoxContainer">\n <tal:block metal:use-macro="template/macros/ListBoxContainer">\n
<tal:block metal:fill-slot="ListBoxBody" tal:define="line_list python:line_list[:here.field.get_value(\'lines\')]">\n <tal:block metal:fill-slot="ListBoxBody" tal:define="line_list python:line_list[:here.field.get_value(\'lines\')]">\n
<tal:block tal:content="python:here.field.get_value(\'lines\')" />\n <div class="workspace_widget_ListContent">\n
<div class="attachment_list_ListContent">\n
<ul>\n <ul>\n
<tal:block tal:repeat="line line_list"\n <tal:block tal:repeat="line line_list"\n
tal:define="checked_uid_set here/getCheckedUidSet">\n tal:define="checked_uid_set here/getCheckedUidSet">\n
<tal:block tal:define="object python: line.getObject()">\n <tal:block tal:define="object python: line.getObject()">\n
<li>\n <li>\n
<tal:block tal:define="value_list line/render">\n
<tal:block tal:repeat="value line/render">\n <tal:block tal:repeat="value line/render">\n
<tal:block tal:condition="python:line.renderer.getSelectedColumnList()[repeat[\'value\'].index][0] == \'getOwner\'">\n <tal:block tal:condition="python:line.renderer.getSelectedColumnList()[repeat[\'value\'].index][0] == \'modification_date\'">\n
<a href="lien" tal:attributes="href python: value_list[0][4]" i18n:translate="" i18n:domain="ui">View</a>\n
<a href="lien" tal:attributes="href python:\'DeclarationDeTVA_deleteAttachment?id_list=%s&form_id=DeclarationTVA_viewAttachmentList&file_name=%s\' % (object.getId(), object.getSourceReference())" i18n:translate="" i18n:domain="ui">Delete</a>\n
<br/>\n <br/>\n
<span class="added_by" i18n:translate="" i18n:domain="ui">added by</span>\n <div class="clear">\n
</tal:block>\n </div>\n
<tal:block tal:condition="python:line.renderer.getSelectedColumnList()[repeat[\'value\'].index][0] == \'creation_date\'">\n <span class="modification_date" i18n:translate="" i18n:domain="ui">\n
<span class="at" i18n:translate="" i18n:domain="ui">at</span>\n last modification :\n
</span>\n
</tal:block>\n </tal:block>\n
<span tal:define="html python: value[0];\n <span tal:define="html python: value[0];\n
original_value python: value[1];\n original_value python: value[1];\n
error python: value[2]"\n error python: value[2];\n
tal:attributes="class python: \'attachment_list_%s\' % line.renderer.getSelectedColumnList()[repeat[\'value\'].index][0]">\n editable_field python: value[3];"\n
tal:attributes="class python: \'workspace_widget_%s %s_state\' % (line.renderer.getSelectedColumnList()[repeat[\'value\'].index][0], line.renderer.getSelectedColumnList()[repeat[\'value\'].index][0] == \'translated_validation_state_title\' and object.getValidationState() or \'no\')">\n
<tal:block tal:condition="python:line.renderer.getSelectedColumnList()[repeat[\'value\'].index][0] == \'portal_type\'">\n
<tal:block tal:condition="python: object.getValidationState() == \'draft\'">\n
<a href="lien" tal:attributes="href python:\'declaration_tva_module/%s/view\' % object.getId()" i18n:translate="" i18n:domain="ui" tal:content="python:value[1]">value</a>\n
</tal:block>\n
<tal:block tal:condition="python: object.getValidationState() != \'draft\'">\n
<a href="lien" tal:attributes="href python:\'declaration_tva_module/%s/PDFDocument_viewHistory\' % object.getId()" i18n:translate="" i18n:domain="ui" tal:content="python:value[1]">value</a>\n
</tal:block>\n
</tal:block>\n
<tal:block tal:condition="python:line.renderer.getSelectedColumnList()[repeat[\'value\'].index][0] != \'portal_type\'">\n
<input tal:condition="not: repeat/value/index"\n <input tal:condition="not: repeat/value/index"\n
type="hidden" value="1" name="listbox_uid:list"\n type="hidden" value="1" name="listbox_uid:list"\n
tal:attributes="value python: line.getUid() or \'\';\n tal:attributes="value python: line.getUid() or \'\';\n
name string:${field_id}_uid:list" />\n name string:${field_id}_uid:list" />\n
<tal:block tal:content="original_value" />\n <tal:block tal:condition="not: editable_field" tal:content="original_value" />\n
</span>\n <tal:block tal:condition="editable_field" tal:content="structure python: editable_field.render(original_value)" />\n
</tal:block>\n </tal:block>\n
</span>\n
</tal:block>\n </tal:block>\n
</li>\n </li>\n
</tal:block>\n </tal:block>\n
...@@ -134,6 +145,11 @@ ...@@ -134,6 +145,11 @@
</tal:block>\n </tal:block>\n
<!-- ListBox ends here. -->\n <!-- ListBox ends here. -->\n
</tal:block>\n </tal:block>\n
<tal:block tal:condition="python:not len(line_list)">\n
<div class="no_prending_request_explanation" i18n:translate="" i18n:domain="ui">\n
No pending request.\n
</div>\n
</tal:block>\n
</tal:block>\n </tal:block>\n
\n \n
......
...@@ -57,54 +57,66 @@ ...@@ -57,54 +57,66 @@
\n \n
========================================================================================*/\n ========================================================================================*/\n
\n \n
\n .workspace_widget_ListContent,\n
.attachment_list_ListContent li a,\n .no_prending_request_explanation{\n
.attachment_list_ListContent li .attachment_list_getSourceReference,\n margin-top:1.7em;\n
.attachment_list_ListContent li .attachment_list_content_type,\n
.attachment_list_ListContent li .attachment_list_getOwner,\n
.attachment_list_ListContent li .attachment_list_creation_date{\n
padding:2px;\n
}\n }\n
\n \n
.attachment_list_ListContent li a{\n .workspace_widget_ListContent li a{\n
text-decoration:underline;\n text-decoration:underline;\n
}\n }\n
\n \n
.attachment_list_ListContent li .attachment_list_content_type{\n .workspace_widget_ListContent li{\n
display:none;\n line-height: 1em;\n
float:left;\n
}\n }\n
\n \n
.attachment_list_ListContent li .attachment_list_getSourceReference{\n .workspace_widget_ListContent li .workspace_widget_portal_type{\n
color:#0B850B;\n float: left;\n
}\n }\n
\n \n
/*.attachment_list_ListContent li .attachment_list_getOwner,\n .workspace_widget_ListContent li .workspace_widget_translated_validation_state_title{\n
.attachment_list_ListContent li .attachment_list_creation_date{\n float: right;\n
position:absolute;\n }\n
margin-top:1.2em;\n
}*/\n
\n \n
.attachment_list_ListContent li .attachment_list_creation_date{\n .workspace_widget_ListContent li .modification_date{\n
left:80px;\n float: left;\n
}\n }\n
\n \n
.attachment_list_ListContent li .attachment_list_getOwner{\n .workspace_widget_ListContent .workspace_widget_modification_date{\n
left:30px;\n float: right;\n
}\n }\n
\n \n
.attachment_list_ListContent li{\n .workspace_widget_ListContent li{\n
margin-bottom: 1em;\n margin-bottom: 1em;\n
width:90%;\n
}\n }\n
\n \n
.attachment_list_ListContent .attachment_list_getOwner{\n .workspace_widget_ListContent ul{\n
font-weight:bold;\n list-style-type:disk;\n
list-style-position:outside;\n
}\n }\n
\n \n
.attachment_list_ListContent .added_by,\n .workspace_widget_ListContent .modification_date,\n
.attachment_list_ListContent .attachment_list_getOwner,\n .workspace_widget_ListContent .workspace_widget_modification_date{\n
.attachment_list_ListContent .at,\n
.attachment_list_ListContent .attachment_list_creation_date{\n
font-style: italic;\n font-style: italic;\n
font-size:0.8em;\n
}\n
\n
.workspace_widget_listbox_title{\n
background:#DDDDEE;\n
border-bottom:1px solid #AAAAAA;\n
position:absolute;\n
top:0;\n
left:0;\n
width:100%;\n
text-align:center;\n
font-weight:bold;\n
font-size:1.2em;\n
height:1em;\n
padding-top:0.2em;\n
padding-bottom:0.4em;\n
margin-bottom:20px;\n
}\n }\n
...@@ -120,7 +132,7 @@ ...@@ -120,7 +132,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>WebSite_ListBox_asPendingRequests.css</string> </value> <value> <string>WebSite_ListBox_asWorkspaceWidgets.css</string> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
......
...@@ -64,8 +64,18 @@ ...@@ -64,8 +64,18 @@
========================================================================================*/\n ========================================================================================*/\n
.header .widget .adminSection select{\n .header .widget .adminSection select{\n
width: 122px;\n width: 122px;\n
margin-left:680px;\n /* margin-left:680px;\n
margin-top: 10px;\n margin-top: 10px;*/\n
margin-top: -10px;\n
float: right;\n
}\n
\n
.header .widget .adminSection{\n
}\n
\n
.document .actions {\n
overflow:visible;\n
\n
}\n }\n
\n \n
.header .widget .adminSection button{\n .header .widget .adminSection button{\n
......
...@@ -47,7 +47,10 @@ ...@@ -47,7 +47,10 @@
<div class="adminSection" tal:define="actions request/actions">\n <div class="adminSection" tal:define="actions request/actions">\n
<tal:block metal:use-macro="here/context_box_render/macros/action"/>\n <tal:block metal:use-macro="here/context_box_render/macros/action"/>\n
</div> <div class="clear">\n
</div>\n
</div>\n
]]></string> </value> ]]></string> </value>
</item> </item>
......
...@@ -62,7 +62,6 @@ Description:\n ...@@ -62,7 +62,6 @@ Description:\n
<div class="tabbertab">\n <div class="tabbertab">\n
<h2 i18n:translate="" i18n:domain="ui">Track Request</h2>\n <h2 i18n:translate="" i18n:domain="ui">Track Request</h2>\n
<div tal:condition="here/portal_membership/isAnonymousUser">\n <div tal:condition="here/portal_membership/isAnonymousUser">\n
<div id="track_header">\n
<div id="logo_track_request">\n <div id="logo_track_request">\n
<img alt="Track Request Logo" src="img/track_request.png"/>\n <img alt="Track Request Logo" src="img/track_request.png"/>\n
</div>\n </div>\n
...@@ -81,7 +80,6 @@ Description:\n ...@@ -81,7 +80,6 @@ Description:\n
class="autofocus"/></p>\n class="autofocus"/></p>\n
</div>\n </div>\n
</div>\n </div>\n
</div>\n
<div class="clear"></div>\n <div class="clear"></div>\n
<div id="track_button">\n <div id="track_button">\n
<input i18n:domain="ui" i18n:attributes="value" type="submit"\n <input i18n:domain="ui" i18n:attributes="value" type="submit"\n
...@@ -90,7 +88,19 @@ Description:\n ...@@ -90,7 +88,19 @@ Description:\n
</div>\n </div>\n
</div>\n </div>\n
<div class="fields" tal:condition="not:here/portal_membership/isAnonymousUser">\n <div class="fields" tal:condition="not:here/portal_membership/isAnonymousUser">\n
Here will be tracking form, work in progress...\n <div>\n
<p><tal:block i18n:translate="" i18n:domain="ui">Request Number</tal:block></p>\n
<p><tal:block i18n:translate="" i18n:domain="ui">PIN</tal:block></p>\n
</div>\n
<div>\n
<p><input type="text" size="20" name="request_number" class="autofocus"/></p>\n
<p><input type="password" size="20" id="pin" name="password" class="autofocus"/></p>\n
</div>\n
<div class="clear"></div>\n
<div id="track_button">\n
<input i18n:domain="ui" i18n:attributes="value" type="submit"\n
value="Track" name="EGov_goToDocument:method"/>\n
</div>\n
</div>\n </div>\n
<div class="clear"></div>\n <div class="clear"></div>\n
</div>\n </div>\n
......
...@@ -65,7 +65,34 @@ ...@@ -65,7 +65,34 @@
</item> </item>
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string></string> </value> <value> <string>\'\'\'This script check that all required files have been uploaded\'\'\'\n
from Products.DCWorkflow.DCWorkflow import ValidationFailed\n
portal = context.getPortalObject()\n
N_ = portal.Base_translateString\n
\n
document = state_change[\'object\']\n
\n
# dict of required documents\n
attachement_type_dict = {\'Carte ID\':\'Required\',\n
\'Tableau des d\xc3\xa9penses\':\'Optional\',\n
\'D\xc3\xa9tail des \xc3\xa9xon\xc3\xa9ratations\':\'Required\',\n
\'Application Certificate\':\'Optional\',\n
}\n
\n
document_title_list = [x.getTitle() for x in document.contentValues(portal_type=\'File\')]\n
\n
required_title_list = [x for x,y in attachement_type_dict.items() if y == \'Required\']\n
\n
message = \'The following documents are missing to submit the request :\'\n
missing_document_list = []\n
for required_title in required_title_list:\n
if required_title not in document_title_list:\n
missing_document_list.append(\'%s\' % required_title)\n
\n
if len(missing_document_list):\n
message = N_(message)\n
raise ValidationFailed, "%s %s" % (message, \', \'.join(missing_document_list))\n
</string> </value>
</item> </item>
<item> <item>
<key> <string>_code</string> </key> <key> <string>_code</string> </key>
...@@ -81,7 +108,7 @@ ...@@ -81,7 +108,7 @@
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>*args, **kw</string> </value> <value> <string>state_change</string> </value>
</item> </item>
<item> <item>
<key> <string>errors</string> </key> <key> <string>errors</string> </key>
...@@ -101,14 +128,33 @@ ...@@ -101,14 +128,33 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>co_argcount</string> </key> <key> <string>co_argcount</string> </key>
<value> <int>0</int> </value> <value> <int>1</int> </value>
</item> </item>
<item> <item>
<key> <string>co_varnames</string> </key> <key> <string>co_varnames</string> </key>
<value> <value>
<tuple> <tuple>
<string>args</string> <string>state_change</string>
<string>kw</string> <string>Products.DCWorkflow.DCWorkflow</string>
<string>ValidationFailed</string>
<string>_getattr_</string>
<string>context</string>
<string>portal</string>
<string>N_</string>
<string>_getitem_</string>
<string>document</string>
<string>attachement_type_dict</string>
<string>append</string>
<string>$append0</string>
<string>_getiter_</string>
<string>x</string>
<string>document_title_list</string>
<string>y</string>
<string>required_title_list</string>
<string>message</string>
<string>missing_document_list</string>
<string>required_title</string>
<string>len</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string></string> </value> <value> <string>Archive Request</string> </value>
</item> </item>
<item> <item>
<key> <string>trigger_type</string> </key> <key> <string>trigger_type</string> </key>
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
</item> </item>
<item> <item>
<key> <string>actbox_name</string> </key> <key> <string>actbox_name</string> </key>
<value> <string>Archive</string> </value> <value> <string>Archive Request</string> </value>
</item> </item>
<item> <item>
<key> <string>actbox_url</string> </key> <key> <string>actbox_url</string> </key>
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string></string> </value> <value> <string>Cancel Request</string> </value>
</item> </item>
<item> <item>
<key> <string>trigger_type</string> </key> <key> <string>trigger_type</string> </key>
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
</item> </item>
<item> <item>
<key> <string>actbox_name</string> </key> <key> <string>actbox_name</string> </key>
<value> <string>Cancel</string> </value> <value> <string>Cancel Request</string> </value>
</item> </item>
<item> <item>
<key> <string>actbox_url</string> </key> <key> <string>actbox_url</string> </key>
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string></string> </value> <value> <string>Delete Request</string> </value>
</item> </item>
<item> <item>
<key> <string>trigger_type</string> </key> <key> <string>trigger_type</string> </key>
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string></string> </value> <value> <string>Start Processing</string> </value>
</item> </item>
<item> <item>
<key> <string>trigger_type</string> </key> <key> <string>trigger_type</string> </key>
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
</item> </item>
<item> <item>
<key> <string>actbox_name</string> </key> <key> <string>actbox_name</string> </key>
<value> <string>Open</string> </value> <value> <string>Start Processing</string> </value>
</item> </item>
<item> <item>
<key> <string>actbox_url</string> </key> <key> <string>actbox_url</string> </key>
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string></string> </value> <value> <string>Pay Service</string> </value>
</item> </item>
<item> <item>
<key> <string>trigger_type</string> </key> <key> <string>trigger_type</string> </key>
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
</item> </item>
<item> <item>
<key> <string>actbox_name</string> </key> <key> <string>actbox_name</string> </key>
<value> <string>Pay</string> </value> <value> <string>Pay Service</string> </value>
</item> </item>
<item> <item>
<key> <string>actbox_url</string> </key> <key> <string>actbox_url</string> </key>
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string></string> </value> <value> <string>Submit Request</string> </value>
</item> </item>
<item> <item>
<key> <string>trigger_type</string> </key> <key> <string>trigger_type</string> </key>
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
</item> </item>
<item> <item>
<key> <string>actbox_name</string> </key> <key> <string>actbox_name</string> </key>
<value> <string>Submit</string> </value> <value> <string>Submit Request</string> </value>
</item> </item>
<item> <item>
<key> <string>actbox_url</string> </key> <key> <string>actbox_url</string> </key>
......
2008-03-10 fabien
* add some controls on validation state, add two widgets to see pending requests and users documents, align the form on the right, but all other pages are centered, enhance listbox page template to handle custom listbox fields.
2008-03-07 fabien 2008-03-07 fabien
* set up security and bring lot of change on all the bt * set up security and bring lot of change on all the bt
......
22 25
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment