From 389d793b5c1a9360c4dd80362c7b72e57984bd3f Mon Sep 17 00:00:00 2001 From: bmvermeer Date: Tue, 19 Oct 2021 13:35:21 +0200 Subject: [PATCH 1/2] changed links in jsp files so app can be run in subdir --- docker-compose.yml | 1 + .../main/webapp/WEB-INF/views/common/header.jspf | 12 ++++++------ .../webapp/WEB-INF/views/common/navigationbar.jspf | 14 +++++++------- .../main/webapp/WEB-INF/views/common/sidebar.jspf | 10 +++++----- .../src/main/webapp/WEB-INF/views/index.jsp | 6 +++--- .../src/main/webapp/WEB-INF/views/todo/search.jsp | 2 +- .../src/main/webapp/WEB-INF/views/user/login.jsp | 2 +- 7 files changed, 24 insertions(+), 23 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 79ad3dd2ba..f62e340271 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,7 @@ version: "2" services: javagoof: + build: . image: javagoof:orig container_name: javagoof environment: diff --git a/todolist-web-struts/src/main/webapp/WEB-INF/views/common/header.jspf b/todolist-web-struts/src/main/webapp/WEB-INF/views/common/header.jspf index 3ad11e8923..e54378c5c7 100644 --- a/todolist-web-struts/src/main/webapp/WEB-INF/views/common/header.jspf +++ b/todolist-web-struts/src/main/webapp/WEB-INF/views/common/header.jspf @@ -3,13 +3,13 @@ - +/> Todolist MVC - - + rel="stylesheet"> + rel="stylesheet"> - - - + + + diff --git a/todolist-web-struts/src/main/webapp/WEB-INF/views/common/navigationbar.jspf b/todolist-web-struts/src/main/webapp/WEB-INF/views/common/navigationbar.jspf index 08a4b22f0d..7720e9d3cc 100644 --- a/todolist-web-struts/src/main/webapp/WEB-INF/views/common/navigationbar.jspf +++ b/todolist-web-struts/src/main/webapp/WEB-INF/views/common/navigationbar.jspf @@ -5,22 +5,22 @@
- Todolist MVC + >Todolist MVC <%--logged in mode --%>
Hi ${sessionScope.user.name} !
@@ -28,8 +28,8 @@ <%--not logged in mode --%> diff --git a/todolist-web-struts/src/main/webapp/WEB-INF/views/common/sidebar.jspf b/todolist-web-struts/src/main/webapp/WEB-INF/views/common/sidebar.jspf index e62507948e..1acc270055 100644 --- a/todolist-web-struts/src/main/webapp/WEB-INF/views/common/sidebar.jspf +++ b/todolist-web-struts/src/main/webapp/WEB-INF/views/common/sidebar.jspf @@ -6,11 +6,11 @@
- todolist + " alt="todolist">
diff --git a/todolist-web-struts/src/main/webapp/WEB-INF/views/todo/search.jsp b/todolist-web-struts/src/main/webapp/WEB-INF/views/todo/search.jsp index be2a0585a9..bade4b35e3 100644 --- a/todolist-web-struts/src/main/webapp/WEB-INF/views/todo/search.jsp +++ b/todolist-web-struts/src/main/webapp/WEB-INF/views/todo/search.jsp @@ -38,7 +38,7 @@ "> ${currentTodo.priority} "> - Edit + > Edit Delete