From ef09cf53a5ca546bdb14c82f83169209e66555aa Mon Sep 17 00:00:00 2001
From: Tharre <tharre3@gmail.com>
Date: Tue, 22 May 2018 16:39:15 +0200
Subject: Fix conflicts and reimplement Operation.list()

---
 src/main/resources/fxml/CreateOperationController.fxml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src/main/resources/fxml/CreateOperationController.fxml')

diff --git a/src/main/resources/fxml/CreateOperationController.fxml b/src/main/resources/fxml/CreateOperationController.fxml
index c8e837c..236215b 100644
--- a/src/main/resources/fxml/CreateOperationController.fxml
+++ b/src/main/resources/fxml/CreateOperationController.fxml
@@ -68,11 +68,9 @@
     <Label layoutX="10.0" layoutY="6.0"
       text="Aktive Einsätze" styleClass="text-big">
     </Label>
-    <Label layoutY="12.0" text="Archiv" styleClass="text-medium" AnchorPane.rightAnchor="12"> <!--TODO: Underline-->
-    </Label>
+    <Hyperlink onAction="#onArchivLinkClicked" layoutY="12.0" text="Archiv" styleClass="text-medium" AnchorPane.rightAnchor="12"/>
   </AnchorPane>
   <FlowPane fx:id="fpVehicles" hgap="12" layoutX="40.0" layoutY="228.0" prefHeight="388.0"
     prefWidth="920.0" vgap="12">
   </FlowPane>
-  <fx:include source="ArchivOperation.fxml" fx:id="archivOperation"/>
 </AnchorPane>
-- 
cgit v1.2.3-70-g09d2