[Erp5-report] r37286 lucas - in /erp5/trunk/bt5/tiolive_base: SkinTemplateItem/portal_skins...

[nobody at svn.erp5.org]

Author: lucas
Date: Tue Jul 27 15:05:13 2010
New Revision: 37286

URL: http://svn.erp5.org?rev=37286&view=rev
Log:
Added new actions.
Now the customer can use My Favourites to navigate between his instances.

Modified:
    erp5/trunk/bt5/tiolive_base/SkinTemplateItem/portal_skins/tiolive_base/ERP5Site_redirectToTioLiveInstance.xml
    erp5/trunk/bt5/tiolive_base/SkinTemplateItem/portal_skins/tiolive_base/navigation_box_render.xml
    erp5/trunk/bt5/tiolive_base/bt/revision

Modified: erp5/trunk/bt5/tiolive_base/SkinTemplateItem/portal_skins/tiolive_base/ERP5Site_redirectToTioLiveInstance.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/tiolive_base/SkinTemplateItem/portal_skins/tiolive_base/ERP5Site_redirectToTioLiveInstance.xml?rev=37286&r1=37285&r2=37286&view=diff
==============================================================================
--- erp5/trunk/bt5/tiolive_base/SkinTemplateItem/portal_skins/tiolive_base/ERP5Site_redirectToTioLiveInstance.xml [utf8] (original)
+++ erp5/trunk/bt5/tiolive_base/SkinTemplateItem/portal_skins/tiolive_base/ERP5Site_redirectToTioLiveInstance.xml [utf8] Tue Jul 27 15:05:13 2010
@@ -54,8 +54,8 @@
         <item>
             <key> <string>_body</string> </key>
             <value> <string>portal = context.getPortalObject()\n
-return container.REQUEST.RESPONSE.redirect(\'%s/instance\'\n
-                                            %portal.ERP5Site_getTioLiveSiteRootUrl())\n
+return container.REQUEST.RESPONSE.redirect(\'%s/%s\'\n
+                                            % (portal.ERP5Site_getTioLiveSiteRootUrl(), site_id))\n
 </string> </value>
         </item>
         <item>
@@ -66,7 +66,7 @@ return container.REQUEST.RESPONSE.redire
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string></string> </value>
+            <value> <string>site_id=\'instance\'</string> </value>
         </item>
         <item>
             <key> <string>errors</string> </key>
@@ -86,12 +86,13 @@ return container.REQUEST.RESPONSE.redire
                   <dictionary>
                     <item>
                         <key> <string>co_argcount</string> </key>
-                        <value> <int>0</int> </value>
+                        <value> <int>1</int> </value>
                     </item>
                     <item>
                         <key> <string>co_varnames</string> </key>
                         <value>
                           <tuple>
+                            <string>site_id</string>
                             <string>_getattr_</string>
                             <string>context</string>
                             <string>portal</string>
@@ -107,7 +108,9 @@ return container.REQUEST.RESPONSE.redire
         <item>
             <key> <string>func_defaults</string> </key>
             <value>
-              <none/>
+              <tuple>
+                <string>instance</string>
+              </tuple>
             </value>
         </item>
         <item>

Modified: erp5/trunk/bt5/tiolive_base/SkinTemplateItem/portal_skins/tiolive_base/navigation_box_render.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/tiolive_base/SkinTemplateItem/portal_skins/tiolive_base/navigation_box_render.xml?rev=37286&r1=37285&r2=37286&view=diff
==============================================================================
--- erp5/trunk/bt5/tiolive_base/SkinTemplateItem/portal_skins/tiolive_base/navigation_box_render.xml [utf8] (original)
+++ erp5/trunk/bt5/tiolive_base/SkinTemplateItem/portal_skins/tiolive_base/navigation_box_render.xml [utf8] Tue Jul 27 15:05:13 2010
@@ -70,6 +70,12 @@
                         i18n:translate="" i18n:domain="ui"></option>\n
               </tal:block>\n
             </tal:block>\n
+            <option tal:condition="python: getattr(here, \'Base_getUserRemoteBusinessConfigurationReferenceList\', None) is not None"\n
+                      disabled="disabled">-- <tal:block tal:content="string: Your Instances" i18n:translate="" i18n:domain="ui" /> --</option>\n
+            <tal:block tal:condition="python: getattr(here, \'Base_getUserRemoteBusinessConfigurationReferenceList\', None) is not None"\n
+                       tal:repeat="instance_id python: here.Base_getUserRemoteBusinessConfigurationReferenceList()">\n
+              <option tal:attributes="value python: \'%s/%s\' % (here.ERP5Site_getTioLiveSiteRootUrl(include_language=0), instance_id)"><tal:block tal:content="python: \'Go to %s\' % instance_id" i18n:translate="" i18n:domain="ui"></tal:block></option>\n
+            </tal:block>\n
             <tal:block tal:condition="user_actions">\n
               <option disabled="disabled">-- <tal:block i18n:translate="" i18n:domain="ui">User</tal:block> --</option>\n
               <option tal:repeat="action user_actions"\n

Modified: erp5/trunk/bt5/tiolive_base/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/tiolive_base/bt/revision?rev=37286&r1=37285&r2=37286&view=diff
==============================================================================
--- erp5/trunk/bt5/tiolive_base/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/tiolive_base/bt/revision [utf8] Tue Jul 27 15:05:13 2010
@@ -1 +1 @@
-69
\ No newline at end of file
+70
\ No newline at end of file