Merge pull request #432 from bclozel:lang

* pr/432:
  Polish "Promote language choice to page heading"
  Promote language choice to page heading

initializr-service/src/main/resources/application.yml

@@ -1148,12 +1148,12 @@ initializr:
     - name: Java
       id: java
       default: true
-    - name: Groovy
-      id: groovy
-      default: false
     - name: Kotlin
       id: kotlin
       default: false
+    - name: Groovy
+      id: groovy
+      default: false
   bootVersions:
     - name : Latest SNAPSHOT
       id: 1.2.4.BUILD-SNAPSHOT

initializr-web/src/main/resources/static/css/spring.css

@@ -31,6 +31,15 @@ body, h1, h2, h3 {
     margin: 1em 0;
 }
 
+.rwd-line {
+    display: block;
+    margin-top: 0.5em;
+}
+
+@media screen and (min-width: 992px){
+    .rwd-line { display: inline; }
+}
+
 #starters {
     min-height: 3em;
 }

initializr-web/src/main/resources/templates/home.html

@@ -20,18 +20,30 @@
         <div class="container start-main">
             <div class="row form-inline text-center">
                 <div class="form-group project-choice">
-                    <h2>Generate a
+                    <h2>
+                        <span class="rwd-line">
+                        <label for="type">Generate a</label>
                         <select tabindex="1" class="form-control" id="type" name="type">
                             {{#types.content}}
-                            <option data-action="{{action}}" value="{{id}}"{{#default}} selected{{/default}}>{{name}}</option>
+                            <option data-action="{{action}}" value="{{id}}" {{#default}}
+                                    selected{{/default}}>{{name}}</option>
                             {{/types.content}}
                         </select>
-                        with Spring Boot
-                        <select tabindex="2" class="form-control" name="bootVersion" id="bootVersion">
+                        <label for="language">with</label>
+                        <select tabindex="2" class="form-control" name="language" id="language">
+                            {{#languages.content}}
+                            <option value="{{id}}" {{#default}} selected{{/default}}>{{name}}</option>
+                            {{/languages.content}}
+                        </select>
+                        </span>
+                        <span class="rwd-line">
+                        <label for="bootVersion">and Spring Boot</label>
+                        <select tabindex="3" class="form-control" name="bootVersion" id="bootVersion">
                             {{#bootVersions.content}}
-                            <option value="{{id}}"{{#default}} selected{{/default}}>{{name}}</option>
+                            <option value="{{id}}" {{#default}} selected{{/default}}>{{name}}</option>
                             {{/bootVersions.content}}
                         </select>
+                    </span>
                     </h2>
                 </div>
             </div>
@@ -46,34 +58,34 @@
 
                     <div class="form-group groupid-form-group">
                         <label for="groupId" class="control-label">{{groupId.title}}</label>
-                        <input tabindex="3" id="groupId" class="form-control" type="text" value="{{groupId.content}}"
+                        <input tabindex="4" id="groupId" class="form-control" type="text" value="{{groupId.content}}"
                                name="groupId">
                     </div>
                     <div class="form-group artifactid-form-group">
                         <label for="artifactId" class="control-label">{{artifactId.title}}</label>
-                        <input tabindex="4" id="artifactId" class="form-control" type="text"
+                        <input tabindex="5" id="artifactId" class="form-control" type="text"
                                value="{{artifactId.content}}"
                                name="artifactId">
                     </div>
                     <div class="form-group full hidden name-form-group">
                         <label for="name" class="control-label">{{name.title}}</label>
-                        <input tabindex="5" id="name" class="form-control" type="text" value="{{name.content}}"
+                        <input tabindex="6" id="name" class="form-control" type="text" value="{{name.content}}"
                                name="name">
                     </div>
                     <div class="form-group full hidden description-form-group">
                         <label for="description" class="control-label">{{description.title}}</label>
-                        <input tabindex="6" id="description" class="form-control" type="text"
+                        <input tabindex="7" id="description" class="form-control" type="text"
                                value="{{description.content}}" name="description">
                     </div>
                     <div class="form-group full hidden packagename-form-group">
                         <label for="packageName" class="control-label">{{packageName.title}}</label>
-                        <input tabindex="7" id="packageName" class="form-control" type="text"
+                        <input tabindex="8" id="packageName" class="form-control" type="text"
                                value="{{packageName.content}}"
                                name="packageName">
                     </div>
                     <div class="form-group full hidden packaging-form-group">
                         <label for="packaging" class="control-label">{{packagings.title}}</label>
-                        <select tabindex="8" class="form-control" id="packaging" name="packaging">
+                        <select tabindex="9" class="form-control" id="packaging" name="packaging">
                             {{#packagings.content}}
                             <option value="{{id}}"{{#default}} selected{{/default}}>{{name}}</option>
                             {{/packagings.content}}
@@ -81,20 +93,12 @@
                     </div>
                     <div class="form-group full hidden javaversion-form-group">
                         <label for="javaVersion" class="control-label">{{javaVersions.title}}</label>
-                        <select tabindex="9" class="form-control" name="javaVersion" id="javaVersion">
+                        <select tabindex="10" class="form-control" name="javaVersion" id="javaVersion">
                             {{#javaVersions.content}}
                             <option value="{{id}}"{{#default}} selected{{/default}}>{{name}}</option>
                             {{/javaVersions.content}}
                         </select>
                     </div>
-                    <div class="form-group full hidden language-form-group">
-                        <label for="language" class="control-label">{{languages.title}}</label>
-                        <select tabindex="10" class="form-control" name="language" id="language">
-                            {{#languages.content}}
-                            <option value="{{id}}"{{#default}} selected{{/default}}>{{name}}</option>
-                            {{/languages.content}}
-                        </select>
-                    </div>
                 </div>
                 <div class="col-sm-12 col-md-6">
                     <h2>Dependencies</h2>

initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerIntegrationTests.java

@@ -371,19 +371,6 @@ public class MainControllerIntegrationTests
 		}
 	}
 
-	@Test
-	public void homeIsForm() {
-		String body = htmlHome();
-		assertTrue("Wrong body:\n" + body, body.contains("action=\"/starter.zip\""));
-		assertTrue("Wrong body:\n" + body, body.contains("Web dependency description"));
-		assertFalse("Wrong body:\n" + body, body.contains("${"));
-		assertFalse("Wrong body:\n" + body, body.contains("{{"));
-		assertFalse("Wrong body:\n" + body, body.contains("}}"));
-		assertTrue("Wrong body:\n" + body, body.contains("<option value=\"groovy\">"));
-		assertTrue("Wrong body:\n" + body,
-				body.contains("<option value=\"java\" selected>"));
-	}
-
 	@Test
 	public void homeIsJson() {
 		String body = invokeHome(null, (String[]) null).getBody();

initializr-web/src/test/java/io/spring/initializr/web/project/ProjectGenerationSmokeTests.java

@@ -174,7 +174,6 @@ public class ProjectGenerationSmokeTests
 	@Test
 	public void createGroovyProject() throws Exception {
 		HomePage page = toHome();
-		page.advanced();
 		page.language("groovy");
 		page.submit();
 		ProjectAssert projectAssert = zipProjectAssert(from("demo.zip"));
@@ -187,7 +186,6 @@ public class ProjectGenerationSmokeTests
 	@Test
 	public void createKotlinProject() throws Exception {
 		HomePage page = toHome();
-		page.advanced();
 		page.language("kotlin");
 		page.submit();
 		ProjectAssert projectAssert = zipProjectAssert(from("demo.zip"));
@@ -238,8 +236,8 @@ public class ProjectGenerationSmokeTests
 		HomePage page = toHome();
 		page.groupId("com.acme");
 		page.artifactId("foo-bar");
-		page.advanced();
 		page.language("kotlin");
+		page.advanced();
 		page.name("My project");
 		page.description("A description for my Kotlin project");
 		page.packageName("com.example.foo");
@@ -261,8 +259,8 @@ public class ProjectGenerationSmokeTests
 		HomePage page = toHome();
 		page.groupId("com.acme");
 		page.artifactId("foo-bar");
-		page.advanced();
 		page.language("groovy");
+		page.advanced();
 		page.name("My project");
 		page.description("A description for my Groovy project");
 		page.packageName("com.example.foo");