From 012d5f911dc6f0e5a64f9cebad9aeeebaa50ef27 Mon Sep 17 00:00:00 2001
From: ulrich
Date: Sat, 23 Jan 2021 13:07:59 +0000
Subject: [PATCH] Bedienoberflaeche komplett nach ui2 ueberfuehrt, Bootstrap und FontAwesome komplett ausgebaut
---
src/java/de/uhilger/filecms/api/HtmlExportService.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/java/de/uhilger/filecms/api/HtmlExportService.java b/src/java/de/uhilger/filecms/api/HtmlExportService.java
index 9dbee4a..8f03618 100644
--- a/src/java/de/uhilger/filecms/api/HtmlExportService.java
+++ b/src/java/de/uhilger/filecms/api/HtmlExportService.java
@@ -43,6 +43,8 @@
private static final Logger logger = Logger.getLogger(HtmlExportService.class.getName());
+ public static final String WBX_APPS_DIR = "wbx.apps";
+
/**
* Den Inhalt eines Ordners als HTML exportieren
*
@@ -121,8 +123,9 @@
}
}
}
- File catalinaBase = new File(getCatalinaBase(getServletContext()));
- File bsDir = new File(catalinaBase, "webapps/jslib/bootstrap/css/");
+ //File catalinaBase = new File(getCatalinaBase(getServletContext()));
+ File catalinaBase = new File(System.getProperty(WBX_APPS_DIR));
+ File bsDir = new File(catalinaBase, "jslib/bootstrap/css/");
try {
FileUtils.copyFile(new File(bsDir, "bootstrap.min.css"), new File(outDir, "bootstrap.min.css"), true);
File stile = new File(dir, "stile.css");
@@ -131,13 +134,13 @@
}
buildThumbnailImages(outDir, new Bild());
- File lbDir = new File(catalinaBase, "webapps/jslib/lightbox/");
+ File lbDir = new File(catalinaBase, "jslib/lightbox/");
FileUtils.copyDirectoryToDirectory(lbDir, outDir);
- File jqDir = new File(catalinaBase, "webapps/jslib/jquery/");
+ File jqDir = new File(catalinaBase, "jslib/jquery/");
FileUtils.copyDirectoryToDirectory(jqDir, outDir);
- File lbimgDir = new File(catalinaBase, "webapps/jslib/lightbox/img");
+ File lbimgDir = new File(catalinaBase, "jslib/lightbox/img");
FileUtils.copyDirectoryToDirectory(lbimgDir, outDir);
@@ -262,6 +265,7 @@
private void printHeader(PrintWriter out) throws IOException {
out.print("<!DOCTYPE html><html><head>\r\n");
+ out.print("<meta charset=\"UTF-8\">\r\n");
out.print("<meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\"/>");
out.print("<link rel=\"stylesheet\" type=\"text/css\" href=\"bootstrap.min.css\">\r\n");
out.print("<link rel=\"stylesheet\" type=\"text/css\" href=\"lightbox/lightbox.css\">\r\n");
--
Gitblit v1.9.3