Merge pull request #85 from cathrkri/emergencyfix/no-Charity-title

Fix: Fixed Charity name headline not appearing. Fxml related fix
cathrkri · Apr 24, 2026 · cf1e02e · cf1e02e
2 parents 148b855 + 208e826
commit cf1e02e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 26 deletions.
diff --git a/helpmehelpapplication/src/main/resources/fxml/charityPage.fxml b/helpmehelpapplication/src/main/resources/fxml/charityPage.fxml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import javafx.geometry.Insets?>
+<?import javafx.scene.Cursor?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Hyperlink?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ScrollPane?>
 <?import javafx.scene.effect.DropShadow?>
-<?import javafx.scene.image.Image?>
 <?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.Pane?>
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.StackPane?>
@@ -20,8 +21,6 @@
 <?import javafx.scene.shape.Rectangle?>
 <?import javafx.scene.text.Font?>
 
-<?import javafx.scene.Cursor?>
-<?import javafx.scene.layout.HBox?>
 <GridPane fx:id="CharityPage" hgap="0.0" prefHeight="900.0" prefWidth="1200.0" vgap="0.0" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ntnu.systemutvikling.team6.controller.CharityPageController">
 
    <columnConstraints>
@@ -172,6 +171,14 @@
                <StackPane prefHeight="210.0" prefWidth="420.0" style="-fx-background-color:#F5F5F5;" translateX="-70" GridPane.rowIndex="0">
                   <Rectangle arcHeight="25.0" arcWidth="25.0" fill="#F5F5F5" height="210.0" stroke="#8B8B8B" strokeType="INSIDE" translateY="100.0" width="420.0" />
                   <ImageView fx:id="CharityLogo" fitHeight="150.0" fitWidth="220.0" pickOnBounds="true" preserveRatio="true" translateY="100.0" />
+                  <Label fx:id="CharityName" maxWidth="1000" prefHeight="90.0" prefWidth="456.0" style="-fx-text-fill:#2D3C8F;" text="[Charity Name]" textAlignment="CENTER" translateY="-70.0">
+                     <font>
+                        <Font name="System Bold" size="50.0" />
+                     </font>
+                     <padding>
+                        <Insets left="10.0" />
+                     </padding>
+                  </Label>
                   <GridPane.margin>
                      <Insets top="20.0" />
                   </GridPane.margin>
@@ -342,16 +349,6 @@
                <RowConstraints />
             </rowConstraints>
          </GridPane>
-
-         <Label fx:id="CharityName" maxWidth="1000" prefHeight="90.0" prefWidth="456.0" style="-fx-text-fill:#2D3C8F;" text="[Charity Name]" textAlignment="CENTER" translateY="-420.0" GridPane.columnSpan="2" GridPane.rowIndex="0" GridPane.rowSpan="2">
-
-            <font>
-               <Font name="System Bold" size="50.0" />
-            </font>
-            <padding>
-               <Insets left="10.0" />
-            </padding>
-         </Label>
          </GridPane>
       </GridPane>
 

diff --git a/helpmehelpapplication/target/classes/fxml/charityPage.fxml b/helpmehelpapplication/target/classes/fxml/charityPage.fxml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import javafx.geometry.Insets?>
+<?import javafx.scene.Cursor?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Hyperlink?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ScrollPane?>
 <?import javafx.scene.effect.DropShadow?>
-<?import javafx.scene.image.Image?>
 <?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.Pane?>
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.StackPane?>
@@ -20,8 +21,6 @@
 <?import javafx.scene.shape.Rectangle?>
 <?import javafx.scene.text.Font?>
 
-<?import javafx.scene.Cursor?>
-<?import javafx.scene.layout.HBox?>
 <GridPane fx:id="CharityPage" hgap="0.0" prefHeight="900.0" prefWidth="1200.0" vgap="0.0" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ntnu.systemutvikling.team6.controller.CharityPageController">
 
    <columnConstraints>
@@ -172,6 +171,14 @@
                <StackPane prefHeight="210.0" prefWidth="420.0" style="-fx-background-color:#F5F5F5;" translateX="-70" GridPane.rowIndex="0">
                   <Rectangle arcHeight="25.0" arcWidth="25.0" fill="#F5F5F5" height="210.0" stroke="#8B8B8B" strokeType="INSIDE" translateY="100.0" width="420.0" />
                   <ImageView fx:id="CharityLogo" fitHeight="150.0" fitWidth="220.0" pickOnBounds="true" preserveRatio="true" translateY="100.0" />
+                  <Label fx:id="CharityName" maxWidth="1000" prefHeight="90.0" prefWidth="456.0" style="-fx-text-fill:#2D3C8F;" text="[Charity Name]" textAlignment="CENTER" translateY="-70.0">
+                     <font>
+                        <Font name="System Bold" size="50.0" />
+                     </font>
+                     <padding>
+                        <Insets left="10.0" />
+                     </padding>
+                  </Label>
                   <GridPane.margin>
                      <Insets top="20.0" />
                   </GridPane.margin>
@@ -342,16 +349,6 @@
                <RowConstraints />
             </rowConstraints>
          </GridPane>
-
-         <Label fx:id="CharityName" maxWidth="1000" prefHeight="90.0" prefWidth="456.0" style="-fx-text-fill:#2D3C8F;" text="[Charity Name]" textAlignment="CENTER" translateY="-420.0" GridPane.columnSpan="2" GridPane.rowIndex="0" GridPane.rowSpan="2">
-
-            <font>
-               <Font name="System Bold" size="50.0" />
-            </font>
-            <padding>
-               <Insets left="10.0" />
-            </padding>
-         </Label>
          </GridPane>
       </GridPane>