Skip to content
Snippets Groups Projects
Commit b399ae7d authored by Axel's avatar Axel
Browse files

fix: createProject as clickpath works

parent 3a7ea286
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 143 additions and 18 deletions
gemeinsamforschen/src/main/webapp/assets/js/createProject.js 0 → 100644
+ 5
− 0
View file @ b399ae7d
$(document).ready(function(){
$('#submit').on('click', function(){
location.href="specificRequirement.jsp?token="+getUserTokenFromUrl();
});
});
\ No newline at end of file
gemeinsamforschen/src/main/webapp/assets/js/overview-docent.js
+ 7
− 0
View file @ b399ae7d
...@@ -2,4 +2,11 @@ $(document).ready(function(){ ...@@ -2,4 +2,11 @@ $(document).ready(function(){
$('#project1Link').on('click', function(){ $('#project1Link').on('click', function(){
location.href="project-docent.jsp?token="+getUserTokenFromUrl(); location.href="project-docent.jsp?token="+getUserTokenFromUrl();
}); });
$('#project2Link').on('click', function(){
location.href="project-docent.jsp?token="+getUserTokenFromUrl();
});
$('#createProject').on('click', function(){
location.href="createProject.jsp?token="+getUserTokenFromUrl();
});
}); });
\ No newline at end of file
gemeinsamforschen/src/main/webapp/assets/js/specificRequirement.js 0 → 100644
+ 5
− 0
View file @ b399ae7d
$(document).ready(function(){
$('#submit').on('click', function(){
location.href="project-docent.jsp?token="+getUserTokenFromUrl();
});
});
\ No newline at end of file
gemeinsamforschen/src/main/webapp/assets/js/specificSkills.js
+ 1
− 1
View file @ b399ae7d
$(document).ready(function () { $(document).ready(function () {
$('#submit').on('click',function(){ $('#submit').on('click',function(){
document.location="project-student.jsp?token="+getUserTokenFromUrl(); document.location="project-docent.jsp?token="+getUserTokenFromUrl();
}); });
}); });
\ No newline at end of file
gemeinsamforschen/src/main/webapp/pages/createProject.jsp 0 → 100644
+ 47
− 0
View file @ b399ae7d
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
<!DOCTYPE html>
<html>
<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>fltrail</title>
<link rel="stylesheet" href="../assets/css/styles.css">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
<link rel="stylesheet" href="../assets/fonts/font-awesome.min.css">
<link rel="stylesheet" href="../assets/css/Community-ChatComments.css">
<link rel="stylesheet" href="../assets/css/Sidebar-Menu-1.css">
<link rel="stylesheet" href="../assets/css/Sidebar-Menu.css">
<script src="../assets/js/utility.js"></script>
<script src="../assets/js/createProject.js"></script>
</head>
<body>
<div id="wrapper">
<menu:menu></menu:menu>
<div class="page-content-wrapper">
<div class="container-fluid">
<h1>Einschreiben in einen Kurs</h1>
<a href="#"><span class="glyphicon glyphicon-envelope"
style="font-size:27px;margin-top:-17px;margin-left:600px;"></span></a>
<a href="#"><span class="glyphicon glyphicon-cog"
style="font-size:29px;margin-left:5px;margin-top:-25px;"></span></a>
</div>
<div style="margin-left: 2%;">
<br><br>
<label>Projektname: <input placeholder="Projektname"></label>
<label>Passwort: <input placeholder="Passwort"></label>
</div>
<button class="btn btn-default" type="button" id="submit">beitreten</button>
</div>
</div>
</body>
</html>
\ No newline at end of file
gemeinsamforschen/src/main/webapp/pages/overview-docent.jsp
+ 4
− 2
View file @ b399ae7d
...@@ -12,6 +12,8 @@ ...@@ -12,6 +12,8 @@
<link rel="stylesheet" href="../assets/css/styles.css"> <link rel="stylesheet" href="../assets/css/styles.css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script> <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
<script src="../assets/js/utility.js"></script>
<script src="../assets/js/overview-docent.js"></script>
<link rel="stylesheet" href="../assets/fonts/font-awesome.min.css"> <link rel="stylesheet" href="../assets/fonts/font-awesome.min.css">
<link rel="stylesheet" href="../assets/css/Community-ChatComments.css"> <link rel="stylesheet" href="../assets/css/Community-ChatComments.css">
...@@ -66,7 +68,7 @@ ...@@ -66,7 +68,7 @@
</tr> </tr>
<tr class="pageChanger"> <tr class="pageChanger">
<td> <td>
<a href="project-docent.jsp"> <a id="project2Link">
<h1>dummy Projekt2</h1> <h1>dummy Projekt2</h1>
</a> </a>
</td> </td>
...@@ -96,7 +98,7 @@ ...@@ -96,7 +98,7 @@
</tr> </tr>
</table> </table>
</div> </div>
<button class="btn btn-default" type="button" style="margin-left:250px;">Projekt erstellen</button> <button class="btn btn-default" type="button" id="createProject" style="margin-left:250px;">Projekt erstellen</button>
</div> </div>
</div> </div>
......
gemeinsamforschen/src/main/webapp/pages/project-docent.jsp
+ 9
− 5
View file @ b399ae7d
...@@ -9,10 +9,16 @@ ...@@ -9,10 +9,16 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>project-student (copy)</title> <title>fltrail</title>
<link rel="stylesheet" href="../assets/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" href="../assets/css/Community-ChatComments.css">
<link rel="stylesheet" href="../assets/css/styles.css"> <link rel="stylesheet" href="../assets/css/styles.css">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
<link rel="stylesheet" href="../assets/fonts/font-awesome.min.css">
<link rel="stylesheet" href="../assets/css/Community-ChatComments.css">
<link rel="stylesheet" href="../assets/css/Sidebar-Menu-1.css">
<link rel="stylesheet" href="../assets/css/Sidebar-Menu.css">
<script src="../assets/js/utility.js"></script>
</head> </head>
<body> <body>
...@@ -142,8 +148,6 @@ ...@@ -142,8 +148,6 @@
</div> </div>
</div> </div>
<communication:chatWindow orientation="right"></communication:chatWindow> <communication:chatWindow orientation="right"></communication:chatWindow>
<script src="../assets/js/jquery.min.js"></script>
<script src="../assets/bootstrap/js/bootstrap.min.js"></script>
</body> </body>
</html> </html>
\ No newline at end of file
gemeinsamforschen/src/main/webapp/pages/project-student.jsp
+ 4
− 0
View file @ b399ae7d
...@@ -3,6 +3,10 @@ ...@@ -3,6 +3,10 @@
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%> <%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
<!--todo: E-mail an Studenten als Notifikation für Phasenwechsel -->
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
......
gemeinsamforschen/src/main/webapp/pages/specificRequirement.jsp 0 → 100644
+ 61
− 0
View file @ b399ae7d
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
<!DOCTYPE html>
<html>
<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>fltrail</title>
<link rel="stylesheet" href="../assets/css/styles.css">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
<link rel="stylesheet" href="../assets/fonts/font-awesome.min.css">
<link rel="stylesheet" href="../assets/css/Community-ChatComments.css">
<link rel="stylesheet" href="../assets/css/Sidebar-Menu-1.css">
<link rel="stylesheet" href="../assets/css/Sidebar-Menu.css">
<script src="../assets/js/utility.js"></script>
<script src="../assets/js/specificSkills.js"></script>
</head>
<body>
<div id="wrapper">
<menu:menu></menu:menu>
<div class="page-content-wrapper">
<div class="container-fluid">
<h1>Einschreiben in einen Kurs</h1>
<a href="#"><span class="glyphicon glyphicon-envelope"
style="font-size:27px;margin-top:-17px;margin-left:600px;"></span></a>
<a href="#"><span class="glyphicon glyphicon-cog"
style="font-size:29px;margin-left:5px;margin-top:-25px;"></span></a>
</div>
<div align="center">
<h2>Wie schätzen Sie sich in folgenden Kategorien ein?</h2>
<br><br>
<p><input placeholder="Kriterium1">
<label>stark<input type="radio" name="groupCriterion1"></label>
<input type="radio" name="groupCriterion1">
<input type="radio" name="groupCriterion1">
<input type="radio" name="groupCriterion1">
<label><input type="radio" name="groupCriterion1">schwach</label>
</p>
<p><input placeholder="Kriterium2">
<label>stark<input type="radio" name="groupCriterion2"></label>
<input type="radio" name="groupCriterion2">
<input type="radio" name="groupCriterion2">
<input type="radio" name="groupCriterion2">
<label><input type="radio" name="groupCriterion2">schwach</label>
</p>
<button type="button" class="btn btn-light"> + </button>
</div>
<button class="btn btn-default" type="button" id="submit">beitreten</button>
</div>
</div>
</body>
</html>
\ No newline at end of file
gemeinsamforschen/src/main/webapp/pages/specificSkills.jsp
+ 0
− 10
View file @ b399ae7d
...@@ -36,18 +36,8 @@ ...@@ -36,18 +36,8 @@
<h2>Wie schätzen Sie sich in folgenden Kategorien ein?</h2> <h2>Wie schätzen Sie sich in folgenden Kategorien ein?</h2>
<br><br> <br><br>
<p>groupCriterion1 <p>groupCriterion1
<label>stark<input type="radio" name="groupCriterion1"></label>
<input type="radio" name="groupCriterion1">
<input type="radio" name="groupCriterion1">
<input type="radio" name="groupCriterion1">
<label><input type="radio" name="groupCriterion1">schwach</label>
</p> </p>
<p>groupCriterion2 <p>groupCriterion2
<label>stark<input type="radio" name="groupCriterion2"></label>
<input type="radio" name="groupCriterion2">
<input type="radio" name="groupCriterion2">
<input type="radio" name="groupCriterion2">
<label><input type="radio" name="groupCriterion2">schwach</label>
</p> </p>
</div> </div>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment