Author: manaRH
Date: 2012-05-13 17:20:17 -0400 (Sun, 13 May 2012)
New Revision: 14689
Added:
branches/community/Seam_2_3/jboss-seam-gen/dist/view/stylesheet/theme.ecss
Removed:
branches/community/Seam_2_3/jboss-seam-gen/dist/view/stylesheet/theme.xcss
Modified:
branches/community/Seam_2_3/jboss-seam-gen/dist/build.xml
branches/community/Seam_2_3/jboss-seam-gen/dist/view/layout/menu.xhtml
branches/community/Seam_2_3/jboss-seam-gen/dist/view/layout/menu.xhtml.ftl
branches/community/Seam_2_3/jboss-seam-gen/dist/view/layout/template.xhtml
branches/community/Seam_2_3/jboss-seam-gen/dist/view/list.xhtml.ftl
branches/community/Seam_2_3/jboss-seam-gen/dist/view/view.page.xml.ftl
Log:
JBSEAM-4865 richfaces usage in seam-gen updated
Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/build.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-gen/dist/build.xml 2012-05-13
17:12:28 UTC (rev 14688)
+++ branches/community/Seam_2_3/jboss-seam-gen/dist/build.xml 2012-05-13
21:20:17 UTC (rev 14689)
@@ -274,10 +274,10 @@
<equals arg1="${icefaces.new}" arg2="y"/>
</condition>
- <property name="old.richfaces.skin" value="glassX"/>
+ <property name="old.richfaces.skin" value="blueSky"/>
<input addproperty="richfaces.skin.new"
message="Select a RichFaces skin [${old.richfaces.skin}]"
-
validargs="blueSky,classic,darkX,deepMarine,DEFAULT,emeraldTown,glassX,japanCherry,laguna,ruby,wine"
+
validargs="blueSky,emeraldTown,ruby,classic,japanCherry,wine,deepMarine,DEFAULT,plain"
defaultvalue="${old.richfaces.skin}"/>
<property name="old.project.type" value="war"/>
Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/view/layout/menu.xhtml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-gen/dist/view/layout/menu.xhtml
2012-05-13 17:12:28 UTC (rev 14688)
+++ branches/community/Seam_2_3/jboss-seam-gen/dist/view/layout/menu.xhtml
2012-05-13 21:20:17 UTC (rev 14689)
@@ -1,18 +1,18 @@
-<rich:toolBar
+<rich:toolbar
xmlns="http://www.w3.org/1999/xhtml";
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:s="http://jboss.com/products/seam/taglib";
xmlns:rich="http://richfaces.org/rich";>
- <rich:toolBarGroup>
+ <rich:toolbarGroup>
<h:outputText value="#{projectName}:"/>
<s:link id="menuHomeId" view="/home.xhtml" value="Home"
propagation="none"/>
- </rich:toolBarGroup>
+ </rich:toolbarGroup>
<!-- @newMenuItem@ -->
- <rich:toolBarGroup location="right">
+ <rich:toolbarGroup location="right">
<h:outputText id="menuWelcomeId" value="signed in as:
#{credentials.username}" rendered="#{identity.loggedIn}"/>
<s:link id="menuLoginId" view="/login.xhtml" value="Login"
rendered="#{not identity.loggedIn}" propagation="none"/>
<s:link id="menuLogoutId" view="/home.xhtml"
action="#{identity.logout}" value="Logout" rendered="#{identity.loggedIn}"
propagation="none"/>
- </rich:toolBarGroup>
-</rich:toolBar>
+ </rich:toolbarGroup>
+</rich:toolbar>
Modified:
branches/community/Seam_2_3/jboss-seam-gen/dist/view/layout/menu.xhtml.ftl
===================================================================
--- branches/community/Seam_2_3/jboss-seam-gen/dist/view/layout/menu.xhtml.ftl
2012-05-13 17:12:28 UTC (rev 14688)
+++ branches/community/Seam_2_3/jboss-seam-gen/dist/view/layout/menu.xhtml.ftl
2012-05-13 21:20:17 UTC (rev 14689)
@@ -1,14 +1,14 @@
-<rich:toolBar
+<rich:toolbar
xmlns="http://www.w3.org/1999/xhtml";
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:s="http://jboss.com/products/seam/taglib";
xmlns:rich="http://richfaces.org/rich";>
- <rich:toolBarGroup>
+ <rich:toolbarGroup>
<h:outputText value="${'#'}{projectName}:"/>
<s:link id="menuHomeId" view="/home.xhtml" value="Home"
propagation="none"/>
- </rich:toolBarGroup>
+ </rich:toolbarGroup>
<rich:dropDownMenu showDelay="250" hideDelay="0" submitMode="none">
<f:facet name="label">Browse data</f:facet>
<#foreach entity in c2j.getPOJOIterator(cfg.classMappings)>
@@ -22,9 +22,9 @@
</#foreach>
</rich:dropDownMenu>
<!-- @newMenuItem@ -->
- <rich:toolBarGroup location="right">
+ <rich:toolbarGroup location="right">
<h:outputText id="menuWelcomeId" value="signed in as:
${'#'}{credentials.username}" rendered="${'#'}{identity.loggedIn}"/>
<s:link id="menuLoginId" view="/login.xhtml" value="Login"
rendered="${'#'}{not identity.loggedIn}" propagation="none"/>
<s:link id="menuLogoutId" view="/home.xhtml"
action="${'#'}{identity.logout}" value="Logout"
rendered="${'#'}{identity.loggedIn}" propagation="none"/>
- </rich:toolBarGroup>
-</rich:toolBar>
+ </rich:toolbarGroup>
+</rich:toolbar>
Modified:
branches/community/Seam_2_3/jboss-seam-gen/dist/view/layout/template.xhtml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-gen/dist/view/layout/template.xhtml
2012-05-13 17:12:28 UTC (rev 14688)
+++ branches/community/Seam_2_3/jboss-seam-gen/dist/view/layout/template.xhtml
2012-05-13 21:20:17 UTC (rev 14689)
@@ -12,8 +12,8 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<title>@projectName@</title>
<link rel="shortcut icon" href="#{request.contextPath}/favicon.ico"/>
- <a:loadStyle src="/stylesheet/theme.xcss"/>
- <a:loadStyle src="/stylesheet/theme.css"/>
+ <h:outputStylesheet src="/stylesheet/theme.ecss"/>
+ <h:outputStylesheet src="/stylesheet/theme.css"/>
<ui:insert name="head"/>
</head>
<body>
@@ -27,7 +27,7 @@
<ui:insert name="body"/>
</div>
<div class="footer">
- <p>Powered by <a href="http://seamframework.org";>Seam</a>
#{org.jboss.seam.version} and <a
href="http://www.jboss.org/jbossrichfaces";>RichFaces</a>. Generated by
seam-gen.</p>
+ <p>Powered by <a href="http://seamframework.org";>Seam</a>
#{org.jboss.seam.version} and <a
href="http://www.jboss.org/richfaces";>RichFaces</a>. Generated by seam-gen.</p>
<s:fragment rendered="#{init.debug}">
<a:log hotkey="D"/>
<p style="margin-top: -0.5em;">
Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/view/list.xhtml.ftl
===================================================================
--- branches/community/Seam_2_3/jboss-seam-gen/dist/view/list.xhtml.ftl
2012-05-13 17:12:28 UTC (rev 14688)
+++ branches/community/Seam_2_3/jboss-seam-gen/dist/view/list.xhtml.ftl
2012-05-13 21:20:17 UTC (rev 14689)
@@ -19,7 +19,7 @@
<h:form id="${componentName}Search" styleClass="edit">
- <rich:simpleTogglePanel label="${entityName} Search Filter"
switchType="ajax">
+ <rich:collapsiblePanel label="${entityName} Search Filter"
switchType="ajax">
<#assign searchParamNames = []/>
<#foreach property in pojo.allPropertiesIterator>
@@ -55,7 +55,7 @@
</h:selectOneRadio>
</s:decorate>
- </rich:simpleTogglePanel>
+ </rich:collapsiblePanel>
<div class="actionButtons">
<h:commandButton id="search" value="Search"
action="/${listPageName}.xhtml"/>
Added:
branches/community/Seam_2_3/jboss-seam-gen/dist/view/stylesheet/theme.ecss
===================================================================
--- branches/community/Seam_2_3/jboss-seam-gen/dist/view/stylesheet/theme.ecss
(rev 0)
+++ branches/community/Seam_2_3/jboss-seam-gen/dist/view/stylesheet/theme.ecss
2012-05-13 21:20:17 UTC (rev 14689)
@@ -0,0 +1,82 @@
+body{
+ font-family:'#{richSkin.generalFamilyFont}';
+ color:'#{richSkin.generalTextColor}';
+}
+h1{
+ font-family:'#{richSkin.generalFamilyFont}';
+ color:'#{richSkin.tabDisabledTextColor}';
+}
+a:active, a:link, a:visited{
+ color:'#{richSkin.generalLinkColor}';
+}
+a:hover{
+ color:'#{richSkin.hoverLinkColor}';
+}
+input[type=text], input[type=password], textarea, select{
+ background-color:'#{richSkin.controlBackgroundColor}';
+ color:'#{richSkin.controlTextColor}';
+ background-position:left top;
+ background-repeat:repeat-x;
+
background-image:"url(#{resource['org.richfaces.renderkit.html.images.SliderFieldGradient']})";
+ border:1px solid;
+ border-color:'#{richSkin.tableBorderColor}';
+}
+select{
+ background-color:transparent;
+
background-image:"url(#{resource['org.richfaces.renderkit.html.images.SliderFieldGradient']})";
+}
+option{
+ background-color:'#{richSkin.generalBackgroundColor}';
+}
+select[multiple]{
+ background-color:'#{richSkin.controlBackgroundColor}';
+}
+select[multiple] option{
+ background-color:transparent;
+}
+input[type=submit], input[type=button]{
+ padding:1px 4px;
+
background-image:"url(#{resource['org.richfaces.renderkit.html.GradientA']})";
+ border:1px solid;
+ border-color:'#{richSkin.headerBackgroundColor}';
+ color:'#{richSkin.headerTextColor}';
+ font-weight:bold;
+}
+input[type=submit][disabled], input[type=button][disabled]{
+ opacity:0.33;
+}
+* html input[type=submit], * html input[type=button], *+html
input[type=submit], *+html input[type=button]{
+ border:0;
+ font-size:11px;
+}
+.rich-table-subheadercell{
+
background-image:"url(#{resource['org.richfaces.renderkit.images.TabGradientB']})";
+}
+.rich-toolbar a:link, .rich-toolbar a:visited, .rich-toolbar a:active,
.rich-toolbar a:hover{
+ color:'#{richSkin.headerTextColor}';
+}
+.rich-toolbar a:hover{
+ color:'#{richSkin.generalTextColor}';
+}
+.rich-toolbar .rich-menu-item, .rich-toolbar .rich-menu-item a, .rich-toolbar
.rich-menu-item a:hover, .rich-toolbar .rich-menu-item a:visited{
+ color:'#{richSkin.generalTextColor}';
+}
+.rich-table-subheadercell a:hover{
+ color:'#{richSkin.calendarHolidaysTextColor}';
+}
+input[type=text][class*=rich-combobox-button-icon]{
+
background-image:"url(#{resource['org.richfaces.renderkit.html.images.ComboBoxArrowImage']})";
+ background-color:transparent;
+}
+input[type=text][class~=rich-combobox-button-icon-disabled]{
+
background-image:"url(#{resource['org.richfaces.renderkit.html.images.ComboBoxArrowImageDisable']})";
+ background-color:transparent;
+}
+input[type=text][class*=rich-combobox-button-background]{
+
background-image:"url(#{resource['org.richfaces.renderkit.html.images.SpinnerButtonGradient']})";
+ background-color:'#{richSkin.tabBackgroundColor}';
+}
+input[type=text][class~=rich-combobox-button-pressed-background]{
+
background-image:"url(#{resource['org.richfaces.renderkit.html.images.ComboBoxButtonPressGradient']})";
+ background-color:'#{richSkin.tabBackgroundColor}';
+}
Deleted:
branches/community/Seam_2_3/jboss-seam-gen/dist/view/stylesheet/theme.xcss
===================================================================
--- branches/community/Seam_2_3/jboss-seam-gen/dist/view/stylesheet/theme.xcss
2012-05-13 17:12:28 UTC (rev 14688)
+++ branches/community/Seam_2_3/jboss-seam-gen/dist/view/stylesheet/theme.xcss
2012-05-13 21:20:17 UTC (rev 14689)
@@ -1,111 +0,0 @@
-<?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>
- <!-- hack for IE to just get rid of border since it doubles the border
if you use one -->
- <u:selector name="* html input[type=submit], * html input[type=button],
*+html input[type=submit], *+html input[type=button]">
- <u:style name="border" value="0"/>
- <u:style name="font-size" value="11px"/>
- </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-toolbar .rich-menu-item, .rich-toolbar
.rich-menu-item a, .rich-toolbar .rich-menu-item a:hover, .rich-toolbar
.rich-menu-item a:visited">
- <u:style name="color" skin="generalTextColor" />
- </u:selector>
- <u:selector name=".rich-table-subheadercell a:hover">
- <u:style name="color" skin="calendarHolidaysTextColor"/>
- </u:selector>
- <!-- Richfaces styles -->
- <u:selector name="input[type=text][class*=rich-combobox-button-icon]">
- <u:style name="background-image">
- <f:resource
f:key="org.richfaces.renderkit.html.images.ComboBoxArrowImage" />
- </u:style>
- <u:style name="background-color" value="transparent"/>
- </u:selector>
-
- <u:selector
name="input[type=text][class~=rich-combobox-button-icon-disabled]">
- <u:style name="background-image">
- <f:resource
f:key="org.richfaces.renderkit.html.images.ComboBoxArrowImageDisable" />
- </u:style>
- <u:style name="background-color" value="transparent"/>
- </u:selector>
-
- <u:selector
name="input[type=text][class*=rich-combobox-button-background]">
- <u:style name="background-image">
- <f:resource
f:key="org.richfaces.renderkit.html.images.SpinnerButtonGradient"/>
- </u:style>
- <u:style name="background-color" skin="tabBackgroundColor"/>
- </u:selector>
-
- <u:selector
name="input[type=text][class~=rich-combobox-button-pressed-background]">
- <u:style name="background-image">
- <f:resource
f:key="org.richfaces.renderkit.html.images.ComboBoxButtonPressGradient"/>
- </u:style>
- <u:style name="background-color" skin="tabBackgroundColor"/>
- </u:selector>
- <!-- Define static styles in the CDATA block below (you can also move
this block to the top) -->
- <f:verbatim><![CDATA[
-]]></f:verbatim>
-</f:template>
Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/view/view.page.xml.ftl
===================================================================
--- branches/community/Seam_2_3/jboss-seam-gen/dist/view/view.page.xml.ftl
2012-05-13 17:12:28 UTC (rev 14688)
+++ branches/community/Seam_2_3/jboss-seam-gen/dist/view/view.page.xml.ftl
2012-05-13 21:20:17 UTC (rev 14689)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<page xmlns="http://jboss.com/products/seam/pages";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://jboss.com/products/seam/pages
http://jboss.com/products/seam/pages-2.2.xsd";>
+ xsi:schemaLocation="http://jboss.com/products/seam/pages
http://jboss.com/products/seam/pages-2.3.xsd";>
<#assign entityName = pojo.shortName>
<#assign componentName = entityName?uncap_first>
_______________________________________________
seam-commits mailing list
[email protected]
https://lists.jboss.org/mailman/listinfo/seam-commits
