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

fix: utf-8 on feedback and annotation documents 

fix: path for quizzes done. almost assessment path done
parent bec14bb9
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 33 additions and 29 deletions
gemeinsamforschen/src/main/webapp/assets/js/createQuiz.js 0 → 100644
+ 5
− 0
View file @ be6f432d
$(document).ready(function () {
$("#save").on('click', function () {
document.location = "project-student.jsp?token=" + getUserTokenFromUrl();
});
});
gemeinsamforschen/src/main/webapp/assets/js/takeQuiz.js
+ 1
− 1
View file @ be6f432d
...@@ -68,7 +68,7 @@ $(document).ready(function () { ...@@ -68,7 +68,7 @@ $(document).ready(function () {
} }
}); });
$("#submitQuiz").on("click", function () { $("#submitQuiz").on("click", function () {
location.href="rateContribution.jsp?token="+getUserTokenFromUrl(); document.location="rateContribution.jsp?token="+getUserTokenFromUrl();
}); });
}); });
......
gemeinsamforschen/src/main/webapp/pages/annotation-document.jsp
+ 1
− 0
View file @ be6f432d
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%> <%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
<!DOCTYPE html> <!DOCTYPE html>
......
gemeinsamforschen/src/main/webapp/pages/createQuiz.jsp
+ 21
− 15
View file @ be6f432d
<%--
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" %> <%@ 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> <html>
<head> <head>
...@@ -17,24 +10,37 @@ ...@@ -17,24 +10,37 @@
<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/createQuiz.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">
<link rel="stylesheet" href="../assets/css/Sidebar-Menu-1.css"> <link rel="stylesheet" href="../assets/css/Sidebar-Menu-1.css">
<link rel="stylesheet" href="../assets/css/Sidebar-Menu.css"> <link rel="stylesheet" href="../assets/css/Sidebar-Menu.css">
</head> </head>
<body> <body>
<div id="wrapper"> <div id="wrapper">
<menu:menu></menu:menu> <menu:menu></menu:menu>
<div class="page-content-wrapper"> <div class="page-content-wrapper">
<h1>Projekt1</h1> <div class="container-fluid">
<a href="#"><span class="glyphicon glyphicon-envelope" <h1>Projekt1</h1>
style="font-size:27px;margin-top:-17px;margin-left:600px;"></span></a> <a href="#"><span class="glyphicon glyphicon-envelope"
<a href="#"><span class="glyphicon glyphicon-cog" style="font-size:27px;margin-top:-17px;margin-left:600px;"></span></a>
style="font-size:29px;margin-left:5px;margin-top:-25px;"></span></a> <a href="#"><span class="glyphicon glyphicon-cog"
<div align="center"> 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> </div>
</div> </div>
......
gemeinsamforschen/src/main/webapp/pages/givefeedback.jsp
+ 1
− 1
View file @ be6f432d
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%> <%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
<!DOCTYPE html> <!DOCTYPE html>
......
gemeinsamforschen/src/main/webapp/pages/project-student.jsp
+ 2
− 2
View file @ be6f432d
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
<ul> <ul>
<li><a class="annotationview" role="button"> <li><a class="annotationview" role="button">
Projektbersicht hochgeladen Projektübersicht hochgeladen
<i class="far fa-comments"></i> <i class="far fa-comments"></i>
</a> </a>
</li> </li>
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
<hr> <hr>
<ul> <ul>
<li><a class="annotationview" role="button"> <li><a class="annotationview" role="button">
Blumen an Vegetarier verfttert Blumen an Vegetarier verfüttert
<i class="far fa-comments"></i> <i class="far fa-comments"></i>
</a></li> </a></li>
<li><a class="annotationview" role="button"> <li><a class="annotationview" role="button">
......
gemeinsamforschen/src/main/webapp/pages/rateContribution.jsp
+ 0
− 9
View file @ be6f432d
<%@ 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"%> <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%> <%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
<!DOCTYPE html> <!DOCTYPE html>
......
gemeinsamforschen/src/main/webapp/pages/takeQuiz.jsp
+ 1
− 0
View file @ be6f432d
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
<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/takeQuiz.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/fonts/font-awesome.min.css">
<link rel="stylesheet" href="../assets/css/Community-ChatComments.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-1.css">
......
gemeinsamforschen/src/main/webapp/pages/viewfeedback.jsp
+ 1
− 1
View file @ be6f432d
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%> <%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
<!DOCTYPE html> <!DOCTYPE html>
......
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