diff --git a/src/main/java/me/minidigger/hangar/controller/LinkoutController.java b/src/main/java/me/minidigger/hangar/controller/LinkoutController.java new file mode 100644 index 000000000..738d7ee5c --- /dev/null +++ b/src/main/java/me/minidigger/hangar/controller/LinkoutController.java @@ -0,0 +1,18 @@ +package me.minidigger.hangar.controller; + +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.servlet.ModelAndView; + +import java.util.Map; + +@Controller +public class LinkoutController { + @GetMapping(path = "/linkout", params = "remoteUrl") + public String linkout(@RequestParam("remoteUrl") String remoteUrl, Model model) { + model.addAttribute("remoteUrl", remoteUrl); + return "linkout"; + } +} diff --git a/src/main/resources/templates/toPort/linkout.ftlh b/src/main/resources/templates/linkout.ftlh similarity index 70% rename from src/main/resources/templates/toPort/linkout.ftlh rename to src/main/resources/templates/linkout.ftlh index d41ad1a1a..1d37ef770 100644 --- a/src/main/resources/templates/toPort/linkout.ftlh +++ b/src/main/resources/templates/linkout.ftlh @@ -1,12 +1,9 @@ -@import controllers.sugar.Requests.OreRequest -@import ore.OreConfig -@(remoteUrl: String)(implicit messages: Messages, request: OreRequest[_], config: OreConfig, flash: Flash, assetsFinder: AssetsFinder) - <#import "/spring.ftl" as spring /> -<#import "../utils/hangar.ftlh" as hangar /> - -@layout.base(messages("general.linkout.title")) { +<#import "utils/hangar.ftlh" as hangar /> +<#import "*/layout/base.ftlh" as base /> +<#assign message><@spring.message "general.linkout.title" /> +<@base.base title="${message}">
@@ -16,11 +13,11 @@
-

<@spring.messageArgs "general.linkout.warning" remoteUrl />

+

<@spring.messageArgs "general.linkout.warning", [remoteUrl] />

<@spring.message "project.back" /> - + @@ -29,5 +26,4 @@
- -} + diff --git a/src/main/resources/templates/utils/hangar.ftlh b/src/main/resources/templates/utils/hangar.ftlh index e9f011551..e2e2081de 100644 --- a/src/main/resources/templates/utils/hangar.ftlh +++ b/src/main/resources/templates/utils/hangar.ftlh @@ -9,3 +9,7 @@ <#nested> + +<#macro linkout url> + /linkout?remoteUrl=${url} +