added frame:no_display_login tag and additional attributes to the util:image

tag (for proper CTAP support)

src/com/silverwrist/venice/ui/jsp/FrameNoDisplayLoginTag.java

@@ -0,0 +1,38 @@
+/*
+ * The contents of this file are subject to the Mozilla Public License Version 1.1
+ * (the "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at <http://www.mozilla.org/MPL/>.
+ * 
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT
+ * WARRANTY OF ANY KIND, either express or implied. See the License for the specific
+ * language governing rights and limitations under the License.
+ * 
+ * The Original Code is the Venice Web Communities System.
+ * 
+ * The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
+ * for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
+ * Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+ * 
+ * Contributor(s): 
+ */
+package com.silverwrist.venice.ui.jsp;
+
+import javax.servlet.jsp.*;
+import javax.servlet.jsp.tagext.*;
+import com.silverwrist.venice.core.*;
+import com.silverwrist.venice.ui.*;
+
+public class FrameNoDisplayLoginTag extends VeniceTagSupport
+{
+  /*--------------------------------------------------------------------------------
+   * Overrides from class TagSupport
+   *--------------------------------------------------------------------------------
+   */
+
+  public int doStartTag()
+  {
+    return (getRequestInput().getDisplayLogin() ? SKIP_BODY : EVAL_BODY_INCLUDE);
+
+  } // end doStartTag
+
+} // end class FrameNoDisplayLoginTag

src/com/silverwrist/venice/ui/jsp/UtilImageTag.java

@@ -36,6 +36,10 @@ public class UtilImageTag extends VeniceBodyTagSupport
   private String height = null;
   private String border = "0";
   private String other_alt = null;
+  private String align = null;
+  private String hspace = null;
+  private String vspace = null;
+  private String usemap = null;
 
   /*--------------------------------------------------------------------------------
    * Internal functions
@@ -103,7 +107,16 @@ public class UtilImageTag extends VeniceBodyTagSupport
 	out.write(alt);
       else
 	out.write(other_alt);
-      out.write("\" WIDTH=" + real_width + " HEIGHT=" + real_height + " BORDER=" + real_border + ">");
+      out.write("\" WIDTH=" + real_width + " HEIGHT=" + real_height + " BORDER=" + real_border);
+      if (align!=null)
+	out.write(" ALIGN=" + align);
+      if (hspace!=null)
+	out.write(" HSPACE=" + hspace);
+      if (vspace!=null)
+	out.write(" VSPACE=" + vspace);
+      if (usemap!=null)
+	out.write(" USEMAP=\"" + usemap + "\"");
+      out.write(">");
 
     } // end try
     catch (IOException e)
@@ -126,6 +139,10 @@ public class UtilImageTag extends VeniceBodyTagSupport
     height = null;
     border = "0";
     other_alt = null;
+    align = null;
+    hspace = null;
+    vspace = null;
+    usemap = null;
 
   } // end release
 
@@ -170,6 +187,30 @@ public class UtilImageTag extends VeniceBodyTagSupport
 
   } // end setBorder
 
+  public void setAlign(String s)
+  {
+    align = s;
+
+  } // end setAlign
+
+  public void setHspace(String s)
+  {
+    hspace = s;
+
+  } // end setHspace
+
+  public void setVspace(String s)
+  {
+    vspace = s;
+
+  } // end setVspace
+
+  public void setUsemap(String s)
+  {
+    usemap = s;
+
+  } // end setUsemap
+
   /*--------------------------------------------------------------------------------
    * External operations
    *--------------------------------------------------------------------------------

tlds/frame-taglib.tld

@@ -69,6 +69,13 @@
     <bodycontent>JSP</bodycontent>
   </tag>
 
+  <tag>
+    <name>no_display_login</name>
+    <tagclass>com.silverwrist.venice.ui.jsp.FrameNoDisplayLoginTag</tagclass>
+    <info>Includes the enclosed JSP text if the "displayLogin" flag is not set on the request.</info>
+    <bodycontent>JSP</bodycontent>
+  </tag>
+
   <tag>
     <name>QID</name>
     <tagclass>com.silverwrist.venice.ui.jsp.FrameQIDTag</tagclass>

tlds/utils-taglib.tld

@@ -322,6 +322,26 @@
       <required>false</required>
       <rtexprvalue>false</rtexprvalue>
     </attribute>
+    <attribute>
+      <name>align</name>
+      <required>false</required>
+      <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>hspace</name>
+      <required>false</required>
+      <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>vspace</name>
+      <required>false</required>
+      <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>usemap</name>
+      <required>false</required>
+      <rtexprvalue>false</rtexprvalue>
+    </attribute>
   </tag>
 
   <tag>