You are viewing a plain text version of this content. The canonical link for it is here.
Posted to adffaces-commits@incubator.apache.org by aw...@apache.org on 2006/09/19 15:44:09 UTC

svn commit: r447886 - in /incubator/adffaces/trunk/trinidad/trinidad-impl/src: main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/ main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ main/java/org/apache/myfaces/trinidadinternal/u...

Author: awiner
Date: Tue Sep 19 08:44:08 2006
New Revision: 447886

URL: http://svn.apache.org/viewvc?view=rev&rev=447886
Log:
Patch for ADFFACES-178: fixes panelTabbed on PDAs.  And, just to make sure this doesn't crop up again, get rid of the obsolete getFormName() method

Modified:
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafRenderer.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafUtils.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/PageNavigationTreeRenderer.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/ShowItemRenderer.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/NavigationBarRenderer.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ProcessChoiceBarRenderer.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelTabbed-minimalPPC-golden.xml

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafRenderer.java?view=diff&rev=447886&r1=447885&r2=447886
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafRenderer.java Tue Sep 19 08:44:08 2006
@@ -578,20 +578,6 @@
   }
 
 
-  /**
-   * Returns the name of the form to submit to if the form submitted
-   * attribute is true.  If the form subitted attribute is true, the
-   * form specified on the node is used, otherwise the name of the
-   * containing form is used
-   */
-  protected String getFormName(
-          UIXRenderingContext context,
-          UINode node
-          )
-  {
-    return BaseLafUtils.getSubmitFormName(context, node);
-  }
-
   public static String getParentFormName(
           UIXRenderingContext context
           )

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafUtils.java?view=diff&rev=447886&r1=447885&r2=447886
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafUtils.java Tue Sep 19 08:44:08 2006
@@ -121,43 +121,6 @@
   }
 
 
-  /**
-   * @return The name of the form to submit to, or null, if the formSubmitted
-   * attribute is not true.  The form specified on the node is used. If this
-   * is not set, then the name of the containing form is used
-   */
-  public static String getSubmitFormName(
-    UIXRenderingContext context,
-    UINode node
-    )
-  {
-    Object submitForm = node.getAttributeValue(context,
-                                               FORM_SUBMITTED_ATTR);
-    if (Boolean.FALSE.equals(submitForm))
-      return null;
-
-    Object formName = node.getAttributeValue(context, FORM_NAME_ATTR);
-
-    if (formName != null)
-      return formName.toString();
-
-    if (Boolean.TRUE.equals(submitForm))
-    {
-      String form = getParentFormName(context);
-      if (form==null)
-      {
-        // we are in formSubmitted mode, but we have been unable to find a
-        // form, so log an error:
-        if (_LOG.isWarning())
-          _LOG.warning(node.getLocalName() + ": Couldn't find enclosing form");
-      }
-      return form;
-    }
-
-    return null;
-  }
-
-
   public static boolean isRightToLeft(
     UIXRenderingContext context
     )

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/PageNavigationTreeRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/PageNavigationTreeRenderer.java?view=diff&rev=447886&r1=447885&r2=447886
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/PageNavigationTreeRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/PageNavigationTreeRenderer.java Tue Sep 19 08:44:08 2006
@@ -56,13 +56,6 @@
     return getNamedChild(context, pageNode, NODE_STAMP_CHILD);
   }  
   
