Changeset 3759

Timestamp:

Jul 29, 2010, 1:57:24 PM (13 years ago)

Author:

Gregory Vincic

Message:

Refs #696. Forms are now built up of a table for each fieldset. Labels are not wrapped anymore and help text messages are located to the right of the field even if wrapped.

Location:

trunk

Files:

• api/waf/src/se/lu/thep/waf/HtmlTagWriter.java (modified) (3 diffs)
• build.xml (modified) (1 diff)
• client/servlet/src/org/proteios/gui/web/GUIConverter.java (modified) (10 diffs)
• client/servlet/www/static/css/colors.css (modified) (1 diff)
• client/servlet/www/static/css/layout2.jsp (modified) (4 diffs)

trunk/api/waf/src/se/lu/thep/waf/HtmlTagWriter.java

@@ -76 +76 @@
     if (tag instanceof CData)
     {
-      // No tags for CData
-      // writer.print(getIndentString());
       writer.print(((CData) tag).getStr());
     }
@@ -83 +81 @@
     {
       writeStartTag(writer, tag);
-      List<Tag<?>> elements = tag.getElements();
-      if (elements != null && elements.size() > 0)
+  }
+    List<Tag<?>> elements = tag.getElements();
+    // Write child elements
+  if(elements != null && elements.size() > 0)
+  {
+      for (Tag child : elements)
       {
-        // Close start tag
-        if (elements.get(0).getClass().equals(CData.class))
-          writer.print(">");
-        else
-          writer.println(">");
-        // Write child elements
-        for (Tag child : elements)
-        {
-          indent++;
-          child.draw(this);
-        }
-        writeEndTag(writer, tag);
+        indent++;
+        child.draw(this);
       }
-      else
-      {
-        // Close start tag
-        writer.println("/>");
-      }
+   if(!(tag instanceof CData))
+   {
+      writeEndTag(writer, tag);
+      indent--;
+   }
     }
-    indent--;
   }
 
@@ -117 +108 @@
     sb.append(tag.getName());
     writeAttributes(sb, tag);
+    if (tag.getElements() != null && tag.getElements().size() > 0)
+    {
+      if (tag.getElements().get(0).getClass().equals(CData.class))
+          sb.append(">");
+      else
+        sb.append("\n>");
+  }
+  else
+  {
+    sb.append("/>");
+  }
     writer.print(sb.toString());
   }

trunk/build.xml

@@ -139 +139 @@
           description="Same as 'ant clean compile hibernate dist-jar'"
           >
-    <antcall target="clean"/>
+<!--    <antcall target="clean"/> -->
     <ant dir="api/core"
          target="set-version"

trunk/client/servlet/src/org/proteios/gui/web/GUIConverter.java

@@ -72 +72 @@
 import org.proteios.gui.table.TreeRow;
 
+import se.lu.thep.waf.constraints.VString;
 import se.lu.thep.waf.dom.html.A;
 import se.lu.thep.waf.dom.html.Area;
@@ -1220 +1221 @@
   public Tag convert(org.proteios.gui.form.Form w)
   {
-    Tag layout = hf.newLayoutDiv();
-    boolean clearForm = false;
+  Tag layout;
+  boolean clearForm;
+  Toolbar tb;
+  Form form;
+  Input field;
+  AbstractLink defaultAction;
+
+    layout = hf.newLayoutDiv();
+    clearForm = false;
     if (currentFormTag == null)
     {
@@ -1231 +1239 @@
         "display: none"));
     }
-    Toolbar tb = w.getToolbar();
+    tb = w.getToolbar();
     // This might cause a failure if the currentFormTag is not a Form
