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

Merge branch 'development_master' into PeerAssessmentAxel

parents 153fa6ba cc4b1143
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 42 additions and 57 deletions
.gitignore
+ 2
− 2
View file @ 35c4adb2
......@@ -19,5 +19,5 @@
**/.classpath
/.idea/vcs.xml
/.idea/workspace.xml
**/.idea
\ No newline at end of file
**/.idea
**/GFRocketChatConfig.java
\ No newline at end of file
gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFRocketChatConfig.java 0 → 100644
+ 8
− 0
View file @ 35c4adb2
package unipotsdam.gf.config;
public class GFRocketChatConfig {
public static final String ROCKET_CHAT_LINK = "https://rocket.farm.uni-potsdam.de/";
public static final String ADMIN_USERNAME = "";
public static final String ADMIN_PASSWORD = "";
}
gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/headLine.java
+ 18
− 1
View file @ 35c4adb2
package unipotsdam.gf.core.management.user;
import unipotsdam.gf.core.management.ManagementImpl;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.JspWriter;
......@@ -12,11 +14,26 @@ public class headLine extends SimpleTagSupport {
PageContext pageContext = (PageContext) getJspContext();
HttpServletRequest request = (HttpServletRequest) pageContext.getRequest();
String projectId = request.getParameter("projectId");
String token = request.getParameter("token");
ManagementImpl management = new ManagementImpl();
JspWriter out = getJspContext().getOut();
User user = management.getUserByToken(token);
Boolean isStudent = user.getStudent();
out.println("<div class=\"container-fluid\">\n" +
" <table style=\"width:100%\">\n" +
" <tr>\n" +
" <td style=\"width:70%\"><h2 id=\"headLineProject\"></h2></td>\n" +
" <td style=\"width:70%\"><h2 id=\"headLineProject\">");
if (projectId!=null){
out.println(projectId);
}else{
if (isStudent){
out.println("Studentenübersicht "+user.getName());
}else{
out.println("Dozentenübersicht "+user.getName());
}
}
out.println("</h2></td>\n" +
" <td style=\"width:30%\">\n" +
" <div align=\"right\" class=\"dropdown\">\n" +
" <button style=\"right: 50px;margin-top:-4px;\" class=\"btn btn-primary dropdown-toggle\" type=\"button\"\n" +
......
gemeinsamforschen/src/main/webapp/assets/css/annotationStyle.css
+ 3
− 0
View file @ 35c4adb2
......@@ -138,6 +138,9 @@ ol {
.flex {
display: flex;
}
.flex .container-fluid{
flex: 1;
}
.full-height {
height: 100%;
}
......
gemeinsamforschen/src/main/webapp/pages/annotation-document.jsp
+ 5
− 28
View file @ 35c4adb2
<%@ 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" %>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>muster-gemeinsam-forschen</title>
<omniDependencies:omniDependencies/>
<!-- css - annotationStyle -->
<link rel="stylesheet" type="text/css" href="../assets/css/annotationStyle.css">
<!-- css - contextMenu -->
<link href="https://swisnl.github.io/jQuery-contextMenu/dist/jquery.contextMenu.css" rel="stylesheet" type="text/css" />
<!-- css - bootstrap -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
<!-- css - styles -->
<link rel="stylesheet" href="../assets/css/styles.css">
<!-- css - font awesome -->
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.1.0/css/all.css" integrity="sha384-lKuwvrZot6UHsBSfcMvOkWwlCMgc0TaWr+30HWe3a4ltaBwTZhyTEggF5tJv8tbt" crossorigin="anonymous">
<!-- css - sidebar -->
<link rel="stylesheet" href="../assets/css/Sidebar-Menu.css">
<!-- js - jQuery -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<!-- js - jQuery validation plugin -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.14.0/jquery.validate.min.js"></script>
<!-- js - bootstrap -->
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
<!-- js - jQuery ui position -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js" type="text/javascript"></script>
<!-- js - contextMenu script -->
<script src="https://swisnl.github.io/jQuery-contextMenu/dist/jquery.contextMenu.js" type="text/javascript"></script>
<!-- js - utility script -->
<script src="../assets/js/utility.js"></script>
<!-- js - annotation websocket script -->
<script src="../assets/js/annotationWebsocket.js"></script>
<!-- js - annotation REST script -->
<script src="../assets/js/annotationRest.js"></script>
<!-- js - annotationScript -->
<script src="../assets/js/annotationScript.js"></script>
</head>
<body>
......@@ -50,15 +35,7 @@
<div class="container-fluid full-height">
<div class="container-fluid-content">
<div class="flex">
<h1>gemeinsam Forschen
<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>
</h1>
<headLine:headLine/>
</div>
<div class="content-mainpage">
<div class="leftcolumn">
......
gemeinsamforschen/src/main/webapp/pages/createProject.jsp
+ 5
− 20
View file @ 35c4adb2
<%@ 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="headLine" %>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
<!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>
<omniDependencies:omniDependencies/>
<script src="../assets/js/createProject.js"></script>
</head>
<body>
<div id="wrapper">
<menu:menu></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>
<headLine:headLine/>
<div style="margin-left: 2%;">
<br><br>
<label>Projektname: <input placeholder="Projektname"></label>
......
gemeinsamforschen/src/main/webapp/pages/overview-docent.jsp
+ 1
− 6
View file @ 35c4adb2
......@@ -16,12 +16,7 @@
<menu:menu/>
<div class="page-content-wrapper">
<h1>Übersicht für Dozent1</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>
<headLine:headLine/>
<table id="projects"> <!-- getElementById('projects').append um neue Projekte anzufügen -->
<tr class="pageChanger">
<td>
......
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