Skip to content

Jfoenix #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mariusadam wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Jfoenix #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
61cc7c8
Added jphoenix design
mariusadam Jun 6, 2017
14e007f
Added spacing between inputs
mariusadam Jun 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions client/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ repositories {
dependencies {
testCompile group: 'junit', name: 'junit', version: '4.11'
compile 'org.springframework:spring-context:4.3.7.RELEASE'
compile 'com.jfoenix:jfoenix:1.4.0'

compile project(':model')
compile project(':services')
}
5 changes: 3 additions & 2 deletions client/src/main/resources/UserView.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?>

<?import com.jfoenix.controls.JFXComboBox?>
<BorderPane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="528.0" prefWidth="653.0" xmlns="http://javafx.com/javafx/8.0.60" xmlns:fx="http://javafx.com/fxml/1" fx:controller="gui.UserView">
<left>
<VBox prefHeight="400.0" prefWidth="342.0" BorderPane.alignment="CENTER">
Expand Down Expand Up @@ -41,11 +42,11 @@
<Font name="Myanmar Text Bold" size="12.0" />
</font>
</Label>
<ComboBox fx:id="tagComboBox" prefWidth="150.0">
<JFXComboBox fx:id="tagComboBox" prefWidth="150.0">
<VBox.margin>
<Insets left="60.0" top="20.0" />
</VBox.margin>
</ComboBox>
</JFXComboBox>
<Button id="updateBtn" fx:id="updateButton" mnemonicParsing="false" onAction="#updateButtonHandler" prefHeight="25.0" prefWidth="89.0" text="Update">
<VBox.margin>
<Insets left="85.0" top="60.0" />
Expand Down
19 changes: 6 additions & 13 deletions client/src/main/resources/author.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>

<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.ComboBox?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.TableColumn?>
<?import javafx.scene.control.TableView?>
<?import javafx.scene.control.TextField?>
<?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.VBox?>
<?import com.jfoenix.controls.JFXTextField?>
<?import javafx.geometry.*?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<?import javafx.scene.text.Font?>

<BorderPane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="608.0" prefWidth="848.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="gui.AuthorView">
<left>
<VBox prefHeight="464.0" prefWidth="532.0" BorderPane.alignment="CENTER">
Expand Down Expand Up @@ -76,11 +69,11 @@
<Font name="Myanmar Text Bold" size="12.0" />
</font>
</Label>
<TextField fx:id="titleText">
<JFXTextField fx:id="titleText">
<HBox.margin>
<Insets left="15.0" top="2.0" />
</HBox.margin>
</TextField>
</JFXTextField>
</children>
</HBox>
<HBox prefHeight="88.0" prefWidth="314.0">
Expand Down
16 changes: 6 additions & 10 deletions client/src/main/resources/createConf.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>

<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.TextField?>
<?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.VBox?>
<?import com.jfoenix.controls.JFXTextField?>
<?import javafx.geometry.*?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<?import javafx.scene.text.Font?>

<BorderPane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.60" xmlns:fx="http://javafx.com/fxml/1" fx:controller="gui.CreateConferenceView">
<top>
<HBox id="logo" prefHeight="175.0" prefWidth="600.0" BorderPane.alignment="CENTER">
Expand Down Expand Up @@ -38,11 +34,11 @@
<Font name="Myanmar Text Bold" size="12.0" />
</font>
</Label>
<TextField fx:id="confNameField" maxWidth="250.0" prefHeight="40.0" prefWidth="210.0">
<JFXTextField fx:id="confNameField" maxWidth="250.0" prefHeight="40.0" prefWidth="210.0">
<HBox.margin>
<Insets left="10.0" top="30.0" />
</HBox.margin>
</TextField>
</JFXTextField>
</children>
</HBox>
<HBox prefHeight="128.0" prefWidth="600.0">
Expand Down
21 changes: 11 additions & 10 deletions client/src/main/resources/createEdition.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<?import com.jfoenix.controls.*?>
<?import java.lang.*?>
<?import javafx.geometry.*?>
<?import javafx.scene.control.*?>
Expand Down Expand Up @@ -29,11 +30,11 @@
<Insets left="10.0" />
</VBox.margin>
</Label>
<DatePicker fx:id="submissionDeadlineField">
<JFXDatePicker fx:id="submissionDeadlineField">
<VBox.margin>
<Insets left="10.0" />
</VBox.margin>
</DatePicker>
</JFXDatePicker>
</children>
</VBox>
<VBox prefHeight="100.0" prefWidth="195.0" spacing="10.0" GridPane.rowIndex="2">
Expand All @@ -46,11 +47,11 @@
<Insets left="11.0" />
</VBox.margin>
</Label>
<DatePicker fx:id="finalDeadlineField">
<JFXDatePicker fx:id="finalDeadlineField">
<VBox.margin>
<Insets left="10.0" />
</VBox.margin>
</DatePicker>
</JFXDatePicker>
</children>
</VBox>
<VBox prefHeight="100.0" prefWidth="192.0" spacing="10.0" GridPane.rowIndex="3">
Expand All @@ -63,11 +64,11 @@
<Insets left="10.0" top="5.0" />
</VBox.margin>
</Label>
<DatePicker fx:id="startDateField">
<JFXDatePicker fx:id="startDateField">
<VBox.margin>
<Insets left="10.0" />
</VBox.margin>
</DatePicker>
</JFXDatePicker>
</children>
</VBox>
<VBox prefHeight="100.0" prefWidth="195.0" spacing="10.0" GridPane.rowIndex="4">
Expand All @@ -80,11 +81,11 @@
<Insets left="11.0" top="5.0" />
</VBox.margin>
</Label>
<DatePicker fx:id="endDateField">
<JFXDatePicker fx:id="endDateField">
<VBox.margin>
<Insets left="10.0" />
</VBox.margin>
</DatePicker>
</JFXDatePicker>
</children>
</VBox>
<VBox prefHeight="200.0" prefWidth="100.0" spacing="10.0">
Expand All @@ -94,7 +95,7 @@
<Font name="Myanmar Text Bold" size="12.0" />
</font>
</Label>
<ComboBox fx:id="conferencesComboBox" onAction="#onConferenceSelected" prefWidth="150.0" />
<JFXComboBox fx:id="conferencesComboBox" onAction="#onConferenceSelected" prefWidth="150.0" />
</children>
<GridPane.margin>
<Insets left="10.0" />
Expand All @@ -107,7 +108,7 @@
<Font name="Myanmar Text Bold" size="12.0" />
</font>
</Label>
<TextField fx:id="editionNameField" prefHeight="25.0" prefWidth="199.0" />
<JFXTextField fx:id="editionNameField" prefHeight="25.0" prefWidth="199.0" />
</children>
<GridPane.margin>
<Insets left="10.0" />
Expand Down
10 changes: 6 additions & 4 deletions client/src/main/resources/login.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,29 +12,31 @@
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?>

<?import com.jfoenix.controls.JFXTextField?>
<?import com.jfoenix.controls.JFXPasswordField?>
<BorderPane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="479.0" prefWidth="463.0" xmlns="http://javafx.com/javafx/8.0.65" xmlns:fx="http://javafx.com/fxml/1" fx:controller="gui.LoginView">
<top>
<HBox id="logo" prefHeight="167.0" prefWidth="463.0" BorderPane.alignment="CENTER" />
</top>
<center>
<VBox focusTraversable="true" prefHeight="335.0" prefWidth="463.0" BorderPane.alignment="CENTER">
<children>
<TextField fx:id="username" maxHeight="300.0" prefHeight="40.0" promptText="Username">
<JFXTextField fx:id="username" maxHeight="300.0" prefHeight="40.0" promptText="Username">
<VBox.margin>
<Insets left="75.0" right="75.0" top="50.0" />
</VBox.margin>
<font>
<Font name="Cambria" size="14.0" />
</font>
</TextField>
<PasswordField fx:id="password" maxHeight="300.0" prefHeight="40.0" promptText="Password">
</JFXTextField>
<JFXPasswordField fx:id="password" maxHeight="300.0" prefHeight="40.0" promptText="Password">
<font>
<Font name="Cambria" size="14.0" />
</font>
<VBox.margin>
<Insets left="75.0" right="75.0" top="10.0" />
</VBox.margin>
</PasswordField>
</JFXPasswordField>
<Button id="login" fx:id="logInButton" mnemonicParsing="false" onAction="#buttonHandler" prefHeight="40.0" prefWidth="352.0" text="Log In">
<VBox.margin>
<Insets left="75.0" right="75.0" top="20.0" />
Expand Down
10 changes: 6 additions & 4 deletions client/src/main/resources/past_deadline_editions.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
<?import java.lang.*?>
<?import javafx.scene.layout.*?>

<?import com.jfoenix.controls.JFXTextField?>
<?import com.jfoenix.controls.JFXTextArea?>
<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="582.0" prefWidth="1178.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="gui.PastDeadlineEditionsView">
<top>
<Button mnemonicParsing="false" fx:id="backBtn" onAction="#backBtnHandler" prefHeight="20.0" prefWidth="63.0" text="Back" BorderPane.alignment="TOP_LEFT">
Expand All @@ -22,7 +24,7 @@
<Label text="Your past deadline editions" />
<HBox prefHeight="25.0" prefWidth="200.0">
<children>
<TextField fx:id="searchEditionsField" onKeyReleased="#searchEditionsHandler" promptText="Search editions" />
<JFXTextField fx:id="searchEditionsField" onKeyReleased="#searchEditionsHandler" promptText="Search editions" />
<Region prefHeight="25.0" prefWidth="79.0" />
</children>
</HBox>
Expand All @@ -39,7 +41,7 @@
<Label text="Papers submitted for this edition" />
<HBox prefHeight="20.0" prefWidth="200.0">
<children>
<TextField fx:id="searchPapersField" onKeyReleased="#searchPapersHandler" promptText="Search papers" />
<JFXTextField fx:id="searchPapersField" onKeyReleased="#searchPapersHandler" promptText="Search papers" />
<Region prefHeight="25.0" prefWidth="79.0" />
</children>
</HBox>
Expand All @@ -58,7 +60,7 @@
<Label text="Selected paper reviews" />
<HBox prefHeight="25.0" prefWidth="200.0">
<children>
<TextField fx:id="searchReviewsField" onKeyReleased="#searchReviewsHandler" promptText="Search reviews" />
<JFXTextField fx:id="searchReviewsField" onKeyReleased="#searchReviewsHandler" promptText="Search reviews" />
<Region prefHeight="25.0" prefWidth="79.0" />
</children>
</HBox>
Expand All @@ -72,7 +74,7 @@
<content>
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="174.0" prefWidth="302.0">
<children>
<TextArea fx:id="commentTextArea" editable="false" layoutX="30.0" layoutY="-26.0" prefHeight="174.0" prefWidth="302.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
<JFXTextArea fx:id="commentTextArea" editable="false" layoutX="30.0" layoutY="-26.0" prefHeight="174.0" prefWidth="302.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
</children>
</AnchorPane>
</content>
Expand Down
46 changes: 21 additions & 25 deletions client/src/main/resources/reviewer_assign.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>

<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.ComboBox?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.TableColumn?>
<?import javafx.scene.control.TableView?>
<?import javafx.scene.control.TextArea?>
<?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.VBox?>
<?import com.jfoenix.controls.*?>
<?import java.lang.*?>
<?import javafx.scene.text.*?>
<?import com.jfoenix.controls.JFXComboBox?>
<?import com.jfoenix.controls.JFXTextArea?>
<?import com.jfoenix.validation.RequiredFieldValidator?>
<?import javafx.geometry.*?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<?import javafx.scene.text.Font?>

<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="467.0" prefWidth="702.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="gui.ReviewerAssignmentsView">
<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="467.0" prefWidth="702.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="gui.ReviewerAssignmentsView">
<top>
<HBox prefHeight="87.0" prefWidth="681.0" BorderPane.alignment="CENTER">
<children>
Expand Down Expand Up @@ -62,38 +61,35 @@
<children>
<Label text="Select a review:">
<VBox.margin>
<Insets left="30.0" top="80.0" />
<Insets top="80.0" />
</VBox.margin>
<font>
<Font name="Myanmar Text Bold" size="12.0" />
</font>
</Label>
<ComboBox fx:id="reviewCombo" prefWidth="150.0" promptText="Select an item..">
<JFXComboBox fx:id="reviewCombo" prefWidth="150.0" promptText="Select an item..">
<VBox.margin>
<Insets left="85.0" top="10.0" />
<Insets top="10.0" />
</VBox.margin>
</ComboBox>
<Label text="Comment:">
<VBox.margin>
<Insets left="30.0" top="15.0" />
</VBox.margin>
</Label>
<TextArea fx:id="commentText" prefHeight="138.0" prefWidth="276.0">
</JFXComboBox>

<JFXTextArea fx:id="commentText" labelFloat="true" prefHeight="138.0" prefWidth="276.0" promptText="Add your comment here">
<opaqueInsets>
<Insets left="50.0" right="15.0" top="5.0" />
</opaqueInsets>
<VBox.margin>
<Insets left="20.0" right="20.0" top="5.0" />
<Insets top="25.0" />
</VBox.margin>
</TextArea>
</JFXTextArea>

<Button id="reviewBtn" mnemonicParsing="false" onAction="#addReviewBtnHandler" prefHeight="40.0" prefWidth="172.0" text="Review Item">
<VBox.margin>
<Insets left="70.0" top="5.0" />
<Insets left="70.0" top="15.0" />
</VBox.margin>
</Button>
</children>
<HBox.margin>
<Insets />
<Insets left="10.0" />
</HBox.margin>
</VBox>
</children>
Expand Down
19 changes: 7 additions & 12 deletions client/src/main/resources/reviewer_reviews.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>

<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.TableColumn?>
<?import javafx.scene.control.TableView?>
<?import javafx.scene.control.TextArea?>
<?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.VBox?>
<?import com.jfoenix.controls.JFXTextArea?>
<?import com.jfoenix.validation.RequiredFieldValidator?>
<?import javafx.geometry.*?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<?import javafx.scene.text.Font?>

<BorderPane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="472.0" prefWidth="662.0" xmlns="http://javafx.com/javafx/8.0.60" xmlns:fx="http://javafx.com/fxml/1" fx:controller="gui.ReviewerReviewsView">
<top>
<HBox id="logo" prefHeight="152.0" prefWidth="585.0" BorderPane.alignment="CENTER">
Expand Down Expand Up @@ -58,11 +53,11 @@
<Font name="Myanmar Text Bold" size="12.0" />
</font>
</Label>
<TextArea fx:id="textArea" prefHeight="200.0" prefWidth="200.0">
<JFXTextArea fx:id="textArea" prefHeight="200.0" prefWidth="200.0">
<VBox.margin>
<Insets left="15.0" right="15.0" />
</VBox.margin>
</TextArea>
</JFXTextArea>
</children>
</VBox>
</children>
Expand Down
Loading