Title: [waffle-scm] [591] trunk/waffle-distribution/src/site/content: web site fixes.

Diff

Modified: trunk/waffle-distribution/src/site/content/accessing-java-from-ruby.html (590 => 591)

--- trunk/waffle-distribution/src/site/content/accessing-java-from-ruby.html	2008-02-07 13:46:02 UTC (rev 590)
+++ trunk/waffle-distribution/src/site/content/accessing-java-from-ruby.html	2008-02-07 14:11:12 UTC (rev 591)
@@ -4,20 +4,20 @@
 
 </head>
 <body>
-<h2>Access your Java components from&nbsp;Ruby Actions.</h2>
+<h2>Access your Java components from Ruby Actions.</h2>
 Here we examine Ruby based controllers, and the invoking of Java
 functionaility from them. Consider:<br />
 <textarea class="java:nogutter:nocontrols" name="code">
 public class MyRegistrar extends AbstractRubyAwareRegistrar {
-&nbsp; public MyRegistrar(Registrar delegate) {
-&nbsp;&nbsp;&nbsp; super(delegate);
-&nbsp; }
+  public MyRegistrar(Registrar delegate) {
+    super(delegate);
+  }
 
-&nbsp;@Override
-&nbsp; public void application() {
-&nbsp;&nbsp;&nbsp;register("person_dao", PersonDAOImpl.class);
-&nbsp;&nbsp;&nbsp; registerRubyScript("person", "PersonController");
-&nbsp; }
+  @Override
+  public void application() {
+    register("person_dao", PersonDAOImpl.class);
+    registerRubyScript("person", "PersonController");
+  }
 }</textarea>
 A
 DAO, PersonDAOImpl, is registered under the name "person_dao" and we
@@ -27,26 +27,26 @@
 Gaining
 access to this DAO from the controller is easy in Waffle, just call the
 locate method:<br />
-<textarea class="java:nogutter:nocontrols" name="code">
+<textarea class="ruby:nogutter:nocontrols" name="code">
 class PersonController
-&nbsp; def index
-&nbsp;&nbsp;&nbsp; @person_dao = locate(example.PersonDAO)
-&nbsp;&nbsp;&nbsp; @people = @person_dao.findAll
-&nbsp;&nbsp;&nbsp; render 'person.rhtml'
-&nbsp;end
+  def index
+    @person_dao = locate(example.PersonDAO)
+    @people = @person_dao.findAll
+    render 'person.rhtml'
+  end
 end</textarea>
 Notice
 that we were able to retrieve the DAO by its interface. Additionally,
 since this DAO was registered with a key you can use a convention to
 retrieve the component. The convention is "locate_&lt;component
 key&gt;", here is the same controller using the locate_ convention:<br />
-<textarea class="java:nogutter:nocontrols" name="code">class
+<textarea class="ruby:nogutter:nocontrols" name="code">class
 PersonController
-&nbsp; def index
-&nbsp;&nbsp;&nbsp; @person_dao = locate_person_dao
-&nbsp;&nbsp;&nbsp; @people = @person_dao.findAll
-&nbsp;&nbsp;&nbsp; render 'person.rhtml'
-&nbsp;end
+  def index
+    @person_dao = locate_person_dao
+    @people = @person_dao.findAll
+    render 'person.rhtml'
+  end
 end</textarea>
 As
 you can see this makes writing Ruby based Controllers/Actions with

Modified: trunk/waffle-distribution/src/site/content/erb-views.html (590 => 591)

--- trunk/waffle-distribution/src/site/content/erb-views.html	2008-02-07 13:46:02 UTC (rev 590)
+++ trunk/waffle-distribution/src/site/content/erb-views.html	2008-02-07 14:11:12 UTC (rev 591)
@@ -5,8 +5,10 @@
 </head>
 <body>
 
-<h2>Fill me in Mike</h2>
+<h2>ERB Views</h2>
 
+<p>Waffle allows your views to be developed with ERB.  Detailed documentation will be available soon.</p>
+
 </body>
 
 </html>

Modified: trunk/waffle-distribution/src/site/content/monitors.html (590 => 591)

