updating tiles

resources/translations/Application.de.translation

@@ -188,6 +188,7 @@ Tag : Markierung
 Tags : Markierungen
 Text to display on clients\: : Text, welcher auf den Clients angezeigt werden soll:
 Text to show on display\: : Text, welcher in der Anzeige dargestellt werden soll:
+Tile(s) : Kachel(n)
 Toggle : umschalten
 Toggle power : Stom umschalten
 Train : Zug

src/main/java/de/srsoftware/web4rail/tiles/Block.java

@@ -212,9 +212,8 @@ public abstract class Block extends StretchableTile implements Comparable<Block>
 		return super.load(json);
 	}
 	
-	@Override
 	public Form propForm(String id) {
-		Form form = super.propForm(id);
+		Form form = new Form("test");
 		new Tag("h4").content(t("Block properties")).addTo(form);
 		
 		new Input(NAME, name).addTo(new Label(t("name:")+NBSP)).addTo(new Tag("p")).addTo(form);

src/main/java/de/srsoftware/web4rail/tiles/Contact.java

@@ -153,7 +153,7 @@ public class Contact extends Tile{
 		Tag span = new Tag("span");
 		new Input(ADDRESS, addr).numeric().addTo(span).content(NBSP);
 		button(t("learn"),Map.of(ACTION,ACTION_ANALYZE)).addTo(span);
-		formInputs.add(t("Hardware settings"),span);
+		formInputs.add(t("Address"),span);
 		
 		postForm.add(actions.properties());
 		return super.properties(preForm, formInputs, postForm);

src/main/java/de/srsoftware/web4rail/tiles/StretchableTile.java

@@ -1,14 +1,15 @@
 package de.srsoftware.web4rail.tiles;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map.Entry;
 
 import org.json.JSONObject;
 
 import de.srsoftware.tools.Tag;
-import de.srsoftware.web4rail.tags.Form;
+import de.srsoftware.web4rail.Window;
+import de.srsoftware.web4rail.tags.Fieldset;
 import de.srsoftware.web4rail.tags.Input;
-import de.srsoftware.web4rail.tags.Label;
 
 public abstract class StretchableTile extends Tile {
 	private static final String STRETCH_LENGTH = "stretch";
@@ -34,13 +35,10 @@ public abstract class StretchableTile extends Tile {
 		return super.load(json);
 	}
 	
-	public Form propForm(String id) {
+	@Override
-		Form form = new Form(id);
+	protected Window properties(List<Fieldset> preForm, FormInput formInputs, List<Fieldset> postForm) {
-		new Tag("h4").content(stretchType()).addTo(form);
+		formInputs.add(stretchType(),new Input(STRETCH_LENGTH, stretch).addTo(new Tag("span")).content(NBSP+t("Tile(s)")));
-		
+		return super.properties(preForm, formInputs, postForm);
-		new Input(STRETCH_LENGTH, stretch).numeric().addTo(new Label(stretchType()+":"+NBSP)).addTo(new Tag("p")).addTo(form);
-		
-		return form;
 	}
 	
 	private void stretch(String value) {

src/main/java/de/srsoftware/web4rail/tiles/TextDisplay.java

@@ -3,16 +3,17 @@ package de.srsoftware.web4rail.tiles;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
-import java.util.Vector;
 import java.util.Map.Entry;
+import java.util.Vector;
 
 import org.json.JSONObject;
 
 import de.srsoftware.tools.Tag;
-import de.srsoftware.web4rail.tags.Form;
+import de.srsoftware.web4rail.Window;
+import de.srsoftware.web4rail.tags.Fieldset;
 import de.srsoftware.web4rail.tags.Input;
-import de.srsoftware.web4rail.tags.Label;
 import de.srsoftware.web4rail.tags.Select;
 
 public class TextDisplay extends StretchableTile {
@@ -38,14 +39,9 @@ public class TextDisplay extends StretchableTile {
 	}
 	
 	@Override
-	public Form propForm(String id) {
+	protected Window properties(List<Fieldset> preForm, FormInput formInputs, List<Fieldset> postForm) {
-		noTrack();
+		formInputs.add(t("Text"),new Input(TEXT, text));
-		Form form = super.propForm(id);
+		return super.properties(preForm, formInputs, postForm);
-		new Tag("h4").content(t("Text")).addTo(form);
-		
-		new Input(TEXT, text).addTo(new Label(t("Text")+":"+NBSP)).addTo(new Tag("p")).addTo(form);
-		
-		return form;
 	}
 
 	public static Select selector(TextDisplay preselected,Collection<TextDisplay> exclude) {

src/main/java/de/srsoftware/web4rail/tiles/Tile.java

@@ -194,10 +194,18 @@ public abstract class Tile extends BaseClass{
 	
 	@Override
 	protected Window properties(List<Fieldset> preForm, FormInput formInputs, List<Fieldset> postForm) {
-		Fieldset fieldset = new Fieldset(t("Route and Train"));
+		Fieldset fieldset = null;
 
+		if (isSet(route)) {
+			fieldset = new Fieldset(t("Route"));
+			route.link("p",t("Locked by {}",route)).addTo(fieldset);
+		}
+		
 		if (isSet(train)) {
-			train.link("span", train+NBSP).addTo(fieldset);
+			if (isSet(fieldset)) {
+				fieldset.children().firstElement().content(" / "+t("Train"));
+			} else fieldset = new Fieldset(t("Train"));
+			train.link("span", t("Train")+":"+NBSP+train+NBSP).addTo(fieldset);
 			if (isSet(train.route)) {
 				train.button(t("stop"), contextAction(ACTION_STOP)).addTo(fieldset);
 			} else {
@@ -210,10 +218,7 @@ public abstract class Tile extends BaseClass{
 			}
 		}
 		
-		if (isSet(route)) {
+		if (isSet(fieldset)) preForm.add(fieldset);
-			route.link("span",t("Locked by {}",route)).addTo(fieldset);
-		}
-		preForm.add(fieldset);
 		
 		if (isTrack) {
 			formInputs.add(t("Length"),new Input(LENGTH,length).numeric().addTo(new Tag("span")).content(NBSP+lengthUnit));