From 1a3a14762a9aee98f2f155e789ae62dffca29856 Mon Sep 17 00:00:00 2001
From: Stephan Richter <github@keawe.de>
Date: Sat, 12 Sep 2020 23:34:44 +0200
Subject: [PATCH] improved css

---
 resources/css/style.css                       | 34 ++++++++++------
 resources/js/plan.js                          |  4 +-
 .../java/de/srsoftware/web4rail/Plan.java     | 39 ++++++++++++-------
 3 files changed, 50 insertions(+), 27 deletions(-)

diff --git a/resources/css/style.css b/resources/css/style.css
index 7291954..dc12dda 100644
--- a/resources/css/style.css
+++ b/resources/css/style.css
@@ -1,8 +1,14 @@
+html, body{
+  padding: 0;
+  margin: 0;
+}
+html{
+  height: 100%;
+}
 body{
-	background: gray;
-	width: 100%;
-	height: 100%;
+  min-height: 100%;
 }
+
 .tile{
 	border: 1px solid black;
 	width: 30px;
@@ -23,12 +29,18 @@ svg text{
 
 .menu{
 	position: fixed;
-	bottom: 40px;
+	width: 100%;
+	height: 30px;
+	bottom: 0px;
 }
 
-.menu .tile{
+.menu > div{
+	position: relative;
+	float: left;
+	border: 1px solid black;
+	height: 30px;
 	background: white;
-	font-size: 12px;
+	padding: 3px;
 }
 
 .menu .list{
@@ -39,16 +51,16 @@ svg text{
 	display: inherit;
 }
 
-.menu .tile .list{
+.menu > div > .list{
 	position: fixed;
-	right: 0;
 	height: 30px;
-	left: 0; 
-	bottom: 40px; 
+	bottom: 30px;
+	width: 100%;
 }
 
-.menu .tile .list .tile{
+.menu > div > .list > *{
 	position: relative;
+	float: left;
 }
 
 #messages{
diff --git a/resources/js/plan.js b/resources/js/plan.js
index d89d23a..deac1a4 100644
--- a/resources/js/plan.js
+++ b/resources/js/plan.js
@@ -60,7 +60,7 @@ function enableAdding(ev){
 		mode = null;
 	} else {
 		$(selected).css('border','2px solid red');
-		$('.menu .tile .list').css('display','inherit');
+		$('.menu .addtile .list').css('display','inherit');
 		mode = ADD;
 	}
 	return false; // otherwise body.click would also be triggered
@@ -69,6 +69,6 @@ function enableAdding(ev){
 window.onload = function () {
 	var isDragging = false;
 	$('.menu > div').click(closeMenu);
-	$('.menu .tile .list svg').click(enableAdding);
+	$('.menu .addtile .list svg').click(enableAdding);
 	$(BODY).click(bodyClick);
 }
diff --git a/src/main/java/de/srsoftware/web4rail/Plan.java b/src/main/java/de/srsoftware/web4rail/Plan.java
index 6ab858e..a9a8ee0 100644
--- a/src/main/java/de/srsoftware/web4rail/Plan.java
+++ b/src/main/java/de/srsoftware/web4rail/Plan.java
@@ -68,25 +68,18 @@ public class Plan {
 
 	private Tag menu() throws IOException {
 		Tag menu = new Tag("div").clazz("menu");
-		Tag tileMenu = new Tag("div").clazz("tile").content("Add tile");
 		
-		StringBuffer tiles = new StringBuffer();
-		tiles.append(new StraightH().html());
-		tiles.append(new StraightV().html());
-		tiles.append(new DiagES().html());
-		tiles.append(new DiagSW().html());
-		tiles.append(new DiagNE().html());
-		tiles.append(new DiagWN().html());
-		tiles.append(new EndE().html());
-		tiles.append(new EndW().html());
-		tiles.append(new TurnoutSE().html());
-		tiles.append(new TurnoutWS().html());
-		tiles.append(new TurnoutSW().html());
-		new Tag("div").clazz("list").content(tiles.toString()).addTo(tileMenu).addTo(menu);
+		tileMenu().addTo(menu);
+		actionMenu().addTo(menu);
 			
 		return menu;
 	}
 
+	private Tag actionMenu() {
+		Tag menu = new Tag("div").clazz("actions").content("Actions");
+		return menu;
+	}
+
 	public String process(HashMap<String, String> params) {
 		try {
 			String mode = params.get(MODE);
@@ -120,4 +113,22 @@ public class Plan {
 	private String t(String message, Object...fills) {
 		return Translation.get(Application.class, message, fills);
 	}
+	
+	private Tag tileMenu() throws IOException {
+		Tag tileMenu = new Tag("div").clazz("addtile").content("Add tile");
+		
+		StringBuffer tiles = new StringBuffer();
+		tiles.append(new StraightH().html());
+		tiles.append(new StraightV().html());
+		tiles.append(new DiagES().html());
+		tiles.append(new DiagSW().html());
+		tiles.append(new DiagNE().html());
+		tiles.append(new DiagWN().html());
+		tiles.append(new EndE().html());
+		tiles.append(new EndW().html());
+		tiles.append(new TurnoutSE().html());
+		tiles.append(new TurnoutWS().html());
+		tiles.append(new TurnoutSW().html());
+		return new Tag("div").clazz("list").content(tiles.toString()).addTo(tileMenu);
+	}
 }