--- trunk/waffle-distribution/src/site/content/monitors.html	2008-02-07 13:46:02 UTC (rev 590)
+++ trunk/waffle-distribution/src/site/content/monitors.html	2008-02-07 14:11:12 UTC (rev 591)
@@ -20,7 +20,7 @@
         <td align="left"><a href=""
         org.codehaus.waffle.monitor.ActionMonitor</a></td>
       </tr>
-      <tr class="b">
+      <tr class="a">
         <td align="left"><a href=""
         org.codehaus.waffle.monitor.BindMonitor</a></td>
       </tr>
@@ -28,7 +28,7 @@
         <td align="left"><a href=""
         org.codehaus.waffle.monitor.ContextMonitor</a></td>
       </tr>
-      <tr class="b">
+      <tr class="a">
         <td align="left"><a href=""
         org.codehaus.waffle.monitor.ControllerMonitor</a></td>
       </tr>
@@ -36,7 +36,7 @@
         <td align="left"><a href=""
         org.codehaus.waffle.monitor.RegistrarMonitor</a></td>
       </tr>
-      <tr class="b">
+      <tr class="a">
         <td align="left"><a href=""
         org.codehaus.waffle.monitor.ServletMonitor</a></td>
       </tr>
@@ -44,7 +44,7 @@
         <td align="left"><a href=""
         org.codehaus.waffle.monitor.ValidationMonitor</a></td>
       </tr>
-      <tr class="b">
+      <tr class="a">
         <td align="left"><a href=""
         org.codehaus.waffle.monitor.ViewMonitor</a></td>
       </tr>
@@ -73,7 +73,7 @@
         template, which can be overridden via the <b>monitorLevels()</b> and <b>monitorMessages()</b>
         methods.  By convention, the levels and templates are held in maps keyed on the event name:
         
