diff --git a/pom.xml b/pom.xml
index e0a49c3..646abde 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
4.0.0
de.srsoftware
web4rail
- 1.2.44
+ 1.2.45
Web4Rail
jar
Java Model Railway Control
diff --git a/resources/css/style.css b/resources/css/style.css
index fed56cd..765eceb 100644
--- a/resources/css/style.css
+++ b/resources/css/style.css
@@ -336,7 +336,7 @@ svg.preview circle,
svg.preview line,
svg.preview polygon,
svg.preview rect{
- fill:peru;
+ fill:peru !important;
}
svg.Block text{
diff --git a/resources/translations/Application.de.translation b/resources/translations/Application.de.translation
index ff8fd1d..fbdf1b2 100644
--- a/resources/translations/Application.de.translation
+++ b/resources/translations/Application.de.translation
@@ -84,6 +84,7 @@ Direction : Richtung
Direction\: heading {} : Richtung: nach {}
disabled : deaktiviert
disable {} : {} deaktivieren
+Disabled routes using this tile : Deaktivierte Routen, die diesen Abschnitt verwenden
Display "{}" on {}. : „{}“ auf {} anzeigen.
Drop : Verwerfen
Dropped destination of {}. : Ziel von {} verworfen.
diff --git a/src/main/java/de/srsoftware/web4rail/Route.java b/src/main/java/de/srsoftware/web4rail/Route.java
index 68ebbb0..2bf859e 100644
--- a/src/main/java/de/srsoftware/web4rail/Route.java
+++ b/src/main/java/de/srsoftware/web4rail/Route.java
@@ -750,9 +750,7 @@ public class Route extends BaseClass {
formInputs.add(t("Name"),new Input(NAME, name()));
Checkbox checkbox = new Checkbox(DISABLED, t("disabled"), disabled);
if (disabled) checkbox.clazz("disabled");
- formInputs.add(t("State"),checkbox);
-
-
+ formInputs.add(t("State"),checkbox);
postForm.add(basicProperties());
if (!turnouts.isEmpty()) postForm.add(turnouts());
diff --git a/src/main/java/de/srsoftware/web4rail/tiles/Tile.java b/src/main/java/de/srsoftware/web4rail/tiles/Tile.java
index 327befa..8566011 100644
--- a/src/main/java/de/srsoftware/web4rail/tiles/Tile.java
+++ b/src/main/java/de/srsoftware/web4rail/tiles/Tile.java
@@ -242,14 +242,35 @@ public abstract class Tile extends BaseClass implements Comparable{
if (!routes.isEmpty()) {
fieldset = new Fieldset(t("Routes using this tile"));
Tag routeList = new Tag("ol");
+ boolean empty = true;
for (Route route : routes) {
+ if (route.isDisabled()) continue;
Tag li = route.link("span", route.name()+(route.isDisabled()?" ["+t("disabled")+"]" : "")+NBSP).addTo(new Tag("li").clazz("link"));
route.button(t("delete route"),Map.of(ACTION,ACTION_DROP)).addTo(li);
button(t("simplify name"), Map.of(ACTION,ACTION_AUTO,ROUTE,route.id().toString())).addTo(li);
li.addTo(routeList);
+ empty = false;
+ }
+ if (!empty) {
+ routeList.addTo(fieldset);
+ postForm.add(fieldset);
+ }
+
+ fieldset = new Fieldset(t("Disabled routes using this tile"));
+ routeList = new Tag("ol");
+ empty = true;
+ for (Route route : routes) {
+ if (!route.isDisabled()) continue;
+ Tag li = route.link("span", route.name()+(route.isDisabled()?" ["+t("disabled")+"]" : "")+NBSP).addTo(new Tag("li").clazz("link"));
+ route.button(t("delete route"),Map.of(ACTION,ACTION_DROP)).addTo(li);
+ button(t("simplify name"), Map.of(ACTION,ACTION_AUTO,ROUTE,route.id().toString())).addTo(li);
+ li.addTo(routeList);
+ empty = false;
+ }
+ if (!empty) {
+ routeList.addTo(fieldset);
+ postForm.add(fieldset);
}
- routeList.addTo(fieldset);
- postForm.add(fieldset);
}
return super.properties(preForm, formInputs, postForm);