-    Form form = (Form) currentFormTag;
+    form = (Form) currentFormTag;
     if (tb != null)
     {
-      Input field = form.newInput().setId(w.getId() + "action").setName(
+      field = form.newInput().setId(w.getId() + "action").setName(
         "action").setType("hidden");
       if (tb.getDefaultAction() != null)
       {
-        AbstractLink defaultAction = tb.getDefaultAction();
+        defaultAction = tb.getDefaultAction();
         if (defaultAction instanceof ActionLink)
           field.setValue(((ActionLink) defaultAction).getActionId());
@@ -1274 +1282 @@
   private Tag convertFieldset(org.proteios.gui.form.Fieldset fs, Form form)
   {
-    Fieldset fieldset = new Fieldset();
+    Fieldset fieldset;
+  Tag legend, title, fields, table, row, helpC, input;
+  String subtitle;
+  org.proteios.gui.form.Field field;
+
+  fieldset = new Fieldset();
     // Fieldset legend
-    Tag legend = fieldset.newDiv().setClass("legend");
-    Tag title = new Div().addClass("title");
+    legend = fieldset.newDiv().setClass("legend");
+    title = new Div().addClass("title");
     if (fs.getLegendTitle() != null)
     {
       title.add(new CData(
         locale.get(fs.getLegendTitle().getTitle()) + " "));
-      String subtitle = fs.getLegendTitle().getSubtitle();
+      subtitle = fs.getLegendTitle().getSubtitle();
       if (subtitle != null)
       {
@@ -1290 +1303 @@
     }
     legend.add(title.getRoot());
-    //
-    Tag fields = fieldset.newDiv().setClass("fields");
+
+    fields = fieldset.newDiv().setClass("fields");
+  table = fields.newTable();
     for (org.proteios.gui.GUIElement f : fs.getFields())
     {
-      if (f instanceof TextField)
-      {
-        fields.add(convert((TextField<?>) f));
-        continue;
-      }
-      if (f instanceof PasswordField)
-      {
-        fields.add(convert((PasswordField) f));
-        continue;
-      }
-      if (form != null)
-      {
-        if (f instanceof FileField)
-        {
-          form.setMultipart();
-          fields.add(convert((FileField) f));
-          continue;
-        }
-      }
-      if (f instanceof TextArea)
-      {
-        fields.add(convert((TextArea) f));
-        continue;
-      }
-      if (f instanceof org.proteios.gui.form.Select)
-      {
-        fields.add(convert((org.proteios.gui.form.Select) f));
-        continue;
-      }
-      if (f instanceof org.proteios.gui.form.Checkbox)
-      {
-        fields.add(convert((org.proteios.gui.form.Checkbox) f, true));
-        continue;
-      }
+   row = table.newTr();
+   // Label cell
+   if(f instanceof org.proteios.gui.form.Field)
+   {
+    field = (org.proteios.gui.form.Field) f;
+    row.newTd().addClass("label").newCData(locale.get(field.getLabel()));
+    input = null;
+    // Field cell
+      if (f instanceof TextField)
+      {
+     input = convert((TextField<?>) f);
+     if(((TextField<?>)field).isHidden())
+     {
+      row.addClass("hidden");
+     }
+      } 
+    else if (f instanceof PasswordField)
+      {
+        input = convert((PasswordField) f);
+      }
+      else if (f instanceof FileField)
+      {
+        if (form != null)
+      {
+          form.setMultipart();
+     }
+        input = convert((FileField) f);
+      }
+      else if (f instanceof TextArea)
+      {
+        input = convert((TextArea) f);
+      }
+      else if (f instanceof org.proteios.gui.form.Select)
+      {
+        input = convert((org.proteios.gui.form.Select) f);
+      }
+      else if (f instanceof org.proteios.gui.form.Checkbox)
+      {
+        input = convert((org.proteios.gui.form.Checkbox) f, false);
+      }
+    
+      if (field.getParam().isRequired() || 
+        (field.getParam() instanceof VString && ((VString) field.getParam()).getMinCharacterLength() > 0))
+      {
+      input.addClass("required");
+    }
+    if(input != null)
+    {
+     row.newTd().add(input);
+    }
+
+    // Help and error field
+    helpC = row.newTd();
+    helpC.newDiv().addClass("error").add(hf.getFieldError(field));
+    helpC.newDiv().addClass("help").newCData(field.getHelp());
+   }
       if (f instanceof org.proteios.gui.table.Table)
       {
-        fields.add(convert((org.proteios.gui.table.Table) f));
-        continue;
-      }
+        row.newTd().add(convert((org.proteios.gui.table.Table) f));
+      }
+   
     }
     return fieldset;
@@ -1346 +1382 @@
     if (f.isDisabled())
       in.disable();
-    Tag field = hf.newField(f);
-    field.add(in);
-    field.add(hf.getFieldError(f));
-    return field;
-  }
+    return in;
+  }
+
 
 
   public Tag convert(org.proteios.gui.form.Select<?> select)
   {
-    Tag field = hf.newField(select);
+    Tag field = new CData("");
     Select selectTag = field.newSelect().setId(select.getId()).setName(
       select.getName());
@@ -1711 +1745 @@
       in.addClass("disabled");
     }
-    Tag field = hf.newField(f);
-    field.add(in);
-    if (request != null)
-    {
-      field.add(hf.getFieldError(f));
-    }
-    return field;
-  }
-
-
-  private <D extends Object> Tag<?> convert(
-      org.proteios.gui.form.TextField<D> f)
-  {
-    // Format the value
-    String value = null;
-    if (f.getValue() != null)
+    return in;
+  }
+
+
+ private String formatedValue(TextField<?> f)
+ {
+  String value;
+  value = null;
+    if (f != null && f.getValue() != null)
     {
       if (f.getValue() instanceof Date)
@@ -1733 +1760 @@
         value = f.getValue().toString();
     }
-    Input in = null;
-    // Use input
-    String type = "text";
+  return value;
+ }
+
+
+  private <D extends Object> Tag<?> convert(
+      org.proteios.gui.form.TextField<D> f)
+  {
+  String value, type;
+  Tag table, row, labelC, inC, helpC, container;
+  Input in;
+  Tag<?> field;
+
+    // Format the value
+    value = formatedValue(f);
+  container = new CData("");
+
+    in = null;
+    type = "text";
     if (f.isHidden() || f.isDisabled())
     {
@@ -1743 +1785 @@
   in.setSize(f.getCharWidth());
     if (value != null)
+  {
       in.setValue(value);
+  }
     in.setId(f.getId());
-    Tag<?> field = null;
-    if (f.isHidden())
-    {
-      field = in;
-   field.addClass("hidden");
-    }
-    else
-    {
-      field = hf.newField(f);
-      field.add(in);
-    }
-    if (request != null)
-    {
-      field.add(hf.getFieldError(f));
-    }  
-  if(!f.isHidden())
-  {
-    // Add help text to this field
-    field.newSpan().addClass("help").newCData(f.getHelp());
+  container.add(in);
+    if (f.isDisabled())
+    {
+   container.newCData(value);
   }
-    if (f.isDisabled() && !f.isHidden())
-    {
-      if (value == null)
-        value = "";
-      field.newCData(value);
-    }
-    return field;
+    return container;
   }
 
@@ -1780 +1803 @@
       "password").setSize(f.getCharWidth());
     if (f.getValue() != null)
+  {
       in.setValue(f.getValue().toString());
-    Tag<?> field = hf.newField(f);
-    field.add(in);
-    field.add(hf.getFieldError(f));
-    return field;
+  }
+    return in;
   }
 

trunk/client/servlet/www/static/css/colors.css

@@ -120 +120 @@
   Required fields 
 *************************************************/
-div.form form fieldset div.fields div.required input 
+div.form form fieldset div.fields div.required input, input.required
 {
   background-color: #d0f0ff;

trunk/client/servlet/www/static/css/layout2.jsp

@@ -234 +234 @@
 }
 
-div.form form fieldset div.fields div.field
+div.form form fieldset div.fields table.field
+{
+ border: 0px;
+ border-collapse: collapsed;
+}
+
+div.form form fieldset div.fields .field
 {
   float:left;
@@ -246 +252 @@
 }
 
-div.form form fieldset div.fields div.field label
+div.form form fieldset div.fields .field label
 {
   float: left;
@@ -252 +258 @@
 }
 
-div.form form fieldset div.fields div.field input,
-div.form form fieldset div.fields div.field select,
-div.form form fieldset div.fields div.field textarea
+div.form form fieldset input,
+div.form form fieldset select,
+div.form form fieldset textarea
 {
   border-width: 1px;
@@ -274 +280 @@
 {
   width: 100%;
+}
+
+div.form form .label
+{
+ white-space: nowrap;
+}
+
+div.form tr.hidden
+{
+ display: none;
 }