[hibernate-commits] Hibernate SVN: r10692 - in branches/Branch_3_2/HibernateExt/tools/src: java/org/hibernate/tool/hbm2x templates/doc/tables

[hibernate-commits at lists.jboss.org]

Author: max.andersen at jboss.com
Date: 2006-11-02 14:12:37 -0500 (Thu, 02 Nov 2006)
New Revision: 10692

Modified:
   branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/DocExporter.java
   branches/Branch_3_2/HibernateExt/tools/src/templates/doc/tables/schema-summary.ftl
   branches/Branch_3_2/HibernateExt/tools/src/templates/doc/tables/summary.ftl
Log:
HBX-806  Improve usability of table pages

Modified: branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/DocExporter.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/DocExporter.java	2006-11-02 18:59:45 UTC (rev 10691)
+++ branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/DocExporter.java	2006-11-02 19:12:37 UTC (rev 10692)
@@ -105,6 +105,11 @@
     private static final String FTL_TABLES_TABLE_LIST = "doc/tables/table-list.ftl";
 
     /**
+     * Template used for table lists for a specific schema.
+     */
+    private static final String FTL_TABLES_PERSCHEMA_TABLE_LIST = "doc/tables/schema-table-list.ftl";
+
+    /**
      * Template used for schema lists.
      */
     private static final String FTL_TABLES_SCHEMA_LIST = "doc/tables/schema-list.ftl";
@@ -568,7 +573,7 @@
             parameters.put("title", schemaName);
             parameters.put("tableList", docHelper.getTables(schemaName) );
 
-            processTemplate(parameters, FTL_TABLES_TABLE_LIST, file);
+            processTemplate(parameters, FTL_TABLES_PERSCHEMA_TABLE_LIST, file);
         }
     }
 

Modified: branches/Branch_3_2/HibernateExt/tools/src/templates/doc/tables/schema-summary.ftl
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/templates/doc/tables/schema-summary.ftl	2006-11-02 18:59:45 UTC (rev 10691)
+++ branches/Branch_3_2/HibernateExt/tools/src/templates/doc/tables/schema-summary.ftl	2006-11-02 19:12:37 UTC (rev 10692)
@@ -12,7 +12,7 @@
 		<table>
 			<thead>
 				<tr>
-					<th class="MainTableHeading" colspan="2">
+					<th class="MainTableHeading">
 						Tables
 					</th>
 				</tr>
@@ -25,44 +25,6 @@
 								${table.name}
 							</a>
 						</td>
-						<td>
-							<table>
-								<thead>
-									<tr>
-										<th style="width: 50%">
-											Name
-										</th>
-										<th style="width: 30%">
-											SQL Type
-										</th>
-										<th style="width: 15%">
-											Nullable
-										</th>
-										<th style="width: 15%">
-											Unique
-										</th>
-									</tr>
-								</thead>
-								<tbody>
-									<#foreach column in table.columnIterator>
-										<tr>
-											<td>
-												${column.name}
-											</td>
-											<td>
-												${dochelper.getSQLTypeName(column)}
-											</td>
-											<td>
-												${column.nullable?string}
-											</td>
-											<td>
-												${column.unique?string}
-											</td>
-										</tr>
-									</#foreach>
-								</tbody>
-							</table>
-						</td>
 					</tr>
 				</#foreach>
 			</tbody>

Modified: branches/Branch_3_2/HibernateExt/tools/src/templates/doc/tables/summary.ftl
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/templates/doc/tables/summary.ftl	2006-11-02 18:59:45 UTC (rev 10691)
+++ branches/Branch_3_2/HibernateExt/tools/src/templates/doc/tables/summary.ftl	2006-11-02 19:12:37 UTC (rev 10692)
@@ -18,68 +18,26 @@
 			</p>
 		</#if>
 
-		<#foreach schema in dochelper.tablesBySchema.keySet()>
-			<table>
-				<thead>
+		<table>
+			<thead>
+				<tr>
+					<th class="MainTableHeading">
+						Schemas
+					</th>
+				</tr>
+			</thead>
+			<tbody>
+				<#foreach schema in dochelper.tablesBySchema.keySet()>
 					<tr>
-						<th class="MainTableHeading" colspan="2">
-							${schema}
-						</th>
+						<td>
+							<a href="${docFileManager.getRef(docFile, docFileManager.getSchemaSummaryDocFile(schema))}" target="generalFrame">
+								${schema}
+							</a>
+						</td>
 					</tr>
-				</thead>
-				<tbody>
-					<#foreach table in dochelper.getTables(schema)>
-						<tr>
-							<td>
-								<a href="${docFileManager.getRef(docFile, docFileManager.getTableDocFile(table))}" target="generalFrame">
-									${table.name}
-								</a>
-							</td>
-							<td>
-								<table>
-									<thead>
-										<tr>
-											<th style="width: 50%">
-												Name
-											</th>
-											<th style="width: 30%">
-												SQL Type
-											</th>
-											<th style="width: 15%">
-												Nullable
-											</th>
-											<th style="width: 15%">
-												Unique
-											</th>
-										</tr>
-									</thead>
-									<tbody>
-										<#foreach column in table.columnIterator>
-											<tr>
-												<td>
-													<a href="${docFileManager.getRef(docFile, docFileManager.getTableDocFile(table))}#column_detail_${column.name}" target="generalFrame">
-														${column.name}
-													</a>
-												</td>
-												<td>
-													${dochelper.getSQLTypeName(column)}
-												</td>
-												<td>
-													${column.nullable?string}
-												</td>
-												<td>
-													${column.unique?string}
-												</td>
-											</tr>
-										</#foreach>
-									</tbody>
-								</table>
-							</td>
-						</tr>
-					</#foreach>
-				</tbody>
-			</table>
-		</#foreach>
+				</#foreach>
+			</tbody>
+		</table>
 		
 	</body>
 </html>