[Salto-framework-devs] SF.net SVN: salto-framework: [310] salto-framework/trunk/src-fwk/salto/fwk/ mvc/taglib/table

[<de...@us...>]

Revision: 310
          http://svn.sourceforge.net/salto-framework/?rev=310&view=rev
Author:   denolfj
Date:     2006-12-11 03:33:21 -0800 (Mon, 11 Dec 2006)

Log Message:
-----------


Modified Paths:
--------------
    salto-framework/trunk/src-fwk/salto/fwk/mvc/taglib/table/ColumnTag.java
    salto-framework/trunk/src-fwk/salto/fwk/mvc/taglib/table/DataTableTag.java

Modified: salto-framework/trunk/src-fwk/salto/fwk/mvc/taglib/table/ColumnTag.java
===================================================================
--- salto-framework/trunk/src-fwk/salto/fwk/mvc/taglib/table/ColumnTag.java	2006-12-11 11:31:07 UTC (rev 309)
+++ salto-framework/trunk/src-fwk/salto/fwk/mvc/taglib/table/ColumnTag.java	2006-12-11 11:33:21 UTC (rev 310)
@@ -8,6 +8,7 @@
 import java.util.Date;
 import java.util.StringTokenizer;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.JspTagException;
 import javax.servlet.jsp.tagext.TagSupport;
@@ -280,6 +281,7 @@
 	}
 
 	private void generateHeader(StringBuffer sb) throws JspException {
+				
 		if (!generateHeader)
 			return;
 		
@@ -290,6 +292,11 @@
 		</table>
 		 */
 		sb.append("\n\t\t<th");
+		
+		if (getTableTag().getHeaderHeight() != null) {
+			sb.append(" height='"+getTableTag().getHeaderHeight()+"' ");
+		}
+		
 		if (isFilterable())
 			sb.append(" filter='true' ");
 		if (getTypeCell() != null)
@@ -320,9 +327,20 @@
 //				colTitle = "<div  style=\"width:99%;align=center;display:inline\">"+colTitle+"</div>" +
 //								"<div  style=\"width:1%;align=right;display:inline\"><img src='"+imgSorting+"' id='__fwk__IMG_SORTING' /></div>";
 				int iWidth = getIntWidth() - 20;
-				colTitle = "<div style=\"display: inline; min-width: "+iWidth+"px; float: left; width: "+iWidth+"px;\">"+colTitle+"</div> "+
-				"<div style=\"display: inline;\" >&nbsp;<img src='"+imgSorting+"' id='__fwk__IMG_SORTING' /></div>";
+//				colTitle = "<div style=\"display: inline; min-width: "+iWidth+"px; float: left; width: "+iWidth+"px;\">"+colTitle+"</div> "+
+//				colTitle = "<div style=\"display: inline; float: left; \">"+colTitle+"</div> "+				
+//				"<div style=\"display: inline;\" >&nbsp;<img src='"+imgSorting+"' id='__fwk__IMG_SORTING' /></div>";
+				String filter ="";
+				// filtermatable2_0_img
+				if (isFilterable()) {
+					filter ="<th width='1%'><img src='"+((HttpServletRequest) pageContext.getRequest()).getContextPath()+"/fwk/image/filter.gif' id='filter"+getTableTag().getId()+"_"+getTableTag().getColCount()+"_img'></th>";
 				}
+				String type = "";
+				if (getTypeCell() != null) {
+					type =" typeCell='"+getTypeCell()+"' ";
+				}
+				colTitle = "<table width='100%'><tr><th align='left' width='98%'>"+colTitle+"</th>"+filter+"<th width='1%' "+type+"><img src='"+imgSorting+"' id='__fwk__IMG_SORTING' /></th></tr></table>";
+				}
 			sb.append(colTitle);			
 		} else {
 			sb.append("&nbsp");
@@ -330,6 +348,8 @@
 		
 		
 		sb.append("</th>");
+		
+		getTableTag().addColCount();
 	}
 
 	private void writeToPage(String s) throws JspException {

Modified: salto-framework/trunk/src-fwk/salto/fwk/mvc/taglib/table/DataTableTag.java
===================================================================
--- salto-framework/trunk/src-fwk/salto/fwk/mvc/taglib/table/DataTableTag.java	2006-12-11 11:31:07 UTC (rev 309)
+++ salto-framework/trunk/src-fwk/salto/fwk/mvc/taglib/table/DataTableTag.java	2006-12-11 11:33:21 UTC (rev 310)
@@ -132,6 +132,9 @@
 	private Object currentObject;
 
 	private String[] parsedSelectParameters;
+	
+	private int count = 0;
+	
 
 	public int doStartTag() throws JspException {
 
@@ -172,11 +175,18 @@
 		StringBuffer sb = new StringBuffer();
 		// <table> tag
 		if (maxHeight != null && maxHeight.length() > 0) { // overflow-y: auto; height: " + maxHeight + "px;
-			sb.append("<style>table#" + id + ">tbody.datatable	{ overflow-x: hidden;}"); 
+//			sb.append("<style>table#" + id + ">tbody.datatable	{ overflow-x: hidden;height: " + maxHeight + "px;}"); 
+//			// pour  mozilla
+//			sb.append("td:last-child {padding-right: 20px;}</style>"); 
+//			/* prevent Mozilla scrollbar from hiding cell content */ //Integer.parseInt(getHeaderHeight())
+//			sb.append("<div class='tableContainer' id='" + getTableContainerId() + "' style='height: " + (Integer.parseInt(maxHeight) + 40) + "px;"+width+" overflow-x: hidden;'>");
+			
+			sb.append("<style>table#" + id + ">tbody.datatable	{ overflow-x: hidden;height: " + maxHeight + "px;overflow-y: auto;}"); 
 			// pour  mozilla
 			sb.append("td:last-child {padding-right: 20px;}</style>"); 
 			/* prevent Mozilla scrollbar from hiding cell content */
-			sb.append("<div class='tableContainer' id='" + getTableContainerId() + "' style='height: " + (Integer.parseInt(maxHeight) + Integer.parseInt(getHeaderHeight())) + "px;"+width+" overflow-x: hidden;'>");
+			sb.append("<div class='tableContainer' id='" + getTableContainerId() + "' style='height: " + (Integer.parseInt(maxHeight) + Integer.parseInt(getHeaderHeight()) + 20) + "px;"+width+" overflow-x: hidden;'>");
+
 		}
 		sb.append("<table");
 		if (getId() != null) {
@@ -423,6 +433,7 @@
 		rowSelectedCssClass = null;
 		evenRowCssClass = null;
 		oddRowCssClass = null;
+		count = 0;
 	}
 
 	public String getId() {
@@ -614,5 +625,12 @@
 		else this.headerHeight = pHeaderHeight.substring(0,pHeaderHeight.indexOf("px"));
 	}
 	
+	public int getColCount() {
+		return count;
+	}
 	
+	public void addColCount() {
+		count++;
+	}
+	
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.