You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2010/01/28 19:08:38 UTC
svn commit: r904189 - in
/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp:
./ WEB-INF/ WEB-INF/java/org/apache/myfaces/javaloader/test/ resources/img/
resources/styles/
Author: werpu
Date: Thu Jan 28 18:08:37 2010
New Revision: 904189
URL: http://svn.apache.org/viewvc?rev=904189&view=rev
Log:
https://issues.apache.org/jira/browse/EXTSCRIPT-52
styling works
Added:
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/resources/img/license.txt (with props)
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/resources/img/sig07-009_mac.jpg
Modified:
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestValidator.java
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/web.xml
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/helloWorld.xhtml
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/javablog.xhtml
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/resources/styles/main.css
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/template.xhtml
Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestValidator.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestValidator.java?rev=904189&r1=904188&r2=904189&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestValidator.java (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestValidator.java Thu Jan 28 18:08:37 2010
@@ -23,6 +23,7 @@
* @version $Revision$ $Date$
*/
-
+ aaa
public class TestValidator {
+
}
Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/web.xml?rev=904189&r1=904188&r2=904189&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/web.xml Thu Jan 28 18:08:37 2010
@@ -30,8 +30,7 @@
<param-name>org.apache.myfaces.FACES_INIT_PLUGINS</param-name>
<param-value>org.apache.myfaces.scripting.servlet.StartupServletContextPluginChainLoader</param-value>
</context-param>
- <!--
-
+
<context-param>
<description>Additional comma separated loader paths to allow direct editing on the sources directory instead
@@ -69,7 +68,6 @@
<param-name>facelets.RESOURCE_RESOLVER</param-name>
<param-value>org.apache.myfaces.scripting.facelet.ReroutingResourceResolver</param-value>
</context-param>
- -->
<!--
<context-param>
<description>Additional comma separated loader paths to allow direct editing on the sources directory instead
Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/helloWorld.xhtml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/helloWorld.xhtml?rev=904189&r1=904188&r2=904189&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/helloWorld.xhtml (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/helloWorld.xhtml Thu Jan 28 18:08:37 2010
@@ -9,43 +9,47 @@
<body>
<ui:composition template="/template.xhtml">
<ui:define name="body">
- <h:form id="form">
- <h:panelGrid id="grid" columns="1">
- <h:panelGroup styleClass="stdBox">
- <h3>Validator Test 1</h3>
- <h:outputText id="output1" value="Please enter your name"/>
- <h:inputText id="input1" value="#{helloWorld.name}" required="true">
- <grv:groovyvalidator/>
- </h:inputText>
- <h:commandButton id="button1" value="press me" action="#{helloWorld.send}"/>
+ <h:form id="form" style="position: relative;">
+
+ <h:panelGroup styleClass="left">
+ <h:panelGroup styleClass="stdBox">
+ <h3>Validator Test 1</h3>
+ <h:outputText id="output1" value="Please enter your name"/>
+ <h:inputText id="input1" value="#{helloWorld.name}" required="true">
+ <grv:groovyvalidator/>
+ </h:inputText>
+ <h:commandButton id="button1" value="press me" action="#{helloWorld.send}"/>
+ </h:panelGroup>
+ <h:panelGroup styleClass="stdBox">
+ <h3>Groovy Component</h3>
+ <grv:testcomponent/>
+ <h:message id="message1" for="input1"/>
+ </h:panelGroup>
+ </h:panelGroup>
+ <h:panelGroup styleClass="right">
+ <h:panelGroup styleClass="stdBox">
+ <h3>Bean Tests</h3>
+ <h:outputFormat value="#{testbean.xxx}"/>
+ <br/>
+ <h:outputFormat value="#{javatestbean.sayHello}"/>
+ </h:panelGroup>
+ <h:panelGroup styleClass="stdBox">
+ <h3>Converter Test 1</h3>
+ <h:inputText>
+ <grv:testConverter1/>
+ <grv:testValidator1/>
+ </h:inputText>
+ </h:panelGroup>
+ <h:panelGroup styleClass="stdBox">
+ <h3>Action Test 1</h3>
+ <h:commandButton value="Press me dynamic" action="#{testbean.doit}"/>
+ </h:panelGroup>
+ <h:panelGroup styleClass="stdBox">
+ <h3>Java Component</h3>
+ <grv:testcomponent2 testAttr="vvv" testAttr2="zzz"/>
+ </h:panelGroup>
</h:panelGroup>
- <h:panelGroup styleClass="stdBox">
- <h3>Groovy Component</h3>
- <grv:testcomponent/>
- <h:message id="message1" for="input1"/>
- </h:panelGroup>
- <h:panelGroup styleClass="stdBox">
- <h3>Bean Tests</h3>
- <h:outputFormat value="#{testbean.xxx}"/>
- <br/>
- <h:outputFormat value="#{javatestbean.sayHello}"/>
- </h:panelGroup>
- <h:panelGroup styleClass="stdBox">
- <h3>Converter Test 1</h3>
- <h:inputText>
- <grv:testConverter1/>
- <grv:testValidator1/>
- </h:inputText>
- </h:panelGroup>
- <h:panelGroup styleClass="stdBox">
- <h3>Action Test 1</h3>
- <h:commandButton value="Press me dynamic" action="#{testbean.doit}"/>
- </h:panelGroup>
- <h:panelGroup styleClass="stdBox">
- <h3>Java Component</h3>
- <grv:testcomponent2 testAttr="vvv" testAttr2="zzz"/>
- </h:panelGroup>
- </h:panelGrid>
+
</h:form>
</ui:define>
</ui:composition>
Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/javablog.xhtml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/javablog.xhtml?rev=904189&r1=904188&r2=904189&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/javablog.xhtml (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/javablog.xhtml Thu Jan 28 18:08:37 2010
@@ -10,8 +10,8 @@
<ui:composition template="/template.xhtml">
<ui:define name="body">
- <h:form id="form">
- <h:panelGrid id="grid" columns="1" styleClass="stdBox">
+ <h:form id="form" style="position: relative">
+ <h:panelGrid id="grid" columns="1" styleClass="stdBox left">
<h:outputText id="title1" styleClass="title" value="#{javaBlogView.title}"/>
<h:outputText id="title11" styleClass="title1" value="#{javaBlogView.title1}"/>
<!--
@@ -37,7 +37,7 @@
<h:commandLink action="#{javaBlogView.addEntry2}" value="Add Blog"/>
</h:panelGrid>
- <h:panelGrid columns="1">
+ <h:panelGrid columns="1" styleClass="right">
<h:panelGroup>
<h3>
<h:outputText value="Blog Entries"/>
Added: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/resources/img/license.txt
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/resources/img/license.txt?rev=904189&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/resources/img/license.txt (added)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/resources/img/license.txt Thu Jan 28 18:08:37 2010
@@ -0,0 +1,6 @@
+sig07-009_mac.jpg is from the nasa public domain image archive.
+
+http://www.nasaimages.org/luna/servlet/detail/nasaNAS~12~12~64153~168545:Multiwavelength-M81?qvq=q:galaxy+or+constellation+or+hubble+or+spitzer;lc:NVA2~35~35,NVA2~32~32,NVA2~31~31,NVA2~19~19,nasaNAS~16~16,nasaNAS~2~2,NSVS~3~3,nasaNAS~9~9,NVA2~4~4,NVA2~15~15,NVA2~24~24,NVA2~29~29,nasaNAS~12~12,nasaNAS~8~8,nasaNAS~7~7,NVA2~22~22,nasaNAS~10~10,NVA2~13~13,NVA2~18~18,NVA2~27~27,NVA2~9~9,NVA2~1~1,nasaNAS~6~6,NVA2~25~25,NVA2~20~20,nasaNAS~13~13,nasaNAS~22~22,NVA2~16~16,NVA2~8~8,nasaNAS~5~5,nasaNAS~4~4,NVA2~28~28,NVA2~14~14,nasaNAS~20~20,NVA2~17~17,NVA2~30~30,NVA2~21~21,NVA2~26~26,NVA2~23~23,NVA2~44~44,NVA2~42~42,NVA2~38~38,NVA2~45~45,NVA2~39~39,NVA2~43~43,NVA2~41~41,NVA2~37~37,NVA2~49~49,NVA2~53~53,NVA2~51~51,NVA2~56~56,NVA2~47~47,NVA2~54~54,NVA2~33~33,NVA2~36~36,NVA2~34~34,NVA2~57~57,NVA2~52~52,NVA2~48~48,NVA2~50~50,NVA2~46~46,NVA2~55~55&mi=0&trs=8854
+
+license
+http://www.nasa.gov/audience/formedia/features/MP_Photo_Guidelines.html
Propchange: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/resources/img/license.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/resources/img/license.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/resources/img/sig07-009_mac.jpg
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/resources/img/sig07-009_mac.jpg?rev=904189&view=auto
==============================================================================
Files myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/resources/img/sig07-009_mac.jpg (added) and myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/resources/img/sig07-009_mac.jpg Thu Jan 28 18:08:37 2010 differ
Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/resources/styles/main.css
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/resources/styles/main.css?rev=904189&r1=904188&r2=904189&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/resources/styles/main.css (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/resources/styles/main.css Thu Jan 28 18:08:37 2010
@@ -1,6 +1,17 @@
body {
- background-image:url("../resources/img/gradient1.jpg");
- background-repeat:repeat-x;
+ background-image: url("../resources/img/sig07-009_mac.jpg");
+ background-repeat: no-repeat;
+ background-color: black;
+}
+
+div.centerDiv {
+ margin-left: auto;
+ margin-right: auto;
+ width: 900px;
+}
+
+h1 {
+ color: #ffff00;
}
#hello {
@@ -8,15 +19,19 @@
}
.stdBox {
- display: table;
+ display: block;
+ width: 400px;
background-color: white;
border: 1px solid black;
-moz-border-radius: 5px;
padding: 5px;
border-radius: 5px;
+ background-image: url("../resources/img/gradient1.jpg");
+ background-repeat: repeat-x;
+ margin-bottom: 5px;
+ min-height: 120px;
}
-
/*==================================================
Basic CSS information for our compiler
output component
@@ -40,18 +55,18 @@
}
div.errorBox {
- width: 800px;
+ width: 820px;
heigh: 200px;
-
display: block;
overflow: auto;
border: 1px solid black;
background-color: #ffffcc;
- -moz-border-radius:5px;
- border-radius:5px;
+ -moz-border-radius: 5px;
+ border-radius: 5px;
padding: 5px;
+ margin-left: 10px;
}
div.errorBox .line {
@@ -59,10 +74,10 @@
width: 780px;
border: 1px dashed black;
- background-color:#ccccff;
+ background-color: #ccccff;
padding: 5px;
margin-top: 10px;
- margin-left:auto;
+ margin-left: auto;
margin-right: auto;
-moz-border-radius: 5px;
border-radius: 5px;
@@ -87,3 +102,15 @@
display: block;
float: left;
}
+
+.left {
+ position: absolute;
+ left: 10px;
+ top: 20px;
+}
+
+.right {
+ position: absolute;
+ left: 430px;
+ top: 20px;
+}
Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/template.xhtml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/template.xhtml?rev=904189&r1=904188&r2=904189&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/template.xhtml (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/template.xhtml Thu Jan 28 18:08:37 2010
@@ -15,6 +15,7 @@
</head>
<body>
+<div class="centerDiv">
<h:panelGroup>
<h3>
<h:outputFormat value="Compiler Output" escape="false"/>
@@ -28,6 +29,8 @@
<p>
<ui:insert name="body">Hello World Example!</ui:insert>
</p>
+</div>
+
</body>
</html>