You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ck...@apache.org on 2010/05/07 15:48:50 UTC
svn commit: r942072 [4/4] - in
/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main:
java/org/apache/myfaces/trinidaddemo/components/buttonsAndLinks/commandButton/
java/org/apache/myfaces/trinidaddemo/compon...
Added: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/column/columnStart.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/column/columnStart.xhtml?rev=942072&view=auto
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/column/columnStart.xhtml (added)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/column/columnStart.xhtml Fri May 7 13:48:46 2010
@@ -0,0 +1,58 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:tr="http://myfaces.apache.org/trinidad"
+ template="/pages/componentDemo.xhtml">
+
+ <ui:define name="demoContent">
+
+ <tr:outputText value="The monarchs of England, from House of Stuart(restored) are:"/>
+ <tr:spacer height="15px"/>
+ <tr:table width="100%" emptyText="No data available." value="#{tableColumn.monarchs}" var="row">
+ <tr:column align="start">
+ <f:facet name="header">
+ <tr:outputText value="Id"/>
+ </f:facet>
+ <tr:outputText value="#{row.id}"/>
+ </tr:column>
+ <tr:column align="start">
+ <f:facet name="header">
+ <tr:outputText value="Name"/>
+ </f:facet>
+ <tr:outputText value="#{row.name}"/>
+ </tr:column>
+ <tr:column align="start">
+ <f:facet name="header">
+ <tr:outputText value="Birth"/>
+ </f:facet>
+ <tr:outputText value="#{row.birth}"/>
+ </tr:column>
+ <tr:column align="start">
+ <f:facet name="header">
+ <tr:outputText value="Death"/>
+ </f:facet>
+ <tr:outputText value="#{row.death}"/>
+ </tr:column>
+ </tr:table>
+
+ </ui:define>
+</ui:composition>
Added: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/table/tableGridLines.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/table/tableGridLines.xhtml?rev=942072&view=auto
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/table/tableGridLines.xhtml (added)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/table/tableGridLines.xhtml Fri May 7 13:48:46 2010
@@ -0,0 +1,58 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:tr="http://myfaces.apache.org/trinidad"
+ template="/pages/componentDemo.xhtml">
+
+ <ui:define name="demoContent">
+
+ <tr:outputText value="The monarchs of England, from House of Stuart(restored) are:"/>
+ <tr:spacer height="15px"/>
+ <tr:table width="100%" emptyText="No data available." value="#{tableColumn.monarchs}" var="row">
+ <tr:column >
+ <f:facet name="header">
+ <tr:outputText value="Id"/>
+ </f:facet>
+ <tr:outputText value="#{row.id}"/>
+ </tr:column>
+ <tr:column>
+ <f:facet name="header">
+ <tr:outputText value="Name"/>
+ </f:facet>
+ <tr:outputText value="#{row.name}"/>
+ </tr:column>
+ <tr:column>
+ <f:facet name="header">
+ <tr:outputText value="Birth"/>
+ </f:facet>
+ <tr:outputText value="#{row.birth}"/>
+ </tr:column>
+ <tr:column>
+ <f:facet name="header">
+ <tr:outputText value="Death"/>
+ </f:facet>
+ <tr:outputText value="#{row.death}"/>
+ </tr:column>
+ </tr:table>
+
+ </ui:define>
+</ui:composition>
Modified: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/skins/layout.css
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/skins/layout.css?rev=942072&r1=942071&r2=942072&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/skins/layout.css (original)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/skins/layout.css Fri May 7 13:48:46 2010
@@ -699,10 +699,12 @@ code {
}
#page_bar ul {
margin: 0;
+ padding: 0;
}
#page_bar a {
display: block;
color: #E4E3E2;
+ font-family: Helvetica Neue, Helvetica, Arial, sans-serif;
background: #8B8580 url("/skins/slices/menu.png") no-repeat bottom right;
}
@agent ie and (version: 5), ie and (version: 6), ie and (version: 7) {
@@ -727,6 +729,8 @@ code {
border-bottom: 1px solid #7B7773;
padding: 7px 12px;
white-space: nowrap;
+ line-height: 1em;
+ font-family: Helvetica Neue, Helvetica, Arial, sans-serif;
}
#page_bar a:hover span {
border-top: 1px solid #88847F;
@@ -984,7 +988,7 @@ code {
height: 50px;
width: 150px;
overflow: hidden;
- background: url("/components/panel/panelPageHeader/corporateBrand.gif") no-repeat top left;
+ background: url("/resources/corporateBrand.gif") no-repeat top left;
}
/* ------------------------------------------------------------------------------------------------------------------ */