-   <textarea class="xml:nogutter:nocontrols" name="code">
+   <textarea class="java:nogutter:nocontrols" name="code">
         @Override
         protected Map<String, Level> monitorLevels(){
             Map<String, Level> levels = super.monitorLevels();

Modified: trunk/waffle-distribution/src/site/content/pluggability.html (590 => 591)

--- trunk/waffle-distribution/src/site/content/pluggability.html	2008-02-07 13:46:02 UTC (rev 590)
+++ trunk/waffle-distribution/src/site/content/pluggability.html	2008-02-07 14:11:12 UTC (rev 591)
@@ -36,19 +36,19 @@
       <tr class="a">
         <td align="left"><b>Interface</b></td><td align="left"><b>Default Implementation</b></td>
       </tr>      
-      <tr class="a">
+      <tr class="b">
         <td align="left"><a href=""
         org.codehaus.waffle.action.ActionMethodExecutor</a></td>
         <td align="left"><a href=""
         org.codehaus.waffle.action.InterceptingActionMethodExecutor</a></td>
       </tr>
-      <tr class="b">
+      <tr class="a">
         <td align="left"><a href=""
         org.codehaus.waffle.action.ActionMethodResponseHandler</a></td>
         <td align="left"><a href=""
         org.codehaus.waffle.action.DefaultActionMethodResponseHandler</a></td>
       </tr>
-      <tr class="a">
+      <tr class="b">
         <td align="left"><a href=""
         org.codehaus.waffle.action.ArgumentResolver</a></td>
         <td align="left"><a href=""
@@ -60,25 +60,25 @@
         <td align="left"><a href=""
         org.codehaus.waffle.action.AnnotatedMethodDefinitionFinder</a></td>
       </tr>
-      <tr class="a">
+      <tr class="b">
         <td align="left"><a href=""
         org.codehaus.waffle.action.MethodNameResolver</a></td>
         <td align="left"><a href=""
         org.codehaus.waffle.action.RequestParameterMethodNameResolver</a></td>
       </tr>
-      <tr class="b">
+      <tr class="a">
         <td align="left"><a href=""
         org.codehaus.waffle.bind.BindErrorMessageResolver</a></td>
         <td align="left"><a href=""
         org.codehaus.waffle.bind.ognl.OgnlBindErrorMessageResolver</a></td>
       </tr>
-      <tr class="a">
+      <tr class="b">
         <td align="left"><a href=""
         org.codehaus.waffle.bind.DataBinder</a></td>
         <td align="left"><a href=""
         org.codehaus.waffle.bind.ognl.OgnlDataBinder</a></td>
       </tr>
-      <tr class="b">
+      <tr class="a">
         <td align="left"><a href=""
         org.codehaus.waffle.bind.RequestAttributeBinder</a></td>
         <td align="left"><a href=""
@@ -90,7 +90,7 @@
         <td align="left"><a href=""
         org.codehaus.waffle.bind.ognl.OgnlValueConverterFinder</a></td>
       </tr>
-      <tr class="b">
+      <tr class="a">
         <td align="left"><a href=""
         org.codehaus.waffle.context.ContextContainerFactory</a></td>
         <td align="left"><a href=""
@@ -102,7 +102,7 @@
         <td align="left"><a href=""
         org.codehaus.waffle.controller.ContextControllerDefinitionFactory</a></td>
       </tr>
-      <tr class="b">
+      <tr class="a">
         <td align="left"><a href=""
         org.codehaus.waffle.controller.ControllerNameResolver</a></td>
         <td align="left"><a href=""
@@ -114,19 +114,19 @@
         <td align="left"><a href=""
         org.codehaus.waffle.i18n.DefaultMessageResources</a></td>
       </tr>
-      <tr class="b">
+      <tr class="a">
         <td align="left"><a href=""
         org.codehaus.waffle.validation.Validator</a></td>
         <td align="left"><a href=""
         org.codehaus.waffle.validation.DefaultValidator</a></td>
       </tr>
-      <tr class="a">
+      <tr class="b">
         <td align="left"><a href=""
         org.codehaus.waffle.view.ViewDispatcher</a></td>
         <td align="left"><a href=""
         org.codehaus.waffle.view.DefaultViewDispatcher</a></td>
       </tr>
-      <tr class="b">
+      <tr class="a">
         <td align="left"><a href=""
         org.codehaus.waffle.view.ViewResolver</a></td>
         <td align="left"><a href=""

Modified: trunk/waffle-distribution/src/site/content/ruby-controllers.html (590 => 591)

--- trunk/waffle-distribution/src/site/content/ruby-controllers.html	2008-02-07 13:46:02 UTC (rev 590)
+++ trunk/waffle-distribution/src/site/content/ruby-controllers.html	2008-02-07 14:11:12 UTC (rev 591)
@@ -26,7 +26,7 @@
 foundational components should be replaced with alternate
 implementations.
 
-<textarea class="java:nogutter:nocontrols" name="code">&lt;context-param&gt;
+<textarea class="xml:nogutter:nocontrols" name="code">&lt;context-param&gt;
 &nbsp; &lt;param-name&gt;org.codehaus.waffle.context.ContextContainerFactory&lt;/param-name&gt;
 &nbsp; &lt;param-value&gt;org.codehaus.waffle.context.pico.RubyAwarePicoContextContainerFactory&lt;/param-value&gt;
 &lt;/context-param&gt;
@@ -48,8 +48,8 @@
 <textarea class="java:nogutter:nocontrols" name="code">public class MyRegistrar extends AbstractRubyAwareRegistrar {
 &nbsp; public MyRegistrar(Registrar delegate) {
 &nbsp;&nbsp;&nbsp; super(delegate);
-&nbsp; }&nbsp;&nbsp; &nbsp;
-	&nbsp; @Override
+&nbsp; }
+&nbsp; @Override
 &nbsp; public void application() {
 &nbsp;&nbsp;&nbsp; registerRubyScript("foobar", "FooBar");
 &nbsp; }
@@ -63,7 +63,7 @@
 your Ruby Controller class. Notice in the following example that your
 class does not need to extend or include anything.
 
-<textarea class="java:nogutter:nocontrols" name="code">class FooBar
+<textarea class="ruby:nogutter:nocontrols" name="code">class FooBar
 &nbsp; def index # This is the default action
 &nbsp;&nbsp;&nbsp; "&lt;h1&gt;Hello World&lt;/h1&gt;"
 &nbsp; end&nbsp; 

Modified: trunk/waffle-distribution/src/site/content/sitemap.xml (590 => 591)

--- trunk/waffle-distribution/src/site/content/sitemap.xml	2008-02-07 13:46:02 UTC (rev 590)
+++ trunk/waffle-distribution/src/site/content/sitemap.xml	2008-02-07 14:11:12 UTC (rev 591)
@@ -8,19 +8,6 @@
     <page>release-notes.html</page>
   </section>
   <section>
-    <name>JavaDoc</name>
-    <link title="Core">javadoc/core/index.html</link>
-    <link title="Mock">javadoc/mock/index.html</link>
-    <link title="Taglib">javadoc/taglib/index.html</link>
-  </section>
-  <section>
-    <name>Waffle Resources</name>
-    <page>mailing-lists.html</page>
-    <page>team-list.html</page>
-    <page>source-repository.html</page>
-    <link title="Issue Tracking">http://jira.codehaus.org/browse/WAFFLE</link>
-  </section>
-  <section>
     <name>Developing Java web apps</name>
     <page>action-controllers.html</page>
     <page>action-methods.html</page>
@@ -39,17 +26,28 @@
     <page>webapp-structure.html</page>
   </section>
   <section>
+    <name>Developing Ruby web apps</name>
+    <page>ruby-controllers.html</page>
+    <page>accessing-java-from-ruby.html</page>
+    <page>erb-views.html</page>
+  </section>
+  <section>
     <name>Web 2.0</name>
     <page>ajax.html</page>
     <page>dynamic.html</page>
   </section>
   <section>
-    <name>Developing Ruby webapps</name>
-    <page>ruby-controllers.html</page>
-    <page>accessing-java-from-ruby.html</page>
-    <page>erb-views.html</page>
+    <name>Examples</name>
+    <page>examples/examples.html</page>
+    <page>examples/hello-world.html</page>
+    <page>examples/simple-calculator.html</page>
   </section>
   <section>
+    <name>Tutorials</name>
+    <page>tutorials/tutorial-one.html</page>
+    <page>tutorials/tutorial-two.html</page>
+  </section>
+  <section>
     <name>Taglib</name>
     <page>taglib/taglib.html</page>
     <page>taglib/button.html</page>
@@ -63,15 +61,17 @@
     <page>taglib/textarea.html</page>
   </section>
   <section>
-    <name>Examples</name>
-    <page>examples/examples.html</page>
-    <page>examples/hello-world.html</page>
-    <page>examples/simple-calculator.html</page>
+    <name>Waffle Resources</name>
+    <page>mailing-lists.html</page>
+    <page>team-list.html</page>
+    <page>source-repository.html</page>
+    <link title="Issue Tracking">http://jira.codehaus.org/browse/WAFFLE</link>
   </section>
   <section>
-    <name>Tutorials</name>
-    <page>tutorials/tutorial-one.html</page>
-    <page>tutorials/tutorial-two.html</page>
+    <name>JavaDoc</name>
+    <link title="Core">javadoc/core/index.html</link>
+    <link title="Mock">javadoc/mock/index.html</link>
+    <link title="Taglib">javadoc/taglib/index.html</link>
   </section>
   <section>
     <name>Miscellaneous</name>

Modified: trunk/waffle-distribution/src/site/content/views.html (590 => 591)

--- trunk/waffle-distribution/src/site/content/views.html	2008-02-07 13:46:02 UTC (rev 590)
+++ trunk/waffle-distribution/src/site/content/views.html	2008-02-07 14:11:12 UTC (rev 591)
@@ -109,7 +109,7 @@
 keyword. The example below shows how you should register the Servlet to
 handle Velocity based pages:</p>
 
-<textarea class="java:nogutter:nocontrols" name="code">
+<textarea class="xml:nogutter:nocontrols" name="code">
   <servlet>
     <servlet-name>velocity</servlet-name>
     <servlet-class>org.codehaus.waffle.WaffleVelocityServlet</servlet-class>

Modified: trunk/waffle-distribution/src/site/templates/skin.html (590 => 591)

--- trunk/waffle-distribution/src/site/templates/skin.html	2008-02-07 13:46:02 UTC (rev 590)
+++ trunk/waffle-distribution/src/site/templates/skin.html	2008-02-07 14:11:12 UTC (rev 591)
@@ -106,6 +106,7 @@
 <!--  SyntaxHighlighter scripts:  MUST be left AFTER the body -->
 <script language="_javascript_" src=""
 <script language="_javascript_" src=""
+<script language="_javascript_" src=""
 <script language="_javascript_" src=""
 <script language="_javascript_" src=""
 <script language="_javascript_" src=""


To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to