Merge pull request #4821 from trydofor/master

fill  the original tempty template

documentation/manual/working/scalaGuide/main/forms/code/scalaguide.forms.scalaforms.routes

@@ -5,3 +5,5 @@ GET         /contacts/:id    controllers.Application.showContact(id:Int)
 POST        /user            controllers.Application.userPost
 
 POST        /submit          controllers.Application.submit
+
+POST        /contact/save    controllers.Application.saveContact

documentation/manual/working/scalaGuide/main/forms/code/scalaguide/forms/scalaforms/views/contact/form.scala.html

@@ -1,3 +1,20 @@
-@(contactForm: Form[Contact])
+@(contactForm: Form[Contact])(implicit messages: Messages)
 
+@import scalaguide.forms.scalaforms.controllers.routes
 
+@helper.form(action = routes.Application.saveContact) {
+
+    @helper.inputText(contactForm("firstname"))
+    @helper.inputText(contactForm("lastname"))
+    @helper.inputText(contactForm("company"))
+
+    @helper.repeat(contactForm("informations")) { info =>
+        @helper.inputText(info("label"))
+        @helper.inputText(info("email"))
+        @helper.repeat(info("phones")) { phone =>
+            @helper.inputText(phone)
+        }
+    }
+
+    <input type="submit" id="submit" value="@routes.Application.saveContact">
+}

documentation/manual/working/scalaGuide/main/json/ScalaJsonTransformers.md

@@ -92,7 +92,7 @@ In the code samples below, we’ll use the following JSON:
   "key2" : {
     "key21" : 123,
     "key22" : true,
-    "key23" : [ "alpha", "beta", "gamma"]
+    "key23" : [ "alpha", "beta", "gamma"],
     "key24" : {
       "key241" : 234.123,
       "key242" : "value242"