From 5bfcdd214e1e6b3b7653009137d316dabadcda91 Mon Sep 17 00:00:00 2001 From: ulrich <undisclosed> Date: Wed, 27 Dec 2017 19:47:17 +0000 Subject: [PATCH] Fortsetzung am MarkdownServlet --- src/de/uhilger/wbx/web/ViewServlet.java | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/de/uhilger/wbx/web/ViewServlet.java b/src/de/uhilger/wbx/web/ViewServlet.java index 19b0c8b..891a98f 100644 --- a/src/de/uhilger/wbx/web/ViewServlet.java +++ b/src/de/uhilger/wbx/web/ViewServlet.java @@ -18,14 +18,11 @@ package de.uhilger.wbx.web; import java.io.IOException; -import java.security.Principal; -import java.util.logging.Level; import java.util.logging.Logger; import javax.servlet.ServletException; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.catalina.servlets.DefaultServlet; /** * Das ViewServlet fügt dem DefaultServlet von Tomcat @@ -36,10 +33,10 @@ * * TODO: Stylesheets dynamisch einbinden */ -public class ViewServlet extends DefaultServlet { +public class ViewServlet extends WbxServlet { private static final Logger logger = Logger.getLogger(ViewServlet.class.getName()); - private static final String HOME_CTX = "/home"; + //private static final String HOME_CTX = "/home"; /** * Handles the HTTP <code>GET</code> method. @@ -78,16 +75,21 @@ } private void printHeader(ServletOutputStream out) throws IOException { - out.print("<!DOCTYPE html><html><head>"); - out.print("<link rel=\"stylesheet\" type=\"text/css\" href=\"/jslib/bootstrap/css/bootstrap.min.css\">"); - out.print("<link rel=\"stylesheet\" type=\"text/css\" href=\"stile.css\">"); - out.print("</head><body class=\"p-3\">"); + out.print("<!DOCTYPE html><html><head>\r\n"); + out.print("<meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\"/>\r\n"); + out.print("<link rel=\"stylesheet\" type=\"text/css\" href=\"/jslib/bootstrap/css/bootstrap.min.css\">\r\n"); + out.print("<link rel=\"stylesheet\" type=\"text/css\" href=\"/jslib/lightbox/lightbox.css\">\r\n"); + out.print("<link rel=\"stylesheet\" type=\"text/css\" href=\"stile.css\">\r\n"); + out.print("</head><body class=\"p-3\">\r\n"); } private void printFooter(ServletOutputStream out) throws IOException { + out.print("<script src=\"/jslib/jquery/jquery.min.js\"></script>\r\n"); + out.print("<script src=\"/jslib/lightbox/lightbox.min.js\"></script>\r\n"); out.print("</body></html>"); } + /* private String getUrlUser(HttpServletRequest request, String userName) throws IOException { String result = ""; String requestUrlStr = request.getRequestURL().toString(); @@ -114,6 +116,7 @@ } return userName; } + */ /** * Returns a short description of the servlet. -- Gitblit v1.9.3