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:09:44 UTC

svn commit: r904190 - in /myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp: WEB-INF/java/org/apache/myfaces/javaloader/test/TestValidator.java blog.xhtml helloWorld.xhtml javablog.xhtml resources/styles/main.css template.xhtml

Author: werpu
Date: Thu Jan 28 18:09:43 2010
New Revision: 904190

URL: http://svn.apache.org/viewvc?rev=904190&view=rev
Log:
https://issues.apache.org/jira/browse/EXTSCRIPT-52

styling works

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/blog.xhtml
    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=904190&r1=904189&r2=904190&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:09:43 2010
@@ -22,8 +22,6 @@
  * @author Werner Punz (latest modification by $Author$)
  * @version $Revision$ $Date$
  */
-
-   aaa
 public class TestValidator {
 
 }

Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/blog.xhtml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/blog.xhtml?rev=904190&r1=904189&r2=904190&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/blog.xhtml (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/blog.xhtml Thu Jan 28 18:09:43 2010
@@ -31,7 +31,7 @@
                     <h:inputText value="#{blogView.content}"/>
 
 
-                    <h:commandLink action="#{blogView.addEntry}" value="Add Blog"/>
+                    <h:commandLink action="#{blogView.addEntry}" value="Add Blog Entry"/>
                 </h:panelGrid>
             </h:panelGroup>
 

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=904190&r1=904189&r2=904190&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:09:43 2010
@@ -9,7 +9,11 @@
 <body>
 <ui:composition template="/template.xhtml">
     <ui:define name="body">
-        <h:form id="form" style="position: relative;">
+        <h1>
+            <ui:insert name="title">Ext-Scripting General Example</ui:insert>
+        </h1>
+
+        <h:form id="form" >
 
                 <h:panelGroup styleClass="left">
                     <h:panelGroup styleClass="stdBox">

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=904190&r1=904189&r2=904190&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:09:43 2010
@@ -10,48 +10,51 @@
 <ui:composition template="/template.xhtml">
 
     <ui:define name="body">
-        <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}"/>
-                <!--
-                entry.firstName = firstName
-                entry.lastName = lastName
-                entry.topic = topic
-                entry.content = content
-            -->
-                <h:outputText value="First Name"/>
-                <h:inputText value="#{javaBlogView.firstName}"/>
-                <h:outputText value="Last Name"/>
-                <h:inputText value="#{javaBlogView.lastName}"/>
-                <h:outputText value="Topic of entry"/>
-                <h:inputText value="#{javaBlogView.topic}"/>
-                <h:outputText value="Content"/>
-                <h:inputText value="#{javaBlogView.content}"/>
-
-
-                <h:outputText value="#{javaBlogView.title3}"/>
-
-                <h:outputText value="#{javaBlogView.title4}"/>
-
+        <h1>
+            <ui:insert name="title">Ext-Scripting Javablog Example</ui:insert>
+        </h1>
+
+        <h:form id="form" >
+
+            <div class="left" style="margin-top: 3px;">
+                <h:panelGrid id="grid" columns="1" styleClass="stdBox">
+                    <h:outputText id="title1" styleClass="title" value="#{javaBlogView.title}"/>
+                    <h:outputText id="title11" styleClass="title1" value="#{javaBlogView.title1}"/>
+                    <h:outputText value="#{javaBlogView.title3}"/>
+                    <h:outputText value="#{javaBlogView.title4}"/>
+
+                    <hr/>
+
+                    <h:panelGrid columns="2" columnClasses="label, input">
+                        <h:outputText value="First Name"/>
+                        <h:inputText value="#{javaBlogView.firstName}"/>
+                        <h:outputText value="Last Name"/>
+                        <h:inputText value="#{javaBlogView.lastName}"/>
+                        <h:outputText value="Topic of entry"/>
+                        <h:inputText value="#{javaBlogView.topic}"/>
+                    </h:panelGrid>
+                    <h:panelGrid columns="2" columnClasses="label, input">
+                        <h:outputText styleClass="label" value="Content"/>
+                        <h:inputTextarea  value="#{javaBlogView.content}"/>
+                    </h:panelGrid>
+                    <hr/>
+                    <h:commandButton styleClass="btn" action="#{javaBlogView.addEntry2}" value="Add Blog Entry"/>
+                </h:panelGrid>
+            </div>
 
-                <h:commandLink action="#{javaBlogView.addEntry2}" value="Add Blog"/>
-            </h:panelGrid>
             <h:panelGrid columns="1" styleClass="right">
-                <h:panelGroup>
-                    <h3>
-                        <h:outputText value="Blog Entries"/>
-                    </h3>
-                </h:panelGroup>
                 <ui:repeat value="#{javaBlogService.blogEntries}" var="item">
-                    <h:panelGrid columns="2" styleClass="stdBox">
-                        <h:outputLabel value="Topic"/>
-                        <h:outputText value="#{item.topic}"/>
-                        <h:outputLabel value="Content"/>
-                        <h:outputText value="#{item.content}"/>
-
+                    <h:panelGrid columns="1" styleClass="stdBox">
+                        <h:panelGroup styleClass="topic">
+                            <h:outputLabel styleClass="label" value="Topic"/>
+                            <h:outputText value="#{item.topic}"/>
+                        </h:panelGroup>
+                        <h:panelGroup styleClass="content">
+                            <h:outputLabel styleClass="label" value="Content"/>
+                            <h:outputFormat escape="false" value="#{item.content}"/>
+                        </h:panelGroup>
                     </h:panelGrid>
-                    <br />
+                    <br/>
                 </ui:repeat>
             </h:panelGrid>
 

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=904190&r1=904189&r2=904190&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:09:43 2010
@@ -10,8 +10,13 @@
     width: 900px;
 }
 
+div.centerDiv form {
+    position: relative;
+}
+
 h1 {
     color: #ffff00;
+    text-align:center;
 }
 
 #hello {
@@ -22,10 +27,10 @@
     display: block;
     width: 400px;
     background-color: white;
-    border: 1px solid black;
-    -moz-border-radius: 5px;
+    border: 1px solid white;
+    -moz-border-radius: 10px;
     padding: 5px;
-    border-radius: 5px;
+    border-radius: 8px;
     background-image: url("../resources/img/gradient1.jpg");
     background-repeat: repeat-x;
     margin-bottom: 5px;
@@ -103,6 +108,8 @@
     float: left;
 }
 
+
+
 .left {
     position: absolute;
     left: 10px;
@@ -114,3 +121,27 @@
     left: 430px;
     top: 20px;
 }
+
+.label {
+    font-weight: bold;
+    color: black;
+    width: 150px;
+    padding-right: 5px;
+}
+
+.input input, .input textArea {
+    width: 200px;
+}
+
+input, textArea {
+    border: 1px solid black;
+}
+
+input:focus, textArea:focus {
+    background-color: yellow;
+}
+
+input.btn {
+    width: 100px;
+    margin-left: 263px;
+}
\ No newline at end of file

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=904190&r1=904189&r2=904190&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:09:43 2010
@@ -23,9 +23,6 @@
     <exs:compilerOutput errorsLabel="Errors:" warningsLabel="Warnings:" scriptingLanguage=""/>
 </h:panelGroup>
 
-<h1>
-    <ui:insert name="title">Myfaces Example Facelets</ui:insert>
-</h1>
 <p>
     <ui:insert name="body">Hello World Example!</ui:insert>
 </p>