From ee9f7a11ec58482020a3641977238560457764c0 Mon Sep 17 00:00:00 2001
From: Axel <wiepke@uni-potsdam.de>
Date: Thu, 13 Sep 2018 09:05:19 +0200
Subject: [PATCH] fix: css and js for index and register work
---
.../core/management/pageAppearance/Menu.java | 2 +-
.../pageAppearance/OmniDependencies.java | 8 ++++---
.../gf/core/management/user/UserService.java | 4 ++--
.../src/main/webapp/appearance/register.js | 7 -------
.../webapp/{appearance => core}/footer.css | 0
.../webapp/{appearance => core}/footer.js | 0
.../webapp/{appearance => core}/utility.js | 0
gemeinsamforschen/src/main/webapp/index.jsp | 16 +++++++-------
.../css}/Contact-Form-Clean.css | 0
.../css}/Login-Form-Clean.css | 0
.../css}/Sidebar-Menu-1.css | 0
.../{appearance => libs/css}/Sidebar-Menu.css | 0
.../css}/Sidebar-Menu1.css | 0
.../src/main/webapp/register.jsp | 21 ++++++++-----------
14 files changed, 25 insertions(+), 33 deletions(-)
delete mode 100644 gemeinsamforschen/src/main/webapp/appearance/register.js
rename gemeinsamforschen/src/main/webapp/{appearance => core}/footer.css (100%)
rename gemeinsamforschen/src/main/webapp/{appearance => core}/footer.js (100%)
rename gemeinsamforschen/src/main/webapp/{appearance => core}/utility.js (100%)
rename gemeinsamforschen/src/main/webapp/{appearance => libs/css}/Contact-Form-Clean.css (100%)
rename gemeinsamforschen/src/main/webapp/{appearance => libs/css}/Login-Form-Clean.css (100%)
rename gemeinsamforschen/src/main/webapp/{appearance => libs/css}/Sidebar-Menu-1.css (100%)
rename gemeinsamforschen/src/main/webapp/{appearance => libs/css}/Sidebar-Menu.css (100%)
rename gemeinsamforschen/src/main/webapp/{appearance => libs/css}/Sidebar-Menu1.css (100%)
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/Menu.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/Menu.java
index e1cc2476..8c110acc 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/Menu.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/Menu.java
@@ -33,7 +33,7 @@ public class Menu extends SimpleTagSupport {
if (isStudent){
String menuString = "<div id=\"sidebar-wrapper\">\n" +
" <ul class=\"sidebar-nav\">\n" +
- " <li class=\"sidebar-brand\"><a href=\""+hierarchyToString(hierarchyLevel-1)+"overview-student.jsp?token="+token+"&projectId="+projectId+"\">overview</a></li>\n" +
+ " <li class=\"sidebar-brand\"><a href=\""+hierarchyToString(hierarchyLevel)+"overview-student.jsp?token="+token+"&projectId="+projectId+"\">overview</a></li>\n" +
" <li><a href=\""+hierarchyToString(hierarchyLevel)+"profile/profile.jsp?token="+token+"&projectId="+projectId+"\">Profil</a></li>\n";
if (projectPhase!=null){
if (projectPhase.equals(ProjectPhase.CourseCreation)){
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/OmniDependencies.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/OmniDependencies.java
index fdfd9f66..ad4a64e0 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/OmniDependencies.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/OmniDependencies.java
@@ -5,6 +5,8 @@ import javax.servlet.jsp.tagext.SimpleTagSupport;
import java.io.IOException;
public class OmniDependencies extends SimpleTagSupport {
+ private Integer hierarchyLevel=0;
+
public void doTag() throws IOException {
JspWriter out = getJspContext().getOut();
out.println("<meta charset=\"utf-8\">\n" +
@@ -12,15 +14,15 @@ public class OmniDependencies extends SimpleTagSupport {
" <title>fltrail</title>\n" +
" <link rel=\"stylesheet\" href=\"https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css\">\n" +
" <link rel=\"stylesheet\" href=\"../libs/css/styles.css\">\n" +
- " <link rel=\"stylesheet\" href=\"../libs/css/Footer.css\">\n" +
+ " <link rel=\"stylesheet\" href=\"../core/footer.css\">\n" +
" <script src=\"https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js\"></script>\n" +
" <script src=\"https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js\"></script>\n" +
" <link rel=\"stylesheet\" href=\"../libs/fonts/font-awesome.min.css\">\n" +
" <link rel=\"stylesheet\" href=\"../libs/css/Sidebar-Menu-1.css\">\n" +
" <link rel=\"stylesheet\" href=\"../libs/css/Sidebar-Menu.css\">\n" +
" <script src=\"../libs/js/Sidebar-Menu.js\"></script>\n" +
- " <script src=\"../libs/js/utility.js\"></script>\n" +
- " <script src=\"../libs/js/Footer.js\"></script>\n" +
+ " <script src=\"../core/utility.js\"></script>\n" +
+ " <script src=\"../core/Footer.js\"></script>\n" +
" <link rel=\"stylesheet\" href=\"https://use.fontawesome.com/releases/v5.1.0/css/all.css\"\n" +
" integrity=\"sha384-lKuwvrZot6UHsBSfcMvOkWwlCMgc0TaWr+30HWe3a4ltaBwTZhyTEggF5tJv8tbt\" crossorigin=\"anonymous\">");
}
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/UserService.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/UserService.java
index d5ecb664..94bf3ef8 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/UserService.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/UserService.java
@@ -154,9 +154,9 @@ public class UserService {
private Response redirectToProjectPage(User user, ManagementImpl management) throws URISyntaxException {
String successUrl;
if (user.getStudent() != null && user.getStudent()) {
- successUrl = "../pages/overview-student.jsp?token=";
+ successUrl = "../overview-student.jsp?token=";
} else {
- successUrl = "../pages/overview-docent.jsp?token=";
+ successUrl = "../overview-docent.jsp?token=";
}
successUrl += management.getUserToken(user);
return forwardToLocation(successUrl);
diff --git a/gemeinsamforschen/src/main/webapp/appearance/register.js b/gemeinsamforschen/src/main/webapp/appearance/register.js
deleted file mode 100644
index 08f1aea0..00000000
--- a/gemeinsamforschen/src/main/webapp/appearance/register.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * Created by dehne on 23.02.2018.
- */
-
-$(document).ready(function () {
- $("")
-});
diff --git a/gemeinsamforschen/src/main/webapp/appearance/footer.css b/gemeinsamforschen/src/main/webapp/core/footer.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/appearance/footer.css
rename to gemeinsamforschen/src/main/webapp/core/footer.css
diff --git a/gemeinsamforschen/src/main/webapp/appearance/footer.js b/gemeinsamforschen/src/main/webapp/core/footer.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/appearance/footer.js
rename to gemeinsamforschen/src/main/webapp/core/footer.js
diff --git a/gemeinsamforschen/src/main/webapp/appearance/utility.js b/gemeinsamforschen/src/main/webapp/core/utility.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/appearance/utility.js
rename to gemeinsamforschen/src/main/webapp/core/utility.js
diff --git a/gemeinsamforschen/src/main/webapp/index.jsp b/gemeinsamforschen/src/main/webapp/index.jsp
index 39e538d8..106ee11f 100644
--- a/gemeinsamforschen/src/main/webapp/index.jsp
+++ b/gemeinsamforschen/src/main/webapp/index.jsp
@@ -6,22 +6,22 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>gemeinsam Forschen</title>
- <link rel="stylesheet" href="assets/bootstrap/css/bootstrap.min.css">
+ <link rel="stylesheet" href="libs/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Ubuntu:400,700">
- <link rel="stylesheet" href="assets/css/Login-Form-Clean.css">
- <link rel="stylesheet" href="assets/css/Navigation-with-Button1.css">
- <link rel="stylesheet" href="assets/css/Sidebar-Menu.css">
- <link rel="stylesheet" href="assets/css/Sidebar-Menu1.css">
+ <link rel="stylesheet" href="libs/css/Login-Form-Clean.css">
+ <link rel="stylesheet" href="libs/css/Navigation-with-Button1.css">
+ <link rel="stylesheet" href="libs/css/Sidebar-Menu.css">
+ <link rel="stylesheet" href="libs/css/Sidebar-Menu1.css">
- <script src="libs/js/jquery.min.js"></script>
- <script src="assets/bootstrap/js/bootstrap.min.js"></script>
+ <script src="libs/jquery/jquery.min.js"></script>
+ <script src="libs/bootstrap/js/bootstrap.min.js"></script>
</head>
<body>
<div class="login-clean">
<form method="post" action="./rest/user/exists">
<h2 class="sr-only">Login Formular</h2>
- <div class="illustration"><img src="assets/img/fides-logo.svg"></div>
+ <div class="illustration"><img src="libs/img/fides-logo.svg"></div>
<div class="form-group"><input class="form-control" type="email" name="email" placeholder="Email" autofocus>
</div>
<div class="form-group"><input class="form-control" type="password" name="password" placeholder="Password">
diff --git a/gemeinsamforschen/src/main/webapp/appearance/Contact-Form-Clean.css b/gemeinsamforschen/src/main/webapp/libs/css/Contact-Form-Clean.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/appearance/Contact-Form-Clean.css
rename to gemeinsamforschen/src/main/webapp/libs/css/Contact-Form-Clean.css
diff --git a/gemeinsamforschen/src/main/webapp/appearance/Login-Form-Clean.css b/gemeinsamforschen/src/main/webapp/libs/css/Login-Form-Clean.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/appearance/Login-Form-Clean.css
rename to gemeinsamforschen/src/main/webapp/libs/css/Login-Form-Clean.css
diff --git a/gemeinsamforschen/src/main/webapp/appearance/Sidebar-Menu-1.css b/gemeinsamforschen/src/main/webapp/libs/css/Sidebar-Menu-1.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/appearance/Sidebar-Menu-1.css
rename to gemeinsamforschen/src/main/webapp/libs/css/Sidebar-Menu-1.css
diff --git a/gemeinsamforschen/src/main/webapp/appearance/Sidebar-Menu.css b/gemeinsamforschen/src/main/webapp/libs/css/Sidebar-Menu.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/appearance/Sidebar-Menu.css
rename to gemeinsamforschen/src/main/webapp/libs/css/Sidebar-Menu.css
diff --git a/gemeinsamforschen/src/main/webapp/appearance/Sidebar-Menu1.css b/gemeinsamforschen/src/main/webapp/libs/css/Sidebar-Menu1.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/appearance/Sidebar-Menu1.css
rename to gemeinsamforschen/src/main/webapp/libs/css/Sidebar-Menu1.css
diff --git a/gemeinsamforschen/src/main/webapp/register.jsp b/gemeinsamforschen/src/main/webapp/register.jsp
index 680b7a81..6cc51b08 100644
--- a/gemeinsamforschen/src/main/webapp/register.jsp
+++ b/gemeinsamforschen/src/main/webapp/register.jsp
@@ -5,18 +5,15 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
- <title>Gruppenmatcher</title>
- <link rel="stylesheet" href="assets/bootstrap/css/bootstrap.min.css">
+ <title>flTrail</title>
+ <link rel="stylesheet" href="libs/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Ubuntu:400,700">
- <link rel="stylesheet" href="assets/css/Login-Form-Clean.css">
- <link rel="stylesheet" href="assets/css/Navigation-with-Button1.css">
- <link rel="stylesheet" href="assets/css/Sidebar-Menu.css">
- <link rel="stylesheet" href="assets/css/Sidebar-Menu1.css">
- <link rel="stylesheet" href="assets/css/styles.css">
-
- <script src="libs/js/jquery.min.js"></script>
- <script src="assets/bootstrap/js/bootstrap.min.js"></script>
- <script src="libs/js/Sidebar-Menu.js"></script>
+ <link rel="stylesheet" href="libs/css/Login-Form-Clean.css">
+ <link rel="stylesheet" href="libs/css/Navigation-with-Button1.css">
+ <link rel="stylesheet" href="libs/css/Sidebar-Menu.css">
+ <link rel="stylesheet" href="libs/css/Sidebar-Menu1.css">
+ <script src="libs/jquery/jquery.min.js"></script>
+ <script src="libs/bootstrap/js/bootstrap.min.js"></script>
</head>
<body>
@@ -24,7 +21,7 @@
<%--<form method="post" action="./servlet/createUser">--%>
<form method="post" action="./rest/user/create">
<h2 class="sr-only">Login Formular</h2>
- <div class="illustration"><img src="assets/img/fides-logo.svg"></div>
+ <div class="illustration"><img src="libs/img/fides-logo.svg"></div>
<div class="form-group"><input class="form-control" name="name" placeholder="Name"></div>
<div class="form-group"><input class="form-control" type="email" name="email" placeholder="Email"></div>
<div class="form-group"><input class="form-control" type="password" name="password" placeholder="Password">
--
GitLab