Changeset 3908

Timestamp:

Oct 21, 2010, 11:47:37 AM (13 years ago)

Author:

Gregory Vincic

Message:

Refs #711. Added feature to use nested fieldsets within forms. These fieldsets may however not be shown or hidden.

Location:

trunk/client/servlet

Files:

• src/org/proteios/gui/web/GUIConverter.java (modified) (54 diffs)
• test/src/org/proteios/gui/form/FormTest.java (added)
• www/static/css/layout2.jsp (modified) (1 diff)

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

@@ -1 +1 @@
 /*
     $Id$
-    
+        
     Copyright (C) 2006 Gregory Vincic
     Copyright (C) 2007 Gregory Vincic, Olle Mansson
-    
+        
     Files are copyright by their respective authors. The contributions to
     files where copyright is not explicitly stated can be traced with the
     source code revision system.
-    
+        
     This file is part of Proteios.
     Available at http://www.proteios.org/
-    
+        
     Proteios-2.x is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License
     as published by the Free Software Foundation; either version 2
     of the License, or (at your option) any later version.
-    
+        
     Proteios is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
-    
+        
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
@@ -132 +132 @@
     private String currentFormId = null;
     private TypeUtil typeUtil = new TypeUtil();
-    
+        
     public HttpServletRequest getRequest()
     {
         return request;
     }
-    
+        
     public void setRequest(HttpServletRequest request)
     {
@@ -143 +143 @@
         hf.setRequest(request);
     }
-    
+        
     public GUIConverter(String contextPath)
     {
@@ -151 +151 @@
         this.hf = new HtmlFactory(contextPath);
     }
-    
+        
     private Random r = new Random();
-    
+        
     public Tag convert(Image img)
     {
@@ -238 +238 @@
         return div;
     }
-    
+        
     public Tag convert(IFrame obj)
     {
@@ -250 +250 @@
         return tag;
     }
-    
+        
     public Tag convert(Listing list)
     {
@@ -285 +285 @@
         return layout;
     }
-    
+        
     /**
         * @param action
@@ -302 +302 @@
         return sb.toString();
     }
-    
+        
     public Tag convert(org.proteios.gui.TreeMenu menu)
     {
@@ -314 +314 @@
         return layout.getRoot();
     }
-    
+        
     public Tag convert(org.proteios.gui.MainMenu menu)
     {
         Tag div, ul;
-        
+                
         div = hf.newLayoutDiv();
         ul = convert((org.proteios.gui.TreeMenu) menu);
-        
+                
         div.add(ul);
         return div;
     }
-    
+        
     public String convert(ClosePopup button)
     {
         return "closeAllVisiblePopups()";
     }
-    
+        
     public Tag<?> convert(ActionLink pageLink, String formId, boolean localize)
     {
@@ -347 +347 @@
         return tag;
     }
-    
+        
     /**
         * Converts an ActionLink such that each parameter of the ActionLink is a
@@ -383 +383 @@
         return js.toString();
     }
-    
+        
     public Tag convert(Scroller scroller, String formId)
     {
@@ -446 +446 @@
         return scrollBar.getRoot();
     }
-    
+        
     /**
         * @param table to convert
@@ -486 +486 @@
                     }
                 }
-                
+                                
             }
             scroller = table.getScroller();
@@ -580 +580 @@
                         // Column display order select box
                         Integer colDisplayOrder = col.getDisplayOrder();
-                        
+                                                
                         if (ad.getKey().equals("Id"))
                         {
@@ -608 +608 @@
                             tr.newTd().add(displayOrderSelectBox);
                         }
-                                    
+                                                            
                         // Order by
                         if (col.getDisplayFilter())
@@ -893 +893 @@
         return layout.getRoot();
     }
-    
+        
     public Tag convert(org.proteios.gui.table.FolderTable table)
     {
@@ -943 +943 @@
         return layout.getRoot();
     }
-    
+        
     public Tr convert(Row row)
     {
@@ -962 +962 @@
         return tr;
     }
-    
+        
     public Tr convert(TreeRow row)
     {
@@ -989 +989 @@
         return tr;
     }
-    
+        
     public Tag convert(Separator sep)
     {
         return new Hr();
     }
-    
+        
     public <D extends Object> Tag convert(Cell<D> cell)
     {
@@ -1069 +1069 @@
         return td;
     }
-    
+        
     public Tag convert(Column col)
     {
@@ -1078 +1078 @@
         return th;
     }
-    
+        
     public Tag convert(Column col, org.proteios.gui.table.Table table)
     {
@@ -1099 +1099 @@
         return th;
     }
-    
+        
     public Tag convert(Text txt)
     {
@@ -1107 +1107 @@
         return layout;
     }
-    
+        
     public Tag convert(TitledWindow win)
     {
@@ -1150 +1150 @@
         return window.getRoot();
     }
-    
+        
     @SuppressWarnings("unused")
     public Tag convert(Space space)
@@ -1156 +1156 @@
         return new Div().setClass("space");
     }
-    
+        
     public Tag convert(Message msg)
     {
@@ -1163 +1163 @@
         return layout.getRoot();
     }
-    
+        
     int idCounter = 0;
     String lastId = "";
-    
+        
     public String nextId()
     {
@@ -1173 +1173 @@
         return lastId;
     }
-    
+        
     public String getLastId()
     {
         return lastId;
     }
-    
+        
     public Tag convert(org.proteios.gui.Error err)
     {
@@ -1185 +1185 @@
         return layout.getRoot();
     }
-    
+        
     public Tag convert(org.proteios.gui.form.Form w)
     {
@@ -1194 +1194 @@
         Input field;
         AbstractLink defaultAction;
-        
+                
         layout = hf.newLayoutDiv();
         clearForm = false;
@@ -1239 +1239 @@
         return layout.getRoot();
     }
-    
+        
     public Tag convert(org.proteios.gui.form.Fieldset fs)
     {
         return convertFieldset(fs, null, false);
     }
-    
+        
     private int fieldsetId = 0;
     private int nextFieldsetId() { fieldsetId++; return fieldsetId; }
-
+    
     private Tag convertFieldset(org.proteios.gui.form.Fieldset fs, Form form, Boolean useToggle)
     {
         Fieldset fieldset;
         Tag legend, title, fields, table, row, helpC, input;
-    Img btn;
+        Img btn;
         String subtitle;
         org.proteios.gui.form.Field field;
         String id = "fs" + nextFieldsetId();
-      String btnId = "btn" + id;
+        String btnId = "btn" + id;
         fieldset = new Fieldset();
         // Fieldset legend
         legend = fieldset.newDiv().setClass("legend");
         title = new Div().addClass("title");
-      if(useToggle)
-    {
-        legend.setOnClick("toggleFieldset('" + id + "')");    
-      btn = new Img();
-          btn.addClass("toggle");
-      btn.setId(btnId);
-      legend.add(btn);
-      btn.setSrc(fs.isOpen() ? "static/img/minus.gif" : "static/img/plus.gif");
-    }
-
+        if(useToggle)
+        {
+            legend.setOnClick("toggleFieldset('" + id + "')");    
+            btn = new Img();
+            btn.addClass("toggle");
+            btn.setId(btnId);
+            legend.add(btn);
+            btn.setSrc(fs.isOpen() ? "static/img/minus.gif" : "static/img/plus.gif");
+        }
+        
         if (fs.getTitle()!= null)
         {
@@ -1283 +1283 @@
         }
         legend.add(title.getRoot());
-        
+                
         fields = fieldset.newDiv().setClass("fields");
-    fields.setId(id);
-    fields.setStyle("display: " + (fs.isOpen() ? "block" : "none"));
+        fields.setId(id);
+        fields.setStyle("display: " + (fs.isOpen() ? "block" : "none"));
         table = fields.newTable();
         for (org.proteios.gui.GUIElement f : fs.getFields())
         {
-            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);
-                    if (((org.proteios.gui.form.Select)f).isHidden() != null && ((org.proteios.gui.form.Select)f).isHidden())
-                    {
-                      row.addClass("hidden");
-                    }
-                }
-                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)
-            {
-                row.newTd().add(convert((org.proteios.gui.table.Table) f));
-            }
-               
+            addFieldAsRow(table, f, form);
         }
         return fieldset;
     }
     
+    private Tag addFieldAsRow(Tag table, org.proteios.gui.GUIElement f, Form form)
+    {
+        Tag legend, title, fields, row, helpC, input;
+        org.proteios.gui.form.Field field;
+        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);
+                if (((org.proteios.gui.form.Select)f).isHidden() != null && ((org.proteios.gui.form.Select)f).isHidden())
+                {
+                    row.addClass("hidden");
+                }
+            }
+            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());
+        }
+        else if (f instanceof org.proteios.gui.table.Table)
+        {
+            row.newTd().add(convert((org.proteios.gui.table.Table) f));
+        }
+        else if (f instanceof org.proteios.gui.form.Fieldset)
+        {
+            org.proteios.gui.form.Fieldset subfs = (org.proteios.gui.form.Fieldset) f;
+            // Sub fieldsets are not allowed to have toggling feature
+            row.newTd().setAttribute(new Attribute("colspan", "2")).setClass("sublegend").newCData(subfs.getTitle().getTitle());
+            for (org.proteios.gui.GUIElement subf : subfs.getFields())
+            {
+                Tag subRow = addFieldAsRow(table, subf, form);
+          Tag labeltd = (Tag) subRow.getElements().get(0); // the td tag
+        labeltd.addClass("subfield");
+            }
+            table.newTr().newTd().setAttribute(new Attribute("colspan", "2")).setClass("subend").newBr();
+        }
+        return row;
+    }
+        
     private Tag convert(FileField f)
     {
@@ -1369 +1389 @@
         return in;
     }
-    
+        
     public Tag convert(org.proteios.gui.form.Select<?> select)
     {
@@ -1404 +1424 @@
         if (select.isHidden() != null && select.isHidden())
         {
-          selectTag.setAttribute(new Attribute("style", "display:none;"));
+            selectTag.setAttribute(new Attribute("style", "display:none;"));
         }
         selectTag.setOnChange("setNameField(this)");
@@ -1431 +1451 @@
         return field;
     }
-    
+        
     public Tag convert(ColumnContainer container)
     {
@@ -1456 +1476 @@
         return layout;
     }
-    
+        
     public Tag convert(org.proteios.gui.Empty empty)
     {
         return new Span().newCData("&nbsp;");
     }
-    
+        
     public Tag convert(RowContainer container)
     {
@@ -1484 +1504 @@
         return span;
     }
-    
+        
     private int treeLevel = 0;
-    
+        
     public Tag convert(Node node)
     {
@@ -1557 +1577 @@
                     childHref.addClass("last");
                 }
-                
+                                
                 if (first)
                 first = false;
@@ -1566 +1586 @@
         return li;
     }
-    
+        
     /**
         * Convenience method for getting path to a bullet/spacer image file marking
@@ -1595 +1615 @@
         return iconPath;
     }
-    
+        
     /**
         * Converts a toolbar so that button clicks post the form referenced by
@@ -1664 +1684 @@
         return new CData("");
     }
-    
+        
     public Tag convert(org.proteios.gui.TabSet set)
     {
@@ -1691 +1711 @@
         return layout;
     }
-    
+        
     private Tag convert(org.proteios.gui.Tab tab, boolean convertTabContent)
     {
@@ -1710 +1730 @@
         return li;
     }
-    
+        
     private Tag convert(org.proteios.gui.form.TextArea f)
     {
@@ -1727 +1747 @@
         return in;
     }
-    
+        
     private String formatedValue(TextField<?> f)
     {
@@ -1741 +1761 @@
         return value;
     }
-    
+        
     private <D extends Object> Tag<?> convert(
     org.proteios.gui.form.TextField<D> f)
@@ -1749 +1769 @@
         Input in;
         Tag<?> field;
-        
+                
         // Format the value
         value = formatedValue(f);
         container = new CData("");
-        
+                
         in = null;
         type = "text";
@@ -1780 +1800 @@
         return container;
     }
-    
+        
     private Tag<?> convert(org.proteios.gui.form.PasswordField f)
     {
@@ -1791 +1811 @@
         return in;
     }
-    
+        
     public Tag<?> convert(org.proteios.gui.form.Checkbox<?> checkbox)
     {
         return convert(checkbox, false);
     }
-    
+        
     private Tag<?> convert(org.proteios.gui.form.Checkbox<?> checkbox,
     boolean inForm)
@@ -1817 +1837 @@
         return cbF;
     }
-    
+        
     public Tag<?> convert(org.proteios.gui.Toolbar toolbar)
     {
@@ -1883 +1903 @@
         return layout.getRoot();
     }
-    
+        
     public Tag<?> convert(org.proteios.gui.Button button)
     {
@@ -1950 +1970 @@
         return layout.getRoot();
     }
-    
+        
     public Tag<?> convert(org.proteios.gui.ButtonSet toolbar)
     {
@@ -1957 +1977 @@
         return layout;
     }
-    
+        
     public Tag<?> convert(org.proteios.gui.Title title)
     {
@@ -1977 +1997 @@
         return hx.getRoot();
     }
-    
+        
     @Override
     public Tag missingConverter(ConvertableElement obj)
@@ -1987 +2007 @@
         return div;
     }
-    
+        
     public void setLocale(Localizer locale)
     {
@@ -1997 +2017 @@
         }
     }
-    
+        
     public void setIconSet(Properties iconSet)
     {

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

@@ -222 +222 @@
 
 
+.sublegend 
+{
+  text-align: right;
+  font-size: 0.8em;
+  text-transform: uppercase;
+    padding-top: 10px;
+}
+
+
 div.form form div.legend
 {