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

Updated ui

Browse Source
This commit is contained in:
Marco Kühn 2022-01-24 14:11:34 +01:00
parent 057c4504d4
commit 3848baddb6
2 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
client/app/src/main/resources/main/option-view.css
View File

@ -13,8 +13,8 @@ GridPane{
Label{ Label{
-fx-text-fill: white; -fx-text-fill: white;
-fx-max-width: 150px; -fx-max-width: 200px;
-fx-min-width: 150px; -fx-min-width: 200px;
} }
.mainLabel{ .mainLabel{
@ -26,11 +26,6 @@ Label{
-fx-alignment: center; -fx-alignment: center;
} }
.inputField{
-fx-padding: 10px;
-fx-background-color: white;
}
.mainButton{ .mainButton{
-fx-font-weight: bold; -fx-font-weight: bold;
-fx-background-color: white; -fx-background-color: white;
@ -51,14 +46,13 @@ JFXButton{
-fx-font-size: 16px; -fx-font-size: 16px;
} }
.inputDate{
-fx-background-color: white;
}
.comboBox{ .comboBox{
-fx-background-color: white; -fx-background-color: white;
-fx-max-width: 200px;
-fx-min-width: 200px;
} }
.timePicker{ .userBtn{
-fx-background-color: white; -fx-max-width: 200px;
-fx-min-width: 200px;
} }

27
client/app/src/main/resources/main/option-view.fxml
View File

@ -14,7 +14,7 @@
<columnConstraints> <columnConstraints>
<ColumnConstraints minWidth="100"/> <ColumnConstraints minWidth="100"/>
<ColumnConstraints minWidth="100"/> <ColumnConstraints minWidth="100"/>
<ColumnConstraints minWidth="100"/> <ColumnConstraints minWidth="200"/>
<ColumnConstraints minWidth="100"/> <ColumnConstraints minWidth="100"/>
<ColumnConstraints minWidth="100"/> <ColumnConstraints minWidth="100"/>
</columnConstraints> </columnConstraints>
@ -27,28 +27,35 @@
<RowConstraints vgrow="ALWAYS" /> <RowConstraints vgrow="ALWAYS" />
<RowConstraints vgrow="ALWAYS" /> <RowConstraints vgrow="ALWAYS" />
<RowConstraints vgrow="ALWAYS" /> <RowConstraints vgrow="ALWAYS" />
<RowConstraints vgrow="ALWAYS" />
<RowConstraints vgrow="ALWAYS" />
</rowConstraints> </rowConstraints>
<Label styleClass="mainLabel" GridPane.columnIndex="2" GridPane.halignment="CENTER" >Einstellungen</Label> <Label styleClass="mainLabel" GridPane.columnIndex="2" GridPane.halignment="CENTER" >Einstellungen</Label>
<Label GridPane.columnIndex="1" GridPane.rowIndex="1" GridPane.halignment="CENTER">User:</Label> <Label GridPane.columnIndex="1" GridPane.rowIndex="2" GridPane.halignment="CENTER">User:</Label>
<JFXComboBox fx:id="userCmb" GridPane.columnIndex="2" GridPane.rowIndex="1"> <JFXComboBox styleClass="comboBox" fx:id="userCmb" GridPane.columnIndex="2" GridPane.rowIndex="2">
<items> <items>
<FXCollections fx:factory="observableArrayList"> <FXCollections fx:factory="observableArrayList">
<String fx:value="alex"/>
<String fx:value="marc"/> <String fx:value="marc"/>
<String fx:value="marco"/> <String fx:value="marco"/>
</FXCollections> </FXCollections>
</items> </items>
</JFXComboBox> </JFXComboBox>
<JFXButton fx:id="updateUserBtn" GridPane.columnIndex="1" GridPane.columnSpan="3" GridPane.rowIndex="2" GridPane.halignment="CENTER" onAction="#onUpdateBtnClick">User bearbeiten</JFXButton> <JFXButton styleClass="userBtn" fx:id="updateUserBtn" GridPane.columnIndex="1" GridPane.columnSpan="3"
<JFXButton fx:id="deleteUserBtn" GridPane.columnIndex="1" GridPane.columnSpan="3" GridPane.rowIndex="3" GridPane.halignment="CENTER" onAction="#onDeleteBtnClick">User löschen</JFXButton> GridPane.rowIndex="4" GridPane.halignment="CENTER" onAction="#onUpdateBtnClick">User bearbeiten</JFXButton>
<JFXButton fx:id="createUserBtn" GridPane.columnIndex="1" GridPane.columnSpan="3" GridPane.rowIndex="4" GridPane.halignment="CENTER" onAction="#onCreateBtnClick">User anlegen</JFXButton> <JFXButton styleClass="userBtn" fx:id="deleteUserBtn" GridPane.columnIndex="1" GridPane.columnSpan="3"
GridPane.rowIndex="5" GridPane.halignment="CENTER" onAction="#onDeleteBtnClick">User löschen</JFXButton>
<JFXButton styleClass="userBtn" fx:id="createUserBtn" GridPane.columnIndex="1" GridPane.columnSpan="3"
GridPane.rowIndex="7" GridPane.halignment="CENTER" onAction="#onCreateBtnClick">User anlegen</JFXButton>
<Label GridPane.columnIndex="1" GridPane.rowIndex="5" GridPane.halignment="CENTER">Angemeldet bleiben:</Label> <Label styleClass="loginLbl" GridPane.columnIndex="1" GridPane.rowIndex="8"
<JFXToggleButton fx:id="saveLoginTBtn" GridPane.columnIndex="3" GridPane.rowIndex="5"/> GridPane.halignment="CENTER">Angemeldet bleiben:</Label>
<JFXToggleButton fx:id="saveLoginTBtn" GridPane.columnIndex="3" GridPane.rowIndex="8"/>
<Label fx:id="labelError" styleClass="errorMessage" GridPane.columnIndex="1" GridPane.rowIndex="6"/> <Label fx:id="labelError" styleClass="errorMessage" GridPane.columnIndex="1" GridPane.rowIndex="9"/>
<JFXButton GridPane.columnIndex="4" GridPane.rowIndex="7" onAction="#onBackBtnClick">Zurück</JFXButton> <JFXButton GridPane.columnIndex="4" GridPane.rowIndex="9" onAction="#onBackBtnClick">Zurück</JFXButton>
</GridPane> </GridPane>