Updated list style and entity list linking, web.xml now configured on…

… every setup
forge · Aug 10, 2011 · 4e86480 · 4e86480
1 parent 27399c4
commit 4e86480
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 28 deletions.
diff --git a/scaffold-metawidget/src/main/java/org/metawidget/forge/MetawidgetScaffoldBase.java b/scaffold-metawidget/src/main/java/org/metawidget/forge/MetawidgetScaffoldBase.java
@@ -119,6 +119,7 @@ public List<Resource<?>> setup(final boolean overwrite)
       createFacesUtils(false);
       List<Resource<?>> resources = generateIndex(overwrite);
       setupRichFaces(project);
+      setupWebXML(project);
       return resources;
    }
 
@@ -280,7 +281,6 @@ public boolean install()
 
       DependencyFacet df = project.getFacet(DependencyFacet.class);
       CDIFacet cdi = project.getFacet(CDIFacet.class);
-      ServletFacet servlet = project.getFacet(ServletFacet.class);
 
       String version = null;
       for (Dependency dependency : getMetawidgetDependencies()) {
@@ -299,6 +299,25 @@ public boolean install()
          }
       }
 
+      setupWebXML(project);
+
+      if (!df.hasDependency(seamPersist))
+      {
+         df.addDependency(prompt.promptChoiceTyped("Install which version of Seam Persistence?",
+                  df.resolveAvailableVersions(seamPersist)));
+
+         BeansDescriptor config = cdi.getConfig();
+         config.interceptor(SEAM_PERSIST_INTERCEPTOR);
+         cdi.saveConfig(config);
+      }
+      createMetawidgetConfig(false);
+
+      return true;
+   }
+
+   private void setupWebXML(Project project)
+   {
+      ServletFacet servlet = project.getFacet(ServletFacet.class);
       // fixme this needs to be fixed in SHRINKDESC
       WebAppDescriptorImpl webxml = (WebAppDescriptorImpl) servlet.getConfig();
 
@@ -344,19 +363,6 @@ public boolean install()
          webxml.contextParam(PARTIAL_STATE_SAVING, "false");
       }
       servlet.saveConfig(webxml);
-
-      if (!df.hasDependency(seamPersist))
-      {
-         df.addDependency(prompt.promptChoiceTyped("Install which version of Seam Persistence?",
-                  df.resolveAvailableVersions(seamPersist)));
-
-         BeansDescriptor config = cdi.getConfig();
-         config.interceptor(SEAM_PERSIST_INTERCEPTOR);
-         cdi.saveConfig(config);
-      }
-      createMetawidgetConfig(false);
-
-      return true;
    }
 
    @Override

diff --git a/scaffold-metawidget/src/main/resources/org/metawidget/scaffold/list.xhtml b/scaffold-metawidget/src/main/resources/org/metawidget/scaffold/list.xhtml
@@ -38,13 +38,12 @@
 
 		    <ul>
 		    <ui:repeat var="entity" value="#{@{beanName}.list}">
-		        <li>#{entity.id} <h:button outcome="view" value="[view]">
+
+		        <li><h:link outcome="view">
 		            <f:param name="id" value="#{entity.id}"/>
-		        </h:button> 
-
-		        <m:metawidget value="#{entity}" readOnly="#{ 'true' }" />
+		        	<m:metawidget value="#{entity}" readOnly="#{ 'true' }" />
+		        </h:link></li>
 
-		         </li>
 		    </ui:repeat>
 		    </ul>
 

diff --git a/scaffold-metawidget/src/main/resources/org/metawidget/templates/forge-style.css b/scaffold-metawidget/src/main/resources/org/metawidget/templates/forge-style.css
@@ -19,45 +19,57 @@
   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 */
-
 body {
-	font-family : Verdana, Arial, Helvetica, sans-serif;
-	background-image:url(bkg.gif);
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	background-image: url(bkg.gif);
 	background-repeat: repeat-x;
 	color: #5B5B5B;
-	font-family: "Lucida Sans Unicode", "Lucida Grande", Geneva, Verdana, Arial, sans-serif;
+	font-family: "Lucida Sans Unicode", "Lucida Grande", Geneva, Verdana,
+		Arial, sans-serif;
 	margin-top: 100px;
-	text-align:center;
+	text-align: center;
 }
+
 .wrapper {
 	margin-left: auto;
-	margin-right:auto;
-	width:50em;
+	margin-right: auto;
+	width: 50em;
 	text-align: left;
 }
+
 a {
 	text-decoration: none;
 	color: #5e8a9a;
 }
+
 h1 {
 	padding-top: 20px;
 	color: #7b1e1e;
 }
+
+li {
+	list-style: none;
+}
+
 a:hover {
 	text-decoration: underline;
 	color: #8ec6d9;
 }
+
 .content {
 	margin-left: 230px;
 }
+
 .dualbrand {
 	padding-top: 20px;
 }
+
 .forge {
-	float:left;
+	float: left;
 	margin-left: 10px;
 	margin-top: 30px;
 }
+
 .note {
 	font-size: 8pt;
 	color: #aaaaaa;
@@ -69,4 +81,4 @@ a:hover {
 
 .left {
 	float: left;
-}
+}