From be6f432d4e160c6666bf33779f59cf662ca67752 Mon Sep 17 00:00:00 2001
From: Axel <wiepke@uni-potsdam.de>
Date: Tue, 3 Jul 2018 10:08:51 +0200
Subject: [PATCH] fix: utf-8 on feedback and annotation documents
fix: path for quizzes done. almost assessment path done
---
.../src/main/webapp/assets/js/createQuiz.js | 5 +++
.../src/main/webapp/assets/js/takeQuiz.js | 2 +-
.../main/webapp/pages/annotation-document.jsp | 1 +
.../src/main/webapp/pages/createQuiz.jsp | 36 +++++++++++--------
.../src/main/webapp/pages/givefeedback.jsp | 2 +-
.../src/main/webapp/pages/project-student.jsp | 4 +--
.../main/webapp/pages/rateContribution.jsp | 9 -----
.../src/main/webapp/pages/takeQuiz.jsp | 1 +
.../src/main/webapp/pages/viewfeedback.jsp | 2 +-
9 files changed, 33 insertions(+), 29 deletions(-)
create mode 100644 gemeinsamforschen/src/main/webapp/assets/js/createQuiz.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/createQuiz.js b/gemeinsamforschen/src/main/webapp/assets/js/createQuiz.js
new file mode 100644
index 00000000..885e1cf5
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/assets/js/createQuiz.js
@@ -0,0 +1,5 @@
+$(document).ready(function () {
+ $("#save").on('click', function () {
+ document.location = "project-student.jsp?token=" + getUserTokenFromUrl();
+ });
+});
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/takeQuiz.js b/gemeinsamforschen/src/main/webapp/assets/js/takeQuiz.js
index ebdd5fc0..9bc22615 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/takeQuiz.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/takeQuiz.js
@@ -68,7 +68,7 @@ $(document).ready(function () {
}
});
$("#submitQuiz").on("click", function () {
- location.href="rateContribution.jsp?token="+getUserTokenFromUrl();
+ document.location="rateContribution.jsp?token="+getUserTokenFromUrl();
});
});
diff --git a/gemeinsamforschen/src/main/webapp/pages/annotation-document.jsp b/gemeinsamforschen/src/main/webapp/pages/annotation-document.jsp
index 3e2175d8..9f296927 100644
--- a/gemeinsamforschen/src/main/webapp/pages/annotation-document.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/annotation-document.jsp
@@ -1,3 +1,4 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
<!DOCTYPE html>
diff --git a/gemeinsamforschen/src/main/webapp/pages/createQuiz.jsp b/gemeinsamforschen/src/main/webapp/pages/createQuiz.jsp
index 08664139..ad122bc9 100644
--- a/gemeinsamforschen/src/main/webapp/pages/createQuiz.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/createQuiz.jsp
@@ -1,12 +1,5 @@
-<%--
- Created by IntelliJ IDEA.
- User: fides-WHK
- Date: 21.06.2018
- Time: 12:37
- To change this template use File | Settings | File Templates.
---%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
<html>
<head>
@@ -17,24 +10,37 @@
<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://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
+ <script src="../assets/js/utility.js"></script>
+ <script src="../assets/js/createQuiz.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">
+
</head>
<body>
<div id="wrapper">
<menu:menu></menu:menu>
<div class="page-content-wrapper">
- <h1>Projekt1</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 align="center">
-
+ <div class="container-fluid">
+ <h1>Projekt1</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:50px;">
+ <div>
+ <input placeholder="Ihre Frage">
+ </div>
+ <div><label><input type="radio" name="type">Schwierigkeit 3</label></div>
+ <div><label><input type="radio" name="type">Schwierigkeit 2</label></div>
+ <div><label><input type="radio" name="type">Schwierigkeit 1</label></div>
+ <div><input placeholder="korrekte Antwort"><button> + </button><button> - </button></div>
+ <div><input placeholder="inkorrekte Antwort"><button> + </button><button> - </button></div>
+ <button id="save">speichern</button>
</div>
</div>
</div>
diff --git a/gemeinsamforschen/src/main/webapp/pages/givefeedback.jsp b/gemeinsamforschen/src/main/webapp/pages/givefeedback.jsp
index 33d96121..c01c2a3c 100644
--- a/gemeinsamforschen/src/main/webapp/pages/givefeedback.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/givefeedback.jsp
@@ -1,4 +1,4 @@
-
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
<!DOCTYPE html>
diff --git a/gemeinsamforschen/src/main/webapp/pages/project-student.jsp b/gemeinsamforschen/src/main/webapp/pages/project-student.jsp
index cd0847f7..f74e00a2 100644
--- a/gemeinsamforschen/src/main/webapp/pages/project-student.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/project-student.jsp
@@ -68,7 +68,7 @@
<ul>
<li><a class="annotationview" role="button">
- Projektübersicht hochgeladen
+ Projektübersicht hochgeladen
<i class="far fa-comments"></i>
</a>
</li>
@@ -89,7 +89,7 @@
<hr>
<ul>
<li><a class="annotationview" role="button">
- Blumen an Vegetarier verfüttert
+ Blumen an Vegetarier verfüttert
<i class="far fa-comments"></i>
</a></li>
<li><a class="annotationview" role="button">
diff --git a/gemeinsamforschen/src/main/webapp/pages/rateContribution.jsp b/gemeinsamforschen/src/main/webapp/pages/rateContribution.jsp
index 0723492e..a6813d43 100644
--- a/gemeinsamforschen/src/main/webapp/pages/rateContribution.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/rateContribution.jsp
@@ -1,12 +1,3 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<html>
-<head>
- <title>Title</title>
-</head>
-<body>
-
-</body>
-</html>
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
<!DOCTYPE html>
diff --git a/gemeinsamforschen/src/main/webapp/pages/takeQuiz.jsp b/gemeinsamforschen/src/main/webapp/pages/takeQuiz.jsp
index 8660de2b..9ddb2424 100644
--- a/gemeinsamforschen/src/main/webapp/pages/takeQuiz.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/takeQuiz.jsp
@@ -12,6 +12,7 @@
<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="../assets/js/takeQuiz.js"></script>
+ <script src="../assets/js/utility.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">
diff --git a/gemeinsamforschen/src/main/webapp/pages/viewfeedback.jsp b/gemeinsamforschen/src/main/webapp/pages/viewfeedback.jsp
index a6314029..77829625 100644
--- a/gemeinsamforschen/src/main/webapp/pages/viewfeedback.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/viewfeedback.jsp
@@ -1,4 +1,4 @@
-
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
<!DOCTYPE html>
--
GitLab