-  @Override
-  protected String getFormName(
-    UIXRenderingContext context, 
-    UINode           node)
-  {
-    return getParentFormName(context.getParentContext());
-  }
   
   @Override
   protected boolean setInitialPath(

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/ShowItemRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/ShowItemRenderer.java?view=diff&rev=447886&r1=447885&r2=447886
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/ShowItemRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/ShowItemRenderer.java Tue Sep 19 08:44:08 2006
@@ -62,7 +62,10 @@
     String sourceParam = BaseLafUtils.getStringAttributeValue(
       context, node, ID_ATTR);
 
-    String formName = getFormName(context, node);
+    //PH: using getFormName returns null for panelTabbed because formSubmitted
+    //attribute  is 'null'. Use getParentFormName instead to submit to the
+    //containing form.
+    String formName = getParentFormName(context);
 
     String partialChangeScript =
       "submitForm ('" + formName + "',0,{"+

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/NavigationBarRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/NavigationBarRenderer.java?view=diff&rev=447886&r1=447885&r2=447886
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/NavigationBarRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/NavigationBarRenderer.java Tue Sep 19 08:44:08 2006
@@ -219,7 +219,7 @@
 
 
     // get form name (#1308799)
-    String formName = XhtmlLafUtils.getSubmitFormName(context, navBar);
+    String formName = XhtmlLafUtils.getParentFormName(context);
 
 
     // If we don't support navigation (e.g., printable pages),
@@ -714,7 +714,7 @@
 
 
     // get form name (#1308799)
-    String formName = XhtmlLafUtils.getSubmitFormName(context, navBar);
+    String formName = XhtmlLafUtils.getParentFormName(context);
 
     int  nextRecords = 0;
     int  backRecords = 0;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ProcessChoiceBarRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ProcessChoiceBarRenderer.java?view=diff&rev=447886&r1=447885&r2=447886
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ProcessChoiceBarRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ProcessChoiceBarRenderer.java Tue Sep 19 08:44:08 2006
@@ -210,7 +210,7 @@
     }
 
     // get form name (#1308799)
-    String formName = XhtmlLafUtils.getSubmitFormName(context, node);
+    String formName = XhtmlLafUtils.getParentFormName(context);
 
 
     // If we don't support navigation (e.g., printable pages),
@@ -483,7 +483,7 @@
                         : null;
 
     // get the form name
-    String formName = getFormName( context, node);
+    String formName = getParentFormName(context);
 
 
     URLEncoder encoder = context.getURLEncoder();

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelTabbed-minimalPPC-golden.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelTabbed-minimalPPC-golden.xml?view=diff&rev=447886&r1=447885&r2=447886
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelTabbed-minimalPPC-golden.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelTabbed-minimalPPC-golden.xml Tue Sep 19 08:44:08 2006
@@ -23,7 +23,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
@@ -53,7 +53,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
@@ -83,7 +83,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
@@ -133,7 +133,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
@@ -163,7 +163,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
@@ -193,7 +193,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
@@ -245,7 +245,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
@@ -275,7 +275,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
@@ -305,7 +305,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
@@ -357,7 +357,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
@@ -387,7 +387,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
@@ -417,7 +417,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
@@ -469,7 +469,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
@@ -499,7 +499,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
@@ -529,7 +529,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
@@ -579,7 +579,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
@@ -609,7 +609,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
@@ -639,7 +639,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
@@ -689,7 +689,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
@@ -719,7 +719,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
@@ -749,7 +749,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
@@ -804,7 +804,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
@@ -834,7 +834,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
@@ -864,7 +864,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
@@ -911,7 +911,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
@@ -941,7 +941,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
@@ -971,7 +971,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
@@ -1023,7 +1023,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
@@ -1053,7 +1053,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
@@ -1083,7 +1083,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
@@ -1135,7 +1135,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
@@ -1165,7 +1165,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
@@ -1195,7 +1195,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
@@ -1247,7 +1247,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
@@ -1277,7 +1277,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
@@ -1307,7 +1307,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
@@ -1359,7 +1359,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
@@ -1389,7 +1389,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
@@ -1419,7 +1419,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
@@ -1471,7 +1471,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
@@ -1501,7 +1501,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
@@ -1531,7 +1531,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
@@ -1583,7 +1583,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
@@ -1613,7 +1613,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
@@ -1643,7 +1643,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
@@ -1695,7 +1695,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
@@ -1725,7 +1725,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
@@ -1755,7 +1755,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
@@ -1807,7 +1807,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
@@ -1837,7 +1837,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
@@ -1867,7 +1867,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
@@ -1919,7 +1919,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
@@ -1949,7 +1949,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
@@ -1979,7 +1979,7 @@
                 
               </img>
               <a
-                   onclick="submitForm ('null',0,{event:'show',source:'_idXXX'});return false"
+                   onclick="submitForm ('formId',0,{event:'show',source:'_idXXX'});return false"
                    href="uri-attr:encoded-action-url:#"
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"