Commit 13bef144 authored by Mayoro Diagne's avatar Mayoro Diagne

2010-07-08 mayoro

* add tabber-cookie.js
* order action buttons on header workspaces
* Allow change password in citizen's home page
* give proxy role manager to allow accessing  owner_info

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@36993 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent d4f0a6ba
...@@ -83,7 +83,9 @@ return owner_name\n ...@@ -83,7 +83,9 @@ return owner_name\n
<item> <item>
<key> <string>_proxy_roles</string> </key> <key> <string>_proxy_roles</string> </key>
<value> <value>
<tuple/> <tuple>
<string>Manager</string>
</tuple>
</value> </value>
</item> </item>
<item> <item>
......
...@@ -84,6 +84,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n ...@@ -84,6 +84,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
\'%s/WebSite_viewAgentWorklistRenderer.css\' % portal_path,\n \'%s/WebSite_viewAgentWorklistRenderer.css\' % portal_path,\n
\'%s/PDFDocumentListBox_asAttachedFile.css\' % portal_path];\n \'%s/PDFDocumentListBox_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,\n
\'%s/erp5_xhtml_appearance.js\' % portal_path,]">\n \'%s/erp5_xhtml_appearance.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
\n \n
...@@ -140,7 +141,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n ...@@ -140,7 +141,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
request.get(\'current_web_section\', here.getWebSectionValue()));\n request.get(\'current_web_section\', here.getWebSectionValue()));\n
dummy python: request.set(\'current_web_document\',\n dummy python: request.set(\'current_web_document\',\n
request.get(\'current_web_document\', here));\n request.get(\'current_web_document\', here));\n
\n
dummy python: request.set(\'is_web_section_default_document\',\n dummy python: request.set(\'is_web_section_default_document\',\n
request.get(\'is_web_section_default_document\', 0));">\n request.get(\'is_web_section_default_document\', 0));">\n
<tal:block metal:use-macro="here/aggregate_render/macros/aggregate_render"/>\n <tal:block metal:use-macro="here/aggregate_render/macros/aggregate_render"/>\n
......
...@@ -84,6 +84,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n ...@@ -84,6 +84,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
\'%s/WebSite_viewAgentWorklistRenderer.css\' % portal_path,\n \'%s/WebSite_viewAgentWorklistRenderer.css\' % portal_path,\n
\'%s/PDFDocumentListBox_asAttachedFile.css\' % portal_path];\n \'%s/PDFDocumentListBox_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,\n
\'%s/erp5_xhtml_appearance.js\' % portal_path,]">\n \'%s/erp5_xhtml_appearance.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
\n \n
......
...@@ -71,6 +71,12 @@ return current_action\n ...@@ -71,6 +71,12 @@ return current_action\n
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>actions = [], current_action = None</string> </value> <value> <string>actions = [], current_action = None</string> </value>
</item> </item>
<item>
<key> <string>_proxy_roles</string> </key>
<value>
<tuple/>
</value>
</item>
<item> <item>
<key> <string>errors</string> </key> <key> <string>errors</string> </key>
<value> <value>
......
...@@ -50,13 +50,16 @@ ...@@ -50,13 +50,16 @@
<span class="onright">\n <span class="onright">\n
<a class="home" tal:attributes="href python:context.getWebSiteValue().absolute_url()" href="./home" \n <a class="home" tal:attributes="href python:context.getWebSiteValue().absolute_url()" href="./home" \n
i18n:translate="" i18n:domain="ui">Home</a>\n i18n:translate="" i18n:domain="ui">Home</a>\n
<a class="preferences" tal:condition="python: context.EGov_checkUserIsAPersonOrOrganisation()==True" href="PreferenceTool_viewChangePasswordDialog" \n
i18n:translate="" i18n:domain="ui">Change Password</a>\n
<tal:block tal:condition="python: context.getPrintFormUrl() is not None">\n <tal:block tal:condition="python: context.getPrintFormUrl() is not None">\n
<a class="print" href="PDFDocument_viewAsPdf"\n <a class="print" href="PDFDocument_viewAsPdf"\n
tal:attributes="href python: context.getPrintFormUrl()" i18n:translate="" i18n:domain="ui">Print</a>\n tal:attributes="href python: context.getPrintFormUrl()" i18n:translate="" i18n:domain="ui">Print</a>\n
</tal:block> \n </tal:block> \n
<a class="preferences" tal:condition="python: context.EGov_checkUserIsAPersonOrOrganisation()==True" href="PreferenceTool_viewChangePasswordDialog" \n
i18n:translate="" i18n:domain="ui">Change Password</a>\n
<a class="help" href="EGov_helpWithContext" tal:attributes="href python:\'help/\' + here.EGov_helpWithContext()" onclick="window.open(this.href, \'egov_help\',\'width=800,height=500,menubar=yes,toolbar=yes,scrollbars=yes,resizable=yes\'); return false;" i18n:translate="" i18n:domain="ui">Help</a>\n <a class="help" href="EGov_helpWithContext" tal:attributes="href python:\'help/\' + here.EGov_helpWithContext()" onclick="window.open(this.href, \'egov_help\',\'width=800,height=500,menubar=yes,toolbar=yes,scrollbars=yes,resizable=yes\'); return false;" i18n:translate="" i18n:domain="ui">Help</a>\n
<tal:block tal:condition="python: not here.portal_membership.isAnonymousUser()">\n
<a class="logout" href="WebSite_logout" i18n:translate="" i18n:domain="ui">Logout</a>\n
</tal:block>\n
</span>\n </span>\n
</div>\n </div>\n
</div>\n </div>\n
......
...@@ -47,14 +47,11 @@ ...@@ -47,14 +47,11 @@
<tal:block tal:condition="here/portal_membership/isAnonymousUser">\n <tal:block tal:condition="here/portal_membership/isAnonymousUser">\n
<a class="login" href="EGov_viewLoginForm" i18n:translate="" i18n:domain="ui">Login</a>\n <a class="login" href="EGov_viewLoginForm" i18n:translate="" i18n:domain="ui">Login</a>\n
</tal:block>\n </tal:block>\n
<tal:block tal:condition="python: not here.portal_membership.isAnonymousUser()">\n
<a class="logout" href="WebSite_logout" i18n:translate="" i18n:domain="ui">Logout</a>\n
</tal:block>\n
<tal:block tal:condition="python:request[\'current_form_id\'] != \'eGov_viewAdvancedSearchDialog\'">\n <tal:block tal:condition="python:request[\'current_form_id\'] != \'eGov_viewAdvancedSearchDialog\'">\n
<a class="home" tal:attributes="href python:context.getWebSiteValue().absolute_url()" \n <a class="home" tal:attributes="href python:context.getWebSiteValue().absolute_url()" \n
href="./home" i18n:translate="" i18n:domain="ui">Home</a>\n href="./home" i18n:translate="" i18n:domain="ui">Home</a>\n
</tal:block>\n </tal:block>\n
<a class="preferences" tal:condition="python: context.EGov_checkUserIsAPersonOrOrganisation()==True" href="PreferenceTool_viewChangePasswordDialog" \n <a class="preferences" tal:condition="python: context.EGov_checkUserIsAPersonOrOrganisation()==True or 1" href="PreferenceTool_viewChangePasswordDialog" \n
i18n:translate="" i18n:domain="ui">Change Password</a>\n i18n:translate="" i18n:domain="ui">Change Password</a>\n
\n \n
<!--\n <!--\n
...@@ -63,6 +60,11 @@ ...@@ -63,6 +60,11 @@
</tal:block>\n </tal:block>\n
-->\n -->\n
<a class="help" href="EGov_helpWithContext" tal:attributes="href python:\'help/\' + here.EGov_helpWithContext()" onclick="window.open(this.href, \'egov_help\',\'width=800,height=500,menubar=yes,toolbar=yes,scrollbars=yes,resizable=yes\'); return false;" i18n:translate="" i18n:domain="ui">Help</a>\n <a class="help" href="EGov_helpWithContext" tal:attributes="href python:\'help/\' + here.EGov_helpWithContext()" onclick="window.open(this.href, \'egov_help\',\'width=800,height=500,menubar=yes,toolbar=yes,scrollbars=yes,resizable=yes\'); return false;" i18n:translate="" i18n:domain="ui">Help</a>\n
\n
<tal:block tal:condition="python: not here.portal_membership.isAnonymousUser()">\n
<a class="logout" href="WebSite_logout" i18n:translate="" i18n:domain="ui">Logout</a>\n
</tal:block>\n
\n
</span><br /><br />\n </span><br /><br />\n
<span class="site_title" i18n:translate="" i18n:domain="ui">EGov - Online Procedures</span>\n <span class="site_title" i18n:translate="" i18n:domain="ui">EGov - Online Procedures</span>\n
\n \n
......
...@@ -51,19 +51,16 @@ ...@@ -51,19 +51,16 @@
<span class="onright">\n <span class="onright">\n
<a class="home" tal:condition="python: context.EGov_checkUserIsAPersonOrOrganisation()==True" tal:attributes="href python:context.getWebSiteValue().absolute_url()" href="./home" \n <a class="home" tal:condition="python: context.EGov_checkUserIsAPersonOrOrganisation()==True" tal:attributes="href python:context.getWebSiteValue().absolute_url()" href="./home" \n
i18n:translate="" i18n:domain="ui">Home</a>\n i18n:translate="" i18n:domain="ui">Home</a>\n
\n
<a class="preferences" tal:condition="python: context.EGov_checkUserIsAPersonOrOrganisation()==True" href="PreferenceTool_viewChangePasswordDialog" \n
i18n:translate="" i18n:domain="ui">Change Password</a>\n
\n
<a class="logout" href="WebSite_logout" i18n:translate="" i18n:domain="ui">Logout</a> \n
<tal:block tal:condition="python: context.getPrintFormUrl() is not None">\n <tal:block tal:condition="python: context.getPrintFormUrl() is not None">\n
<a class="print" href="PDFDocument_viewAsPdf"\n <a class="print" href="PDFDocument_viewAsPdf"\n
tal:attributes="href python: context.getPrintFormUrl()" i18n:translate="" i18n:domain="ui">Print</a>\n tal:attributes="href python: context.getPrintFormUrl()" i18n:translate="" i18n:domain="ui">Print</a>\n
</tal:block>\n </tal:block>\n
<!--<a class="help" href="EGov_helpWithContext" tal:attributes="href python:\'help/\' + here.EGov_helpWithContext()" i18n:translate="" i18n:domain="ui">Help</a>-->\n <!--<a class="help" href="EGov_helpWithContext" tal:attributes="href python:\'help/\' + here.EGov_helpWithContext()" i18n:translate="" i18n:domain="ui">Help</a>-->\n
<a class="preferences" tal:condition="python: context.EGov_checkUserIsAPersonOrOrganisation()==True" href="PreferenceTool_viewChangePasswordDialog" \n
i18n:translate="" i18n:domain="ui">Change Password</a>\n
<a class="help" href="EGov_helpWithContext" tal:attributes="href python:\'help/\' + here.EGov_helpWithContext()" onclick="window.open(this.href, \'egov_help\',\'width=800,height=500,menubar=yes,toolbar=yes,scrollbars=yes,resizable=yes\'); return false;" i18n:translate="" i18n:domain="ui">Help</a>\n <a class="help" href="EGov_helpWithContext" tal:attributes="href python:\'help/\' + here.EGov_helpWithContext()" onclick="window.open(this.href, \'egov_help\',\'width=800,height=500,menubar=yes,toolbar=yes,scrollbars=yes,resizable=yes\'); return false;" i18n:translate="" i18n:domain="ui">Help</a>\n
<a class="logout" href="WebSite_logout" i18n:translate="" i18n:domain="ui">Logout</a> \n
</span><hr/>\n </span><hr/>\n
\n
</div>\n </div>\n
</div>\n </div>\n
......
...@@ -47,22 +47,23 @@ ...@@ -47,22 +47,23 @@
<tal:block tal:condition="here/portal_membership/isAnonymousUser">\n <tal:block tal:condition="here/portal_membership/isAnonymousUser">\n
<a class="login" tal:attributes="href python:\'%s/EGov_viewLoginForm\' % context.getWebSiteValue().absolute_url()"\n <a class="login" tal:attributes="href python:\'%s/EGov_viewLoginForm\' % context.getWebSiteValue().absolute_url()"\n
href="EGov_viewLoginForm" i18n:translate="" i18n:domain="ui">Login</a>\n href="EGov_viewLoginForm" i18n:translate="" i18n:domain="ui">Login</a>\n
</tal:block>\n
<tal:block tal:condition="python: not here.portal_membership.isAnonymousUser()">\n
<a class="logout" href="WebSite_logout" i18n:translate="" i18n:domain="ui">Logout</a>\n
</tal:block>\n </tal:block>\n
<a class="home" tal:attributes="href python:context.getWebSiteValue().absolute_url()" \n <a class="home" tal:attributes="href python:context.getWebSiteValue().absolute_url()" \n
href="./home" i18n:translate="" i18n:domain="ui">Home</a>\n href="./home" i18n:translate="" i18n:domain="ui">Home</a>\n
<!--\n
\n \n
<a class="preferences" tal:condition="python: context.EGov_checkUserIsAPersonOrOrganisation()==True" href="PreferenceTool_viewChangePasswordDialog" \n <a class="preferences" tal:condition="python: context.EGov_checkUserIsAPersonOrOrganisation()==True" href="PreferenceTool_viewChangePasswordDialog" \n
i18n:translate="" i18n:domain="ui">Change Password</a>\n i18n:translate="" i18n:domain="ui">Change Password</a>\n
\n \n
<!--\n
<tal:block tal:condition="not:here/portal_membership/isAnonymousUser">\n <tal:block tal:condition="not:here/portal_membership/isAnonymousUser">\n
<a class="preferences" href="./preferences" i18n:translate="" i18n:domain="ui">Preferences</a>\n <a class="preferences" href="./preferences" i18n:translate="" i18n:domain="ui">Preferences</a>\n
</tal:block>\n </tal:block>\n
-->\n -->\n
<a class="help" href="EGov_helpWithContext" tal:attributes="href python:\'help/\' + here.EGov_helpWithContext()" onclick="window.open(this.href, \'egov_help\',\'width=800,height=500,menubar=yes,toolbar=yes,scrollbars=yes,resizable=yes\'); return false;" i18n:translate="" i18n:domain="ui">Help</a>\n <a class="help" href="EGov_helpWithContext" tal:attributes="href python:\'help/\' + here.EGov_helpWithContext()" onclick="window.open(this.href, \'egov_help\',\'width=800,height=500,menubar=yes,toolbar=yes,scrollbars=yes,resizable=yes\'); return false;" i18n:translate="" i18n:domain="ui">Help</a>\n
\n
<tal:block tal:condition="python: not here.portal_membership.isAnonymousUser()">\n
<a class="logout" href="WebSite_logout" i18n:translate="" i18n:domain="ui">Logout</a>\n
</tal:block>\n
\n \n
</span><br /><br />\n </span><br /><br />\n
<span class="site_title" i18n:translate="" i18n:domain="ui">EGov - Online Procedures</span>\n <span class="site_title" i18n:translate="" i18n:domain="ui">EGov - Online Procedures</span>\n
......
2010-07-09 mohamadou 2010-07-08 mayoro
* add tabber-cookie.js
* order action buttons on header workspaces
* Allow change password in citizen's home page
* give proxy role manager to allow accessing owner_info
2010-07-08 mohamadou
* set Type Aquire Local Roles on portal_types used as attachments. * set Type Aquire Local Roles on portal_types used as attachments.
2010-07-08 mayoro 2010-07-08 mayoro
......
709 716
\ 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