MAM/VPR-Frontend
3
2
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch '2410-develop' into merge

Browse Source 
# Conflicts:
#	client/app/src/main/java/main/MainController.java
This commit is contained in:
Marc Beyer
2022-01-23 21:33:42 +01:00
parent 0840ee1d12 2c3d646c47
commit 7aa615ce54
14 changed files with 254 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/app/src/main/resources/main/edit-event.fxml
View File

@@ -8,7 +8,7 @@
<?import com.jfoenix.controls.*?>
<GridPane fx:id="mainGrid" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="main.CreateEventController">
fx:controller="main.EditEventController">
<columnConstraints>
<ColumnConstraints/>

4
client/app/src/main/resources/users/create-user.fxml
View File

@@ -37,8 +37,8 @@
<TextField fx:id="textLogin" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="1" />
<TextField fx:id="textForename" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="2" />
<TextField fx:id="textName" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="3" />
<TextField fx:id="textPassword" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="4" />
<TextField fx:id="textPasswordSecond" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="5" />
<PasswordField fx:id="textPassword" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="4" />
<PasswordField fx:id="textPasswordSecond" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="5" />
<ToggleButton fx:id="checkButtonIsAdmin" GridPane.columnIndex="2" GridPane.rowIndex="6"/>