Changeset 3954

Timestamp:

Nov 5, 2010, 11:32:55 AM (13 years ago)

Author:

Gregory Vincic

Message:

Fixed shadown for popup. Filter row is hidden if there are no visible filters available. Last column border is fixed.

Location:

trunk/client/servlet

Files:

• src/org/proteios/gui/web/GUIConverter.java (modified) (8 diffs)
• www/static/css/layout2.jsp (modified) (3 diffs)

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

@@ -704 +704 @@
         tableContent.add(tbl);
         Tr header = tbl.newTr().setClass("header");
-        Tr filter = tbl.newTr().setClass("filter").addClass("header");
+        Tr filter = new Tr().setClass("filter").addClass("header");
         Iterator<Column> cols = table.getHeader().iterator();
         int colspan = 0;
         boolean useRowAction = true;
         Attribute selected = new Attribute("selected", "selected");
+        boolean showFilterRow = false;
         while (cols.hasNext())
         {
@@ -721 +722 @@
                 String value = "";
                 Filter f = c.getFilter();
+        Tag filterTh = filter.newTh();
                 if (c.getDisplayFilter())
                 {
@@ -728 +730 @@
                         value = f.getValue().toString();
                     }
+
                     AttributeDefinition ad = c.getAttributeDefinition();
                     if (ad != null)
                     {
+            showFilterRow = true;
                         Class<?> valueType = ad.getAttributeType();
                         String name = "where" + ad.getKey();
@@ -738 +742 @@
                         if (typeUtil.isBoolean(valueType))
                         {
-                            Tag select = filter.newTh().newSelect().setName(
+                            Tag select = filterTh.newSelect().setName(
                             name);
                             select.newOption().newCData("");
@@ -754 +758 @@
                         else if (valueType.isEnum())
                         {
-                            Tag select = filter.newTh().newSelect().setName(
+                            Tag select = filterTh.newSelect().setName(
                             name);
                             select.newOption().newCData("");
@@ -798 +802 @@
                         else
                         {
-                            filter.newTh().newInput().setClass("filter")
+                            filterTh.newInput().setClass("filter")
                             .setSize(7).setName(name).setValue(
                             inputValue.replace('%', '*'));
@@ -804 +808 @@
                     }
                 }
-                else
-                {
-                    filter.newTh().newCData("&nbsp;");
-                }
-                if (!cols.hasNext())
-                col.addClass("lastCol");
+        filterTh.newCData("&nbsp;");
                 // Add optional header action, e.g. for sorting
                 AbstractLink link = c.getHeaderAction();
@@ -836 +835 @@
             }
         }
+    if(showFilterRow)
+    {
+          tbl.add(filter);
+    }
         // Convert rows
         Iterator<Row> rows = table.getRows().iterator();

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

@@ -159 +159 @@
 }
 
-div.table table tr th.lastCol,
-div.table table tr td.lastCol
+div.table table tr th:last-child,
+div.table table tr td:last-child
 {
   border-right-width: 0px;  
@@ -571 +571 @@
  * Popups
  ******************************************************************************/
-
-
 div.popupLayout
 {
@@ -582 +580 @@
   width: 500px;
   border: 0px solid red;
-  background-image: url('<%=img%>/bg-trans.gif'); 
-}
-
-
-
-div.popup .table { border: 0px }
+}
+
+div.popup .table { 
+  border: 0px;
+ }
+
+div.popup .table,
+div.popup .title,
+div.popup .toolbar { 
+    -moz-box-shadow: 5px 5px 15px #666;
+ }