Merge remote-tracking branch 'origin/master' into samu_masken
# Conflicts: # src/main/java/de/subway_surfers/vpr_app/VerwaltungController.java
This commit is contained in:
@@ -28,9 +28,9 @@
|
||||
<VBox styleClass="accounterstellung_links">
|
||||
<GridPane styleClass="accounterstellung_daten">
|
||||
<Label text="Accountname:" GridPane.rowIndex="0" GridPane.columnIndex="0"/>
|
||||
<TextField GridPane.rowIndex="0" GridPane.columnIndex="1"/>
|
||||
<TextField fx:id="accountname" GridPane.rowIndex="0" GridPane.columnIndex="1"/>
|
||||
<Label text="E-Mail:" GridPane.rowIndex="1" GridPane.columnIndex="0"/>
|
||||
<TextField GridPane.rowIndex="1" GridPane.columnIndex="1"/>
|
||||
<TextField fx:id="email" GridPane.rowIndex="1" GridPane.columnIndex="1"/>
|
||||
<RadioButton fx:id="typMitarbeiter" onAction="#onTypMitarbeiter" text="Mitarbeiter" GridPane.rowIndex="2" GridPane.columnIndex="0"/>
|
||||
<RadioButton fx:id="typEltern" onAction="#onTypEltern" text="Eltern" GridPane.rowIndex="2" GridPane.columnIndex="1"/>
|
||||
</GridPane>
|
||||
|
Reference in New Issue
Block a user