You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ar...@apache.org on 2008/04/23 06:35:10 UTC
svn commit: r650741 - in /myfaces/trinidad/branches/exhibition:
trinidad-examples/trinidad-exhibition/web/src/main/resources/org/apache/myfaces/trinidadexhibition/
trinidad-examples/trinidad-exhibition/web/src/main/webapp/WEB-INF/
trinidad-examples/tri...
Author: arobinson74
Date: Tue Apr 22 21:35:08 2008
New Revision: 650741
URL: http://svn.apache.org/viewvc?rev=650741&view=rev
Log:
Main template styling and the dialog
Icon support for the myfaces skin
Added:
myfaces/trinidad/branches/exhibition/trinidad-skins/myfaces-skin/src/main/java/org/apache/myfaces/trinidad/resource/
myfaces/trinidad/branches/exhibition/trinidad-skins/myfaces-skin/src/main/java/org/apache/myfaces/trinidad/resource/MyFacesSkinImageResourceLoader.java (with props)
myfaces/trinidad/branches/exhibition/trinidad-skins/myfaces-skin/src/main/java/org/apache/myfaces/trinidad/resource/MyFacesSkinResourceLoader.java (with props)
myfaces/trinidad/branches/exhibition/trinidad-skins/myfaces-skin/src/main/resources/META-INF/images/dialog-close.png (with props)
myfaces/trinidad/branches/exhibition/trinidad-skins/myfaces-skin/src/main/resources/META-INF/images/myfaces-logo-with-text-watermark.png (with props)
myfaces/trinidad/branches/exhibition/trinidad-skins/myfaces-skin/src/main/resources/META-INF/servlets/
myfaces/trinidad/branches/exhibition/trinidad-skins/myfaces-skin/src/main/resources/META-INF/servlets/resources/
myfaces/trinidad/branches/exhibition/trinidad-skins/myfaces-skin/src/main/resources/META-INF/servlets/resources/myfaces_skin.resources
Modified:
myfaces/trinidad/branches/exhibition/trinidad-examples/trinidad-exhibition/web/src/main/resources/org/apache/myfaces/trinidadexhibition/BundleMessages.properties
myfaces/trinidad/branches/exhibition/trinidad-examples/trinidad-exhibition/web/src/main/webapp/WEB-INF/facelets/templates/main.xhtml
myfaces/trinidad/branches/exhibition/trinidad-examples/trinidad-exhibition/web/src/main/webapp/WEB-INF/trinidad-config.xml
myfaces/trinidad/branches/exhibition/trinidad-examples/trinidad-exhibition/web/src/main/webapp/WEB-INF/web.xml
myfaces/trinidad/branches/exhibition/trinidad-skins/myfaces-skin/src/main/resources/META-INF/images/footer-bg.png
myfaces/trinidad/branches/exhibition/trinidad-skins/myfaces-skin/src/main/resources/META-INF/images/title-bg-fade.png
myfaces/trinidad/branches/exhibition/trinidad-skins/myfaces-skin/src/main/resources/META-INF/style/myfaces-desktop.css
Modified: myfaces/trinidad/branches/exhibition/trinidad-examples/trinidad-exhibition/web/src/main/resources/org/apache/myfaces/trinidadexhibition/BundleMessages.properties
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/exhibition/trinidad-examples/trinidad-exhibition/web/src/main/resources/org/apache/myfaces/trinidadexhibition/BundleMessages.properties?rev=650741&r1=650740&r2=650741&view=diff
==============================================================================
--- myfaces/trinidad/branches/exhibition/trinidad-examples/trinidad-exhibition/web/src/main/resources/org/apache/myfaces/trinidadexhibition/BundleMessages.properties (original)
+++ myfaces/trinidad/branches/exhibition/trinidad-examples/trinidad-exhibition/web/src/main/resources/org/apache/myfaces/trinidadexhibition/BundleMessages.properties Tue Apr 22 21:35:08 2008
@@ -17,3 +17,4 @@
template_main_about_title=About - Trinidad Exhibition
template_main_about_version=Version:
+copyright=© 2008 The Apache Software Foundation
\ No newline at end of file
Modified: myfaces/trinidad/branches/exhibition/trinidad-examples/trinidad-exhibition/web/src/main/webapp/WEB-INF/facelets/templates/main.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/exhibition/trinidad-examples/trinidad-exhibition/web/src/main/webapp/WEB-INF/facelets/templates/main.xhtml?rev=650741&r1=650740&r2=650741&view=diff
==============================================================================
--- myfaces/trinidad/branches/exhibition/trinidad-examples/trinidad-exhibition/web/src/main/webapp/WEB-INF/facelets/templates/main.xhtml (original)
+++ myfaces/trinidad/branches/exhibition/trinidad-examples/trinidad-exhibition/web/src/main/webapp/WEB-INF/facelets/templates/main.xhtml Tue Apr 22 21:35:08 2008
@@ -45,6 +45,17 @@
width: 100%;
overflow: auto;
}
+.aboutLabel,
+.aboutValue {
+ text-align: left;
+ vertical-align: top;
+}
+.aboutLabel {
+ font-weight: bold;
+}
+.aboutValue {
+ width: 100%;
+}
</style>
</tr:group>
</f:facet>
@@ -54,7 +65,12 @@
layout="positioned"
inlineStyle="height: 99.9%; width: 99.9%; position: absolute; top: 0px; left: 0px;"
topHeight="45px"
- rightWidth="225px">
+ rightWidth="225px"
+ bottomHeight="30px"
+ innerTopHeight="6px"
+ innerRightWidth="6px"
+ innerBottomHeight="6px"
+ innerLeftWidth="6px">
<f:facet name="top">
<tr:group>
<trh:tableLayout
@@ -65,40 +81,48 @@
<h:outputText value=" " escape="false" />
</trh:cellFormat>
<trh:cellFormat
- styleClass="AFTitleBarFade">
- <h:outputText value=" " escape="false" />
- </trh:cellFormat>
- <trh:cellFormat
- inlineStyle="white-space: nowrap;"
- styleClass="AFTitleBar">
- <tr:panelGroupLayout
- layout="horizontal"
- inlineStyle="margin: 0px 6px;">
- <f:facet name="separator">
- <tr:outputText value=" | " escape="false" />
- </f:facet>
- <ui:insert name="globalLinksStart" />
- <tr:panelPopup
- id="aboutDialog"
- text="About"
- modal="true"
- width="450"
- height="300"
- position="centered"
- triggerType="click"
- title="#{msgs.template_main_about_title}">
- <trh:tableLayout
- cellSpacing="4">
- <trh:rowLayout>
- <tr:outputText
- value="#{msgs.template_main_about_version}" />
- <tr:outputText
- value="#{metaData.version}" />
- </trh:rowLayout>
- </trh:tableLayout>
- </tr:panelPopup>
- <ui:insert name="globalLinksEnd" />
- </tr:panelGroupLayout>
+ inlineStyle="width: 100%;">
+ <trh:tableLayout
+ width="100%">
+ <trh:rowLayout>
+ <trh:cellFormat
+ styleClass="AFTitleBarFade">
+ <tr:icon name="AFTitleBarFadeIcon" />
+ </trh:cellFormat>
+ <trh:cellFormat
+ inlineStyle="white-space: nowrap; width: 1px;"
+ styleClass="AFTitleBar">
+ <tr:panelGroupLayout
+ layout="horizontal"
+ inlineStyle="margin: 0px 6px; width: 100%;">
+ <f:facet name="separator">
+ <tr:outputText value=" | " escape="false" />
+ </f:facet>
+ <ui:insert name="globalLinksStart" />
+ <tr:panelPopup
+ id="aboutDialog"
+ text="About"
+ modal="true"
+ width="450"
+ position="centered"
+ triggerType="click"
+ title="#{msgs.template_main_about_title}">
+ <h:panelGrid
+ columns="2"
+ columnClasses="aboutLabel, aboutValue"
+ styleClass="AFLogoWatermark"
+ style="height: 200px; width: 100%;">
+ <tr:outputText
+ value="#{msgs.template_main_about_version}" />
+ <tr:outputText
+ value="#{metaData.version}" />
+ </h:panelGrid>
+ </tr:panelPopup>
+ <ui:insert name="globalLinksEnd" />
+ </tr:panelGroupLayout>
+ </trh:cellFormat>
+ </trh:rowLayout>
+ </trh:tableLayout>
</trh:cellFormat>
</trh:rowLayout>
</trh:tableLayout>
@@ -110,6 +134,16 @@
<ui:insert name="right" />
</div>
</tr:group>
+ </f:facet>
+ <f:facet name="innerTop"><tr:outputText value=" " escape="false" /></f:facet>
+ <f:facet name="innerRight"><tr:outputText value=" " escape="false" /></f:facet>
+ <f:facet name="innerBottom"><tr:outputText value=" " escape="false" /></f:facet>
+ <f:facet name="innerLeft"><tr:outputText value=" " escape="false" /></f:facet>
+ <f:facet name="bottom">
+ <tr:outputText
+ value="#{msgs.copyright}"
+ inlineStyle="display: block;"
+ styleClass="AFPageFooter"/>
</f:facet>
<div
class="templateBody">
Modified: myfaces/trinidad/branches/exhibition/trinidad-examples/trinidad-exhibition/web/src/main/webapp/WEB-INF/trinidad-config.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/exhibition/trinidad-examples/trinidad-exhibition/web/src/main/webapp/WEB-INF/trinidad-config.xml?rev=650741&r1=650740&r2=650741&view=diff
==============================================================================
--- myfaces/trinidad/branches/exhibition/trinidad-examples/trinidad-exhibition/web/src/main/webapp/WEB-INF/trinidad-config.xml (original)
+++ myfaces/trinidad/branches/exhibition/trinidad-examples/trinidad-exhibition/web/src/main/webapp/WEB-INF/trinidad-config.xml Tue Apr 22 21:35:08 2008
@@ -25,9 +25,9 @@
<client-validation>ALERT</client-validation>
-->
<accessibility-mode>#{prefs.accessibilityMode}</accessibility-mode>
- <skin-family>#{prefs.skinFamily}</skin-family>
<!--
- <skin-family>test-myfaces</skin-family>
+ <skin-family>#{prefs.skinFamily}</skin-family>
-->
+ <skin-family>test-myfaces</skin-family>
</trinidad-config>
Modified: myfaces/trinidad/branches/exhibition/trinidad-examples/trinidad-exhibition/web/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/exhibition/trinidad-examples/trinidad-exhibition/web/src/main/webapp/WEB-INF/web.xml?rev=650741&r1=650740&r2=650741&view=diff
==============================================================================
--- myfaces/trinidad/branches/exhibition/trinidad-examples/trinidad-exhibition/web/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/trinidad/branches/exhibition/trinidad-examples/trinidad-exhibition/web/src/main/webapp/WEB-INF/web.xml Tue Apr 22 21:35:08 2008
@@ -170,6 +170,11 @@
<servlet-name>resources</servlet-name>
<url-pattern>/adf/*</url-pattern>
</servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>resources</servlet-name>
+ <url-pattern>/myfaces_skin/*</url-pattern>
+ </servlet-mapping>
<servlet-mapping>
<servlet-name>source</servlet-name>
Added: myfaces/trinidad/branches/exhibition/trinidad-skins/myfaces-skin/src/main/java/org/apache/myfaces/trinidad/resource/MyFacesSkinImageResourceLoader.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/exhibition/trinidad-skins/myfaces-skin/src/main/java/org/apache/myfaces/trinidad/resource/MyFacesSkinImageResourceLoader.java?rev=650741&view=auto
==============================================================================
--- myfaces/trinidad/branches/exhibition/trinidad-skins/myfaces-skin/src/main/java/org/apache/myfaces/trinidad/resource/MyFacesSkinImageResourceLoader.java (added)
+++ myfaces/trinidad/branches/exhibition/trinidad-skins/myfaces-skin/src/main/java/org/apache/myfaces/trinidad/resource/MyFacesSkinImageResourceLoader.java Tue Apr 22 21:35:08 2008
@@ -0,0 +1,48 @@
+/*
+ * 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.
+ */
+package org.apache.myfaces.trinidad.resource;
+
+import java.io.IOException;
+import java.net.URL;
+
+/**
+ * Loads images for the MyFaces skin
+ */
+public class MyFacesSkinImageResourceLoader
+ extends ClassLoaderResourceLoader
+{
+ public MyFacesSkinImageResourceLoader()
+ {
+ super("META-INF/images");
+ }
+
+ /**
+ * @see org.apache.myfaces.trinidad.resource.ClassLoaderResourceLoader#findResource(
+ * java.lang.String)
+ */
+ @Override
+ protected URL findResource(String path) throws IOException
+ {
+ if (path != null && path.startsWith("/myfaces_skin"))
+ {
+ path = path.substring(13);
+ }
+ return super.findResource(path);
+ }
+}
Propchange: myfaces/trinidad/branches/exhibition/trinidad-skins/myfaces-skin/src/main/java/org/apache/myfaces/trinidad/resource/MyFacesSkinImageResourceLoader.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/branches/exhibition/trinidad-skins/myfaces-skin/src/main/java/org/apache/myfaces/trinidad/resource/MyFacesSkinImageResourceLoader.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: myfaces/trinidad/branches/exhibition/trinidad-skins/myfaces-skin/src/main/java/org/apache/myfaces/trinidad/resource/MyFacesSkinResourceLoader.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/exhibition/trinidad-skins/myfaces-skin/src/main/java/org/apache/myfaces/trinidad/resource/MyFacesSkinResourceLoader.java?rev=650741&view=auto
==============================================================================
--- myfaces/trinidad/branches/exhibition/trinidad-skins/myfaces-skin/src/main/java/org/apache/myfaces/trinidad/resource/MyFacesSkinResourceLoader.java (added)
+++ myfaces/trinidad/branches/exhibition/trinidad-skins/myfaces-skin/src/main/java/org/apache/myfaces/trinidad/resource/MyFacesSkinResourceLoader.java Tue Apr 22 21:35:08 2008
@@ -0,0 +1,17 @@
+/**
+ *
+ */
+package org.apache.myfaces.trinidad.resource;
+
+/**
+ *
+ * @author Andrew Robinson
+ */
+public class MyFacesSkinResourceLoader
+ extends RegexResourceLoader
+{
+ public MyFacesSkinResourceLoader()
+ {
+ register("(/.*\\.(jgp|gif|png|jpeg|cur))", new MyFacesSkinImageResourceLoader());
+ }
+}
Propchange: myfaces/trinidad/branches/exhibition/trinidad-skins/myfaces-skin/src/main/java/org/apache/myfaces/trinidad/resource/MyFacesSkinResourceLoader.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/branches/exhibition/trinidad-skins/myfaces-skin/src/main/java/org/apache/myfaces/trinidad/resource/MyFacesSkinResourceLoader.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: myfaces/trinidad/branches/exhibition/trinidad-skins/myfaces-skin/src/main/resources/META-INF/images/dialog-close.png
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/exhibition/trinidad-skins/myfaces-skin/src/main/resources/META-INF/images/dialog-close.png?rev=650741&view=auto
==============================================================================
Binary file - no diff available.
Propchange: myfaces/trinidad/branches/exhibition/trinidad-skins/myfaces-skin/src/main/resources/META-INF/images/dialog-close.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Modified: myfaces/trinidad/branches/exhibition/trinidad-skins/myfaces-skin/src/main/resources/META-INF/images/footer-bg.png
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/exhibition/trinidad-skins/myfaces-skin/src/main/resources/META-INF/images/footer-bg.png?rev=650741&r1=650740&r2=650741&view=diff
==============================================================================
Binary files - no diff available.
Added: myfaces/trinidad/branches/exhibition/trinidad-skins/myfaces-skin/src/main/resources/META-INF/images/myfaces-logo-with-text-watermark.png
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/exhibition/trinidad-skins/myfaces-skin/src/main/resources/META-INF/images/myfaces-logo-with-text-watermark.png?rev=650741&view=auto
==============================================================================
Binary file - no diff available.
Propchange: myfaces/trinidad/branches/exhibition/trinidad-skins/myfaces-skin/src/main/resources/META-INF/images/myfaces-logo-with-text-watermark.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Modified: myfaces/trinidad/branches/exhibition/trinidad-skins/myfaces-skin/src/main/resources/META-INF/images/title-bg-fade.png
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/exhibition/trinidad-skins/myfaces-skin/src/main/resources/META-INF/images/title-bg-fade.png?rev=650741&r1=650740&r2=650741&view=diff
==============================================================================
Binary files - no diff available.
Added: myfaces/trinidad/branches/exhibition/trinidad-skins/myfaces-skin/src/main/resources/META-INF/servlets/resources/myfaces_skin.resources
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/exhibition/trinidad-skins/myfaces-skin/src/main/resources/META-INF/servlets/resources/myfaces_skin.resources?rev=650741&view=auto
==============================================================================
--- myfaces/trinidad/branches/exhibition/trinidad-skins/myfaces-skin/src/main/resources/META-INF/servlets/resources/myfaces_skin.resources (added)
+++ myfaces/trinidad/branches/exhibition/trinidad-skins/myfaces-skin/src/main/resources/META-INF/servlets/resources/myfaces_skin.resources Tue Apr 22 21:35:08 2008
@@ -0,0 +1 @@
+org.apache.myfaces.trinidad.resource.MyFacesSkinResourceLoader
\ No newline at end of file
Modified: myfaces/trinidad/branches/exhibition/trinidad-skins/myfaces-skin/src/main/resources/META-INF/style/myfaces-desktop.css
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/exhibition/trinidad-skins/myfaces-skin/src/main/resources/META-INF/style/myfaces-desktop.css?rev=650741&r1=650740&r2=650741&view=diff
==============================================================================
--- myfaces/trinidad/branches/exhibition/trinidad-skins/myfaces-skin/src/main/resources/META-INF/style/myfaces-desktop.css (original)
+++ myfaces/trinidad/branches/exhibition/trinidad-skins/myfaces-skin/src/main/resources/META-INF/style/myfaces-desktop.css Tue Apr 22 21:35:08 2008
@@ -100,7 +100,7 @@
}
.AFTitleBar {
- background-image: url('../images/title-bg.png');
+ background-image: url(/myfaces_skin/title-bg.png);
background-position: top;
background-repeat: repeat-x;
height: 45px;
@@ -108,18 +108,54 @@
text-align: right;
}
.AFTitleBarLogo {
- background-image: url('../images/myfaces-logo-with-text-small.png');
+ background-image: url(/myfaces_skin/myfaces-logo-with-text-small.png);
background-position: top left;
background-repeat: no-repeat;
height: 45px;
line-height: 45px;
width: 114px;
}
-.AFTitleBarFade {
- background-image: url('../images/title-bg-fade.png');
- background-position: top;
- background-repeat: no-repeat;
+.AFTitleBarFade IMG {
+ /* Use an indirect selector as percentages are not allowed for icons */
height: 45px;
- line-height: 45px;
- width: 150px;
+ width: 100%;
+}
+.AFTitleBarFadeIcon:alias {
+ content: url(/myfaces_skin/title-bg-fade.png);
+}
+.AFLogoWatermark {
+ background-image: url(/myfaces_skin/myfaces-logo-with-text-watermark.png);
+ background-position: center;
+ background-repeat: no-repeat;
+ background-attachment: fixed;
+ background-color: white;
+ color: black;
+}
+.AFPageFooter {
+ height: 30px;
+ line-height: 30px;
+ background-image: url(/myfaces_skin/footer-bg.png);
+ background-position: bottom;
+ background-repeat: repeat-x;
+ color: white;
+ font-size: x-small;
+}
+
+/* panelPopup */
+af|panelPopup::title-bar {
+ background-color: #51822c;
+ border-width: 0px;
+}
+af|panelPopup::title-text {
+ font-weight: bold;
+ color: white;
+}
+af|panelPopup::content {
+ background-color: white;
+}
+af|panelPopup::container {
+ -tr-rule-ref:selector('.AFLightElementBorder:alias');
}
+af|panelPopup::close-icon {
+ content: url(/myfaces_skin/dialog-close.png);
+}
\ No newline at end of file