[seam-commits] Seam SVN: r9135 - in trunk/seam-gen: build-scripts and 14 other directories.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Wed Sep 24 05:49:55 EDT 2008
Author: dan.j.allen
Date: 2008-09-24 05:49:55 -0400 (Wed, 24 Sep 2008)
New Revision: 9135
Added:
trunk/seam-gen/resources/org/
trunk/seam-gen/resources/org/jboss/
trunk/seam-gen/resources/org/jboss/seam/
trunk/seam-gen/resources/org/jboss/seam/ui/
trunk/seam-gen/resources/org/jboss/seam/ui/richfaces/
trunk/seam-gen/resources/org/jboss/seam/ui/richfaces/styles.xcss
trunk/seam-gen/view/favicon.ico
trunk/seam-gen/view/img/msgerror.png
trunk/seam-gen/view/img/msginfo.png
trunk/seam-gen/view/img/msgwarn.png
Modified:
trunk/seam-gen/build-scripts/build-war.xml
trunk/seam-gen/build-scripts/build.xml
trunk/seam-gen/build.xml
trunk/seam-gen/icefaces/view/action.xhtml
trunk/seam-gen/icefaces/view/conversation.xhtml
trunk/seam-gen/icefaces/view/edit.xhtml
trunk/seam-gen/icefaces/view/edit.xhtml.ftl
trunk/seam-gen/icefaces/view/error.xhtml
trunk/seam-gen/icefaces/view/form.xhtml
trunk/seam-gen/icefaces/view/home.xhtml
trunk/seam-gen/icefaces/view/layout/template.xhtml
trunk/seam-gen/icefaces/view/list.xhtml
trunk/seam-gen/icefaces/view/list.xhtml.ftl
trunk/seam-gen/icefaces/view/login.xhtml
trunk/seam-gen/icefaces/view/query.xhtml
trunk/seam-gen/icefaces/view/stylesheet/theme.css
trunk/seam-gen/icefaces/view/view.xhtml.ftl
trunk/seam-gen/src/Authenticator.java
trunk/seam-gen/view/action.xhtml
trunk/seam-gen/view/conversation.xhtml
trunk/seam-gen/view/edit.xhtml
trunk/seam-gen/view/edit.xhtml.ftl
trunk/seam-gen/view/error.xhtml
trunk/seam-gen/view/form.xhtml
trunk/seam-gen/view/home.xhtml
trunk/seam-gen/view/layout/template.xhtml
trunk/seam-gen/view/list.xhtml
trunk/seam-gen/view/list.xhtml.ftl
trunk/seam-gen/view/login.xhtml
trunk/seam-gen/view/query.xhtml
trunk/seam-gen/view/stylesheet/theme.css
trunk/seam-gen/view/view.xhtml.ftl
Log:
Drastically improve the look and feel by taking advantage of RichFaces custom skinning
Move global messages to template to prevent needless repitition (DRY)
Add Seam favicon to application
JBSEAM-2033 Use prettier message styles
Modified: trunk/seam-gen/build-scripts/build-war.xml
===================================================================
--- trunk/seam-gen/build-scripts/build-war.xml 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/build-scripts/build-war.xml 2008-09-24 09:49:55 UTC (rev 9135)
@@ -185,6 +185,12 @@
<include name="groovy-*.jar" if="groovy.present"/>
</fileset>
</copy>
+
+ <copy todir="${war.dir}/WEB-INF/classes">
+ <fileset dir="${basedir}/resources">
+ <include name="**/*.xcss"/>
+ </fileset>
+ </copy>
<copy todir="${war.dir}/WEB-INF/classes">
<fileset dir="${basedir}/resources">
Modified: trunk/seam-gen/build-scripts/build.xml
===================================================================
--- trunk/seam-gen/build-scripts/build.xml 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/build-scripts/build.xml 2008-09-24 09:49:55 UTC (rev 9135)
@@ -127,6 +127,11 @@
</copy>
<copy todir="${war.dir}/WEB-INF/classes">
<fileset dir="${basedir}/resources">
+ <include name="**/*.xcss"/>
+ </fileset>
+ </copy>
+ <copy todir="${war.dir}/WEB-INF/classes">
+ <fileset dir="${basedir}/resources">
<include name="messages*.properties"/>
<include name="*.skin.properties"/>
<include name="*_theme.properties"/>
Modified: trunk/seam-gen/build.xml
===================================================================
--- trunk/seam-gen/build.xml 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/build.xml 2008-09-24 09:49:55 UTC (rev 9135)
@@ -810,6 +810,7 @@
<copy todir="${project.home}/view">
<fileset id="view" dir="${base.dir}/view">
+ <include name="favicon.ico"/>
<include name="home.xhtml"/>
<include name="error.xhtml"/>
<include name="login.xhtml"/>
Modified: trunk/seam-gen/icefaces/view/action.xhtml
===================================================================
--- trunk/seam-gen/icefaces/view/action.xhtml 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/icefaces/view/action.xhtml 2008-09-24 09:49:55 UTC (rev 9135)
@@ -10,8 +10,6 @@
<ui:define name="body">
- <h:messages globalOnly="true" styleClass="message"/>
-
<ice:form id="@componentName at Form">
<ice:panelGroup id="actionFormId" styleClass="formBorderHighlight">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
Modified: trunk/seam-gen/icefaces/view/conversation.xhtml
===================================================================
--- trunk/seam-gen/icefaces/view/conversation.xhtml 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/icefaces/view/conversation.xhtml 2008-09-24 09:49:55 UTC (rev 9135)
@@ -10,8 +10,6 @@
<ui:define name="body">
- <h:messages globalOnly="true" styleClass="message"/>
-
<ice:form id="@componentName at Form">
<ice:panelGroup id="conversationPanelId" styleClass="formBorderHighlight">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
Modified: trunk/seam-gen/icefaces/view/edit.xhtml
===================================================================
--- trunk/seam-gen/icefaces/view/edit.xhtml 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/icefaces/view/edit.xhtml 2008-09-24 09:49:55 UTC (rev 9135)
@@ -10,8 +10,6 @@
<ui:define name="body">
- <h:messages globalOnly="true" styleClass="message"/>
-
<ice:form id="@componentName at EditForm">
<ice:panelGroup id="edit at componentName@Id" styleClass="formBorderHighlight">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
Modified: trunk/seam-gen/icefaces/view/edit.xhtml.ftl
===================================================================
--- trunk/seam-gen/icefaces/view/edit.xhtml.ftl 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/icefaces/view/edit.xhtml.ftl 2008-09-24 09:49:55 UTC (rev 9135)
@@ -16,8 +16,6 @@
<ui:define name="body">
- <h:messages globalOnly="true" styleClass="message" id="globalMessages"/>
-
<ice:form id="${componentName}editForm" styleClass="edit">
<ice:panelGroup id="edit${componentName}GroupId" styleClass="formBorderHighlight">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
Modified: trunk/seam-gen/icefaces/view/error.xhtml
===================================================================
--- trunk/seam-gen/icefaces/view/error.xhtml 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/icefaces/view/error.xhtml 2008-09-24 09:49:55 UTC (rev 9135)
@@ -8,11 +8,11 @@
template="layout/template.xhtml">
<ui:define name="body">
-
+ <ui:param name="showGlobalMessages" value="false"/>
<h1>Error</h1>
<p>Something bad happened :-(</p>
- <h:messages styleClass="message"/>
+ <h:messages id="errorMessage" styleClass="message"/>
</ui:define>
</ui:composition>
Modified: trunk/seam-gen/icefaces/view/form.xhtml
===================================================================
--- trunk/seam-gen/icefaces/view/form.xhtml 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/icefaces/view/form.xhtml 2008-09-24 09:49:55 UTC (rev 9135)
@@ -10,8 +10,6 @@
<ui:define name="body">
- <h:messages globalOnly="true" styleClass="message"/>
-
<ice:form id="@componentName at formId">
<ice:panelGroup id="formSearchGroupId" styleClass="formBorderHighlight">
Modified: trunk/seam-gen/icefaces/view/home.xhtml
===================================================================
--- trunk/seam-gen/icefaces/view/home.xhtml 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/icefaces/view/home.xhtml 2008-09-24 09:49:55 UTC (rev 9135)
@@ -10,8 +10,6 @@
<ui:define name="body">
- <h:messages globalOnly="true" styleClass="message"/>
-
<ice:panelGrid id="homePanelGrid" columns="2" columnClasses="leftMenu,leftMenu">
<img src="img/ICEfaces-logo.gif" alt="Icefaces and Seam: framework demo"/>
<ice:panelGroup id="homePanelGroup">
Modified: trunk/seam-gen/icefaces/view/layout/template.xhtml
===================================================================
--- trunk/seam-gen/icefaces/view/layout/template.xhtml 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/icefaces/view/layout/template.xhtml 2008-09-24 09:49:55 UTC (rev 9135)
@@ -12,10 +12,10 @@
doctypeSystem="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>@projectName@</title>
+ <link rel="shortcut icon" href="favicon.ico"/>
<link rel='stylesheet' type='text/css' href='./xmlhttp/css/rime/rime.css'/>
<link href="stylesheet/theme.css" rel="stylesheet" type="text/css" />
-
-
+ <ui:insert name="head"/>
</head>
<body>
@@ -25,6 +25,8 @@
<ice:outputConnectionStatus activeLabel="requesting..." styleClass="connectionStatus"/>
<div class="body">
+ <h:messages id="messages" globalOnly="true" styleClass="message" rendered="#{showGlobalMessages != 'false'}"
+ errorClass="errormsg" infoClass="infomsg" warnClass="warnmsg"/>
<ui:insert name="body"/>
</div>
Modified: trunk/seam-gen/icefaces/view/list.xhtml
===================================================================
--- trunk/seam-gen/icefaces/view/list.xhtml 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/icefaces/view/list.xhtml 2008-09-24 09:49:55 UTC (rev 9135)
@@ -10,7 +10,6 @@
<ui:define name="body">
- <h:messages globalOnly="true" styleClass="message"/>
<ice:form id="listFormId">
<ice:panelGroup id="listSearchGroupId" styleClass="formBorderHighlight">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
Modified: trunk/seam-gen/icefaces/view/list.xhtml.ftl
===================================================================
--- trunk/seam-gen/icefaces/view/list.xhtml.ftl 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/icefaces/view/list.xhtml.ftl 2008-09-24 09:49:55 UTC (rev 9135)
@@ -19,14 +19,12 @@
<ui:define name="body">
- <h:messages globalOnly="true" styleClass="message" id="globalMessages"/>
-
<ice:form id="list${componentName}FormId" styleClass="edit">
<ice:panelGroup id="searchGroup" styleClass="formBorderHighlight">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td class="iceDatTblColHdr2">
- <ice:outputText id="list${entityName}Id" value="${entityName} search"/>
+ <ice:outputText id="list${entityName}Id" value="${entityName} search filter"/>
</td>
</tr>
</table>
Modified: trunk/seam-gen/icefaces/view/login.xhtml
===================================================================
--- trunk/seam-gen/icefaces/view/login.xhtml 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/icefaces/view/login.xhtml 2008-09-24 09:49:55 UTC (rev 9135)
@@ -10,8 +10,6 @@
<ui:define name="body">
- <h:messages styleClass="message"/>
-
<ice:form id="loginFormId">
<ice:panelGroup id="loginPanelGroupId" styleClass="formBorderHighlight">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
@@ -23,7 +21,7 @@
</table>
- <p>Please login using any username and password</p>
+ <p>Please login with the username <em>admin</em> and a blank password.</p>
<div class="dialog">
<ice:panelGrid id="loginPanelGridId" columns="2" rowClasses="prop" columnClasses="name,value">
Modified: trunk/seam-gen/icefaces/view/query.xhtml
===================================================================
--- trunk/seam-gen/icefaces/view/query.xhtml 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/icefaces/view/query.xhtml 2008-09-24 09:49:55 UTC (rev 9135)
@@ -13,7 +13,6 @@
<h1>@beanName@ results</h1>
<p>Generated query page</p>
- <h:messages globalOnly="true" styleClass="message"/>
<ice:form id="queryFormId">
<ice:outputText value="No results from search"
id="queryOutputTextId"
Modified: trunk/seam-gen/icefaces/view/stylesheet/theme.css
===================================================================
--- trunk/seam-gen/icefaces/view/stylesheet/theme.css 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/icefaces/view/stylesheet/theme.css 2008-09-24 09:49:55 UTC (rev 9135)
@@ -33,11 +33,15 @@
.error {
- color: red;
- border: solid red;
- padding: .4em;
- margin: 10px
+ padding: 5px;
}
+.errors {
+ color: red;
+ vertical-align: middle;
+}
+img.errors {
+ padding-right: 5px;
+}
.formBorderHighlight{
vertical-align: top; /*width: 100%;*/
@@ -48,14 +52,14 @@
.menuButtons {
font-size: 12px;
font-weight: bold;
- border-colour: #bed6f8;
+ border-color: #bed6f8;
/* background-color: #BED6F8; */
background-position: top left;
}
.menuButtons a {
font-size: 11px;
- colour: #000000;
+ color: #000000;
font-weight: bold;
font-family: Arial, Verdana, sans-serif;
text-decoration: none;
@@ -245,13 +249,38 @@
}
.message {
- border: 1px solid #FFCC00;
padding: 5px;
- margin-top: 5px;
- margin-bottom: 5px;
- background-color: #F0F0F0;
+ list-style: none;
+ border: 0;
+ background: none;
+ padding: 0;
+ color: #000000;
+ margin: 5px 0 8px 0;
+ font-size: 12px;
}
+.message li {
+ margin-left: 3px;
+}
+
+.message li span {
+ background: no-repeat left center;
+ padding-top: 1px;
+ padding-left: 20px;
+}
+
+.message li span.infomsg {
+ background-image: url(../img/msginfo.png);
+}
+
+.message li span.errormsg {
+ background-image: url(../img/msgerror.png);
+}
+
+.message li span.warnmsg {
+ background-image: url(../img/msgwarn.png);
+}
+
.prop {
padding: 5px;
display: block;
@@ -277,7 +306,7 @@
}*/
.errors input, .errors textarea {
- border: 1px solid red;
+ border: 1px solid red !important;
}
.contentLayoutGridStyleLogin {
Modified: trunk/seam-gen/icefaces/view/view.xhtml.ftl
===================================================================
--- trunk/seam-gen/icefaces/view/view.xhtml.ftl 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/icefaces/view/view.xhtml.ftl 2008-09-24 09:49:55 UTC (rev 9135)
@@ -16,8 +16,6 @@
<ui:define name="body">
- <h:messages globalOnly="true" styleClass="message" id="globalMessages"/>
-
<ice:panelGroup id="view${homeName}PanelGroupId" styleClass="formBorderHighlight">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
Added: trunk/seam-gen/resources/org/jboss/seam/ui/richfaces/styles.xcss
===================================================================
--- trunk/seam-gen/resources/org/jboss/seam/ui/richfaces/styles.xcss (rev 0)
+++ trunk/seam-gen/resources/org/jboss/seam/ui/richfaces/styles.xcss 2008-09-24 09:49:55 UTC (rev 9135)
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<f:template xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:f="http:/jsf.exadel.com/template"
+ xmlns:u="http:/jsf.exadel.com/template/util">
+ <u:selector name="body">
+ <u:style name="font-family" skin="generalFamilyFont"/>
+ <u:style name="color" skin="generalTextColor"/>
+ </u:selector>
+ <u:selector name="h1">
+ <u:style name="font-family" skin="generalFamilyFont"/>
+ <u:style name="color" skin="tabDisabledTextColor"/>
+ </u:selector>
+ <u:selector name="a:active, a:link, a:visited">
+ <u:style name="color" skin="generalLinkColor"/>
+ </u:selector>
+ <u:selector name="a:hover">
+ <u:style name="color" skin="hoverLinkColor"/>
+ </u:selector>
+ <u:selector name="input[type='text'], input[type='password'], textarea, select">
+ <u:style name="background-color" skin="controlBackgroundColor"/>
+ <u:style name="color" skin="controlTextColor"/>
+ <u:style name="background-position" value="left top"/>
+ <u:style name="background-repeat" value="repeat-x"/>
+ <u:style name="background-image">
+ <f:resource f:key="org.richfaces.renderkit.html.images.SliderFieldGradient"/>
+ </u:style>
+ <u:style name="border" value="1px solid"/>
+ <u:style name="border-color" skin="tableBorderColor" />
+ </u:selector>
+ <u:selector name="select">
+ <u:style name="background-color" value="transparent"/>
+ <u:style name="background-image">
+ <f:resource f:key="org.richfaces.renderkit.html.images.SliderFieldGradient"/>
+ </u:style>
+ </u:selector>
+ <u:selector name="option">
+ <u:style name="background-color" skin="generalBackgroundColor"/>
+ </u:selector>
+ <u:selector name="select[multiple]">
+ <u:style name="background-color" skin="controlBackgroundColor"/>
+ </u:selector>
+ <u:selector name="select[multiple] option">
+ <u:style name="background-color" value="transparent"/>
+ </u:selector>
+ <u:selector name="input[type='submit'], input[type='button']">
+ <u:style name="padding" value="1px 4px"/>
+ <u:style name="background-image">
+ <f:resource f:key="org.richfaces.renderkit.html.GradientA"/>
+ </u:style>
+ <u:style name="border" value="1px solid"/>
+ <u:style name="border-color" skin="headerBackgroundColor"/>
+ <u:style name="color" skin="headerTextColor"/>
+ <u:style name="font-weight" value="bold"/>
+ </u:selector>
+ <u:selector name="input[type='submit'][disabled], input[type='button'][disabled]">
+ <u:style name="opacity" value="0.33"/>
+ </u:selector>
+ <u:selector name=".rich-table-subheadercell">
+ <u:style name="background-image">
+ <f:resource f:key="org.richfaces.renderkit.images.TabGradientB"/>
+ </u:style>
+ </u:selector>
+ <u:selector name=".rich-toolbar a:link, .rich-toolbar a:visited, .rich-toolbar a:active, .rich-toolbar a:hover">
+ <u:style name="color" skin="headerTextColor"/>
+ </u:selector>
+ <u:selector name=".rich-toolbar a:hover">
+ <u:style name="color" skin="generalTextColor"/>
+ </u:selector>
+ <!--
+ <u:selector name=".rich-table-subheadercell a:link, .rich-table-subheadercell a:visited, .rich-table-subheadercell a:active">
+ <u:style name="color" skin="generalTextColor"/>
+ </u:selector>
+ -->
+ <u:selector name=".rich-table-subheadercell a:hover">
+ <u:style name="color" skin="calendarHolidaysTextColor"/>
+ </u:selector>
+</f:template>
Modified: trunk/seam-gen/src/Authenticator.java
===================================================================
--- trunk/seam-gen/src/Authenticator.java 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/src/Authenticator.java 2008-09-24 09:49:55 UTC (rev 9135)
@@ -22,7 +22,11 @@
//write your authentication logic here,
//return true if the authentication was
//successful, false otherwise
- identity.addRole("admin");
- return true;
+ if ("admin".equals(credentials.getUsername()))
+ {
+ identity.addRole("admin");
+ return true;
+ }
+ return false;
}
}
Modified: trunk/seam-gen/view/action.xhtml
===================================================================
--- trunk/seam-gen/view/action.xhtml 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/view/action.xhtml 2008-09-24 09:49:55 UTC (rev 9135)
@@ -11,8 +11,6 @@
<ui:define name="body">
- <h:messages globalOnly="true" styleClass="message"/>
-
<rich:panel>
<f:facet name="header">@pageName@</f:facet>
Modified: trunk/seam-gen/view/conversation.xhtml
===================================================================
--- trunk/seam-gen/view/conversation.xhtml 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/view/conversation.xhtml 2008-09-24 09:49:55 UTC (rev 9135)
@@ -10,8 +10,6 @@
<ui:define name="body">
- <h:messages globalOnly="true" styleClass="message"/>
-
<rich:panel>
<f:facet name="header">@pageName@</f:facet>
Modified: trunk/seam-gen/view/edit.xhtml
===================================================================
--- trunk/seam-gen/view/edit.xhtml 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/view/edit.xhtml 2008-09-24 09:49:55 UTC (rev 9135)
@@ -10,8 +10,6 @@
<ui:define name="body">
- <h:messages globalOnly="true" styleClass="message"/>
-
<h:form id="@componentName at Form">
<rich:panel>
Modified: trunk/seam-gen/view/edit.xhtml.ftl
===================================================================
--- trunk/seam-gen/view/edit.xhtml.ftl 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/view/edit.xhtml.ftl 2008-09-24 09:49:55 UTC (rev 9135)
@@ -17,8 +17,6 @@
<ui:define name="body">
- <h:messages globalOnly="true" styleClass="message" id="globalMessages"/>
-
<h:form id="${componentName}" styleClass="edit">
<rich:panel>
Modified: trunk/seam-gen/view/error.xhtml
===================================================================
--- trunk/seam-gen/view/error.xhtml 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/view/error.xhtml 2008-09-24 09:49:55 UTC (rev 9135)
@@ -8,11 +8,12 @@
template="layout/template.xhtml">
<ui:define name="body">
+ <ui:param name="showGlobalMessages" value="false"/>
<h1>Error</h1>
<p>Something bad happened :-(</p>
- <h:messages styleClass="message"/>
+ <h:messages id="errorMessage" styleClass="message"/>
</ui:define>
</ui:composition>
Added: trunk/seam-gen/view/favicon.ico
===================================================================
(Binary files differ)
Property changes on: trunk/seam-gen/view/favicon.ico
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/seam-gen/view/form.xhtml
===================================================================
--- trunk/seam-gen/view/form.xhtml 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/view/form.xhtml 2008-09-24 09:49:55 UTC (rev 9135)
@@ -11,8 +11,6 @@
<ui:define name="body">
- <h:messages globalOnly="true" styleClass="message"/>
-
<h:form id="@componentName at Form">
<rich:panel>
Modified: trunk/seam-gen/view/home.xhtml
===================================================================
--- trunk/seam-gen/view/home.xhtml 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/view/home.xhtml 2008-09-24 09:49:55 UTC (rev 9135)
@@ -10,8 +10,6 @@
<ui:define name="body">
- <h:messages globalOnly="true" styleClass="message"/>
-
<rich:panel>
<f:facet name="header">Welcome!</f:facet>
<p>This empty shell application includes:</p>
Added: trunk/seam-gen/view/img/msgerror.png
===================================================================
(Binary files differ)
Property changes on: trunk/seam-gen/view/img/msgerror.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/seam-gen/view/img/msginfo.png
===================================================================
(Binary files differ)
Property changes on: trunk/seam-gen/view/img/msginfo.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/seam-gen/view/img/msgwarn.png
===================================================================
(Binary files differ)
Property changes on: trunk/seam-gen/view/img/msgwarn.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/seam-gen/view/layout/template.xhtml
===================================================================
--- trunk/seam-gen/view/layout/template.xhtml 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/view/layout/template.xhtml 2008-09-24 09:49:55 UTC (rev 9135)
@@ -5,23 +5,19 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a="http://richfaces.org/a4j"
xmlns:s="http://jboss.com/products/seam/taglib">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>@projectName@</title>
+ <link rel="shortcut icon" href="favicon.ico"/>
+ <a:loadStyle src="resource:///org/jboss/seam/ui/richfaces/styles.xcss"/>
+ <a:loadStyle src="/stylesheet/theme.css"/>
+ <ui:remove><!-- Disable the a:loadStyle tags and enable the link tag to use plain setup -->
<link href="stylesheet/theme.css" rel="stylesheet" type="text/css" />
- <script type="text/javascript">
- A4J.AJAX.onError = function(req,status,message)
- {
-
- if (status == 503)
- {
- alert(message);
- }
-
- };
- </script>
+ </ui:remove>
+ <ui:insert name="head"/>
</head>
<body>
@@ -31,6 +27,9 @@
</ui:include>
<div class="body">
+ <h:messages id="messages" globalOnly="true" styleClass="message"
+ errorClass="errormsg" infoClass="infomsg" warnClass="warnmsg"
+ rendered="#{showGlobalMessages != 'false'}"/>
<ui:insert name="body"/>
</div>
Modified: trunk/seam-gen/view/list.xhtml
===================================================================
--- trunk/seam-gen/view/list.xhtml 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/view/list.xhtml 2008-09-24 09:49:55 UTC (rev 9135)
@@ -10,8 +10,6 @@
<ui:define name="body">
- <h:messages globalOnly="true" styleClass="message"/>
-
<rich:panel>
<f:facet name="header">@masterPageName@</f:facet>
Modified: trunk/seam-gen/view/list.xhtml.ftl
===================================================================
--- trunk/seam-gen/view/list.xhtml.ftl 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/view/list.xhtml.ftl 2008-09-24 09:49:55 UTC (rev 9135)
@@ -19,11 +19,9 @@
<ui:define name="body">
- <h:messages globalOnly="true" styleClass="message" id="globalMessages"/>
-
<h:form id="${componentName}Search" styleClass="edit">
- <rich:simpleTogglePanel label="${entityName} search parameters" switchType="ajax">
+ <rich:simpleTogglePanel label="${entityName} search filter" switchType="ajax">
<#foreach property in pojo.allPropertiesIterator>
<#if !c2h.isCollection(property) && !util.isToOne(property) && property != pojo.versionProperty!>
Modified: trunk/seam-gen/view/login.xhtml
===================================================================
--- trunk/seam-gen/view/login.xhtml 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/view/login.xhtml 2008-09-24 09:49:55 UTC (rev 9135)
@@ -10,8 +10,6 @@
<ui:define name="body">
- <h:messages styleClass="message"/>
-
<h:form id="login">
<rich:panel>
@@ -34,7 +32,7 @@
</div>
<p>
- <i>Note - </i> You may login using any username/password combination.
+ <i>Note - </i> You may login with the username <em>admin</em> and a blank password.
</p>
</rich:panel>
Modified: trunk/seam-gen/view/query.xhtml
===================================================================
--- trunk/seam-gen/view/query.xhtml 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/view/query.xhtml 2008-09-24 09:49:55 UTC (rev 9135)
@@ -12,8 +12,6 @@
<h1>@beanName@ results</h1>
<p>Generated query page</p>
- <h:messages globalOnly="true" styleClass="message"/>
-
<h:outputText value="No results from search"
rendered="#{empty @componentName at .resultList}"/>
<f:subview id="results" rendered="#{not empty @componentName at .resultList}">
Modified: trunk/seam-gen/view/stylesheet/theme.css
===================================================================
--- trunk/seam-gen/view/stylesheet/theme.css 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/view/stylesheet/theme.css 2008-09-24 09:49:55 UTC (rev 9135)
@@ -1,117 +1,176 @@
+html {
+ overflow-y: scroll;
+}
+
body {
- font-size: 12px;
+ font-size: 12px;
+ margin: 0px;
}
-a:active, a:link, a:visited {
- color: #0D5798;
+a img {
+ border: none;
}
-a:hover {
- color: #8CAFCD;
-}
-input, textarea {
- border: 1px solid #BBBBBB;
- font-size: 10px;
- background: #F0F8FF;
- color: black;
+h1 {
+ font-size: 1.6em;
+ margin-top: 0;
}
input[type='submit'], input[type='button'] {
- background: #4477AA;
- color: white;
- margin: 5px;
- border-color: gray;
+ font-size: 10px;
+ margin: 5px 5px 5px 0;
+ cursor: pointer;
}
+input[type='text'], input[type='password'], textarea {
+ font-size: 11px;
+ padding-left: 1px;
+}
+
.tableControl, .actionButtons {
- width: 100%;
+ width: 100%;
}
.tableControl a {
- padding-left: 10px;
+ padding-left: 10px;
}
.tableControl {
- text-align: right;
+ text-align: right;
}
.footer {
- text-align: center;
- font-size: 10px;
+ text-align: center;
+ font-size: 11px;
+ margin-bottom: 10px;
}
.rich-table {
- width:100%;
+ width: 100%;
}
-h1 {
- font-family: Arial,sans-serif;
- color: #578BB8;
- font-size: 1.6em;
- margin-top: 0;
+.body {
+ padding: 30px;
}
-body {
- margin: 0px;
- font-family: Arial,sans-serif;
- color: #616161;
+.columnHeader:hover {
+ color: #FF6600;
}
-.body {
- padding: 30px;
+.message {
+ padding: 5px;
+ list-style: none;
+ border: 0;
+ background: none;
+ padding: 0;
+ color: #000000;
+ margin: 5px 0 8px 0;
+ font-size: 12px;
}
-.columnHeader:hover
-{
- color: #FF6600;
+.message li {
+ background: no-repeat left center;
+ padding-top: 1px;
+ padding-left: 20px;
+ margin-left: 3px;
}
-.message {
- border: 1px solid #FFCC00;
- padding: 5px;
- margin-top: 5px;
- margin-bottom: 5px;
- background-color: #F0F8FF;
- font-size: 12px;
+.message li.infomsg {
+ background-image: url(../img/msginfo.png);
}
+.message li.errormsg {
+ background-image: url(../img/msgerror.png);
+}
+
+.message li.warnmsg {
+ background-image: url(../img/msgwarn.png);
+}
+
.name {
- vertical-align: top;
- font-weight: bold;
- width: 115px;
- float: left;
- padding: 5px;
- margin-top: 3px;
- clear: left;
+ vertical-align: top;
+ font-weight: bold;
+ width: 115px;
+ float: left;
+ padding: 5px;
+ margin-top: 3px;
+ clear: left;
}
+
.value {
- float: left;
- padding: 5px;
+ float: left;
+ padding: 5px;
}
.error {
- float: left;
- padding: 5px;
+ float: left;
+ padding: 5px;
}
+
.errors {
- color: red;
- vertical-align: middle;
+ color: red;
+ vertical-align: middle;
}
+
img.errors {
- padding-right: 5px;
+ padding-right: 5px;
}
-.errors input {
- border: 1px solid red;
+
+.errors input, .errors textarea {
+ border: 1px solid red !important;
}
-.errors textarea {
- border: 1px solid red;
-}
.required {
- color: red;
- padding-left: 2px;
+ color: red;
+ padding-left: 2px;
}
.rich-stglpanel-body {
- overflow: auto;
+ overflow: auto;
+}
+
+/* the specificity here is necessary to override the defaults */
+.rich-panel .rich-panel-header,
+.rich-stglpanel .rich-stglpanel-header {
+ padding: 2px 3px;
}
+
+
+select {
+ font-size: 12px;
+}
+
+.rich-panel input[type='submit'], .rich-panel input[type='button'],
+.rich-tabpanel input[type='submit'], .rich-tabpanel input[type='button'] {
+ margin-bottom: 0;
+}
+
+.tableControl input[type='submit'], .tableControl input[type='button'], .tableControl select {
+ margin: 5px 0 5px 5px;
+}
+
+/* I don't know why this is necessary, but the select is off by a pixel on the top and is padding too much on the left */
+.tableControl select {
+ margin-left: 2px;
+ position: relative;
+ top: 1px;
+}
+
+.actionButtons {
+ padding-left: 1px;
+}
+
+.actionButtons select {
+ margin: 5px 5px 5px 0;
+ vertical-align: bottom;
+}
+
+.rich-datalist {
+ list-style: square;
+ margin: 6px 0 1px 0;
+ padding-left: 18px;
+}
+
+.rich-list-item {
+ padding-bottom: 4px;
+}
Modified: trunk/seam-gen/view/view.xhtml.ftl
===================================================================
--- trunk/seam-gen/view/view.xhtml.ftl 2008-09-24 09:23:15 UTC (rev 9134)
+++ trunk/seam-gen/view/view.xhtml.ftl 2008-09-24 09:49:55 UTC (rev 9135)
@@ -16,8 +16,6 @@
<ui:define name="body">
- <h:messages globalOnly="true" styleClass="message" id="globalMessages"/>
-
<rich:panel>
<f:facet name="header">${entityName}</f:facet>
<#foreach property in pojo.allPropertiesIterator>
More information about the seam-commits
mailing list