summaryrefslogtreecommitdiffstats
path: root/src/main/resources
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/resources')
-rw-r--r--src/main/resources/fxml/CreateOperationController.fxml3
-rw-r--r--src/main/resources/fxml/statusMenu.fxml20
-rw-r--r--src/main/resources/styles/main.css17
3 files changed, 35 insertions, 5 deletions
diff --git a/src/main/resources/fxml/CreateOperationController.fxml b/src/main/resources/fxml/CreateOperationController.fxml
index 88fe26a..cb8239d 100644
--- a/src/main/resources/fxml/CreateOperationController.fxml
+++ b/src/main/resources/fxml/CreateOperationController.fxml
@@ -45,7 +45,7 @@
text="Fahrzeuge:" styleClass="text-medium"/>
<Label fx:id="lblChosenVehicles" layoutX="116.0" layoutY="102.0" prefHeight="30.0"
prefWidth="610.0" text="keine ausgewählt" styleClass="text-big"/>
- <Button fx:id="btnCreateOperation" layoutX="747.0" styleClass="text-big" layoutY="95.0" mnemonicParsing="false"
+ <Button fx:id="btnCreateOperation" layoutX="747.0" styleClass="text-big, button-main" layoutY="95.0" mnemonicParsing="false"
onAction="#createOperationClicked" prefHeight="0.0" prefWidth="158.0" text="Erstellen">
<font>
<Font name="System Bold"/>
@@ -76,4 +76,5 @@
<FlowPane fx:id="fpVehicles" hgap="12" layoutX="40.0" layoutY="228.0" prefHeight="388.0"
prefWidth="920.0" vgap="12">
</FlowPane>
+ <fx:include source="/fxml/statusMenu.fxml" AnchorPane.leftAnchor="100" AnchorPane.topAnchor="100"/>
</AnchorPane>
diff --git a/src/main/resources/fxml/statusMenu.fxml b/src/main/resources/fxml/statusMenu.fxml
index 57b152a..71a67c9 100644
--- a/src/main/resources/fxml/statusMenu.fxml
+++ b/src/main/resources/fxml/statusMenu.fxml
@@ -1,9 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.scene.layout.AnchorPane?>
-<AnchorPane xmlns="http://javafx.com/javafx"
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.control.Hyperlink?>
+<?import javafx.scene.text.Text?>
+<?import javafx.scene.control.Label?>
+<?import javafx.geometry.Insets?>
+<VBox xmlns="http://javafx.com/javafx"
xmlns:fx="http://javafx.com/fxml"
+ fx:id="vboxMain"
fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.StatusMenuController"
- prefHeight="400.0" prefWidth="600.0">
-
-</AnchorPane>
+ prefWidth="200"
+ spacing="6" stylesheets="@/styles/main.css"
+ styleClass="border-sw">
+ <padding>
+ <Insets top="6" left="6" right="6" bottom="6"/>
+ </padding>
+ <Label text="abmelden" alignment="CENTER" prefWidth="Infinity" styleClass="text-medium"
+ onMouseClicked="#unregister"/>
+</VBox>
diff --git a/src/main/resources/styles/main.css b/src/main/resources/styles/main.css
index 61634b6..c021074 100644
--- a/src/main/resources/styles/main.css
+++ b/src/main/resources/styles/main.css
@@ -8,6 +8,12 @@
-fx-effect: dropshadow(gaussian, rgba(100,100,100,0.8), 5, 0, 0, 3);
}
+.border-sw {
+ -fx-background-color: white;
+ -fx-effect: dropshadow(gaussian, rgba(100,100,100,0.8), 5, 0, 0, 3);
+ -fx-border-color: black;
+}
+
.text-big {
-fx-font-size: 18px;
}
@@ -22,6 +28,10 @@
.button {
-fx-background-radius: 0em;
+ -fx-border-color: black;
+}
+
+.button-main {
-fx-background-color: darkgreen;
-fx-text-fill: white;
-fx-font-weight: bold;
@@ -34,6 +44,13 @@
.button-other-status {
-fx-background-color: #F8CBAD;
}
+.button-free-status {
+ -fx-background-color: #C5E0B4;
+}
+
+.button-other-status {
+ -fx-background-color: #F8CBAD;
+}
.mi-free {
-fx-background-color: #C5E0B4;