diff --git a/gemeinsamforschen/src/main/webapp/libs/css/unstructured-annotation.css b/gemeinsamforschen/src/main/webapp/annotation/css/unstructured-annotation.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/css/unstructured-annotation.css
rename to gemeinsamforschen/src/main/webapp/annotation/css/unstructured-annotation.css
diff --git a/gemeinsamforschen/src/main/webapp/libs/css/unstructured-upload.css b/gemeinsamforschen/src/main/webapp/annotation/css/unstructured-upload.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/css/unstructured-upload.css
rename to gemeinsamforschen/src/main/webapp/annotation/css/unstructured-upload.css
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/annotationRest.js b/gemeinsamforschen/src/main/webapp/annotation/js/annotationRest.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/js/annotationRest.js
rename to gemeinsamforschen/src/main/webapp/annotation/js/annotationRest.js
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/annotationScript.js b/gemeinsamforschen/src/main/webapp/annotation/js/annotationScript.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/js/annotationScript.js
rename to gemeinsamforschen/src/main/webapp/annotation/js/annotationScript.js
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/annotationWebsocket.js b/gemeinsamforschen/src/main/webapp/annotation/js/annotationWebsocket.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/js/annotationWebsocket.js
rename to gemeinsamforschen/src/main/webapp/annotation/js/annotationWebsocket.js
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/createJournal.js b/gemeinsamforschen/src/main/webapp/annotation/js/createJournal.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/js/createJournal.js
rename to gemeinsamforschen/src/main/webapp/annotation/js/createJournal.js
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/unstructuredAnnotation.js b/gemeinsamforschen/src/main/webapp/annotation/js/unstructuredAnnotation.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/js/unstructuredAnnotation.js
rename to gemeinsamforschen/src/main/webapp/annotation/js/unstructuredAnnotation.js
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/unstructuredRest.js b/gemeinsamforschen/src/main/webapp/annotation/js/unstructuredRest.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/js/unstructuredRest.js
rename to gemeinsamforschen/src/main/webapp/annotation/js/unstructuredRest.js
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/unstructuredUpload.js b/gemeinsamforschen/src/main/webapp/annotation/js/unstructuredUpload.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/js/unstructuredUpload.js
rename to gemeinsamforschen/src/main/webapp/annotation/js/unstructuredUpload.js
diff --git a/gemeinsamforschen/src/main/webapp/libs/css/annotationStyle.css b/gemeinsamforschen/src/main/webapp/assessment/css/annotationStyle.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/css/annotationStyle.css
rename to gemeinsamforschen/src/main/webapp/assessment/css/annotationStyle.css
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/AlertAssessmentOutlier.js b/gemeinsamforschen/src/main/webapp/assessment/js/AlertAssessmentOutlier.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/js/AlertAssessmentOutlier.js
rename to gemeinsamforschen/src/main/webapp/assessment/js/AlertAssessmentOutlier.js
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/Quiz-docent.js b/gemeinsamforschen/src/main/webapp/assessment/js/Quiz-docent.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/js/Quiz-docent.js
rename to gemeinsamforschen/src/main/webapp/assessment/js/Quiz-docent.js
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/Quiz.js b/gemeinsamforschen/src/main/webapp/assessment/js/Quiz.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/js/Quiz.js
rename to gemeinsamforschen/src/main/webapp/assessment/js/Quiz.js
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/assessmentCalculator.js b/gemeinsamforschen/src/main/webapp/assessment/js/assessmentCalculator.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/js/assessmentCalculator.js
rename to gemeinsamforschen/src/main/webapp/assessment/js/assessmentCalculator.js
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/createQuiz.js b/gemeinsamforschen/src/main/webapp/assessment/js/createQuiz.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/js/createQuiz.js
rename to gemeinsamforschen/src/main/webapp/assessment/js/createQuiz.js
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/finalAssessment.js b/gemeinsamforschen/src/main/webapp/assessment/js/finalAssessment.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/js/finalAssessment.js
rename to gemeinsamforschen/src/main/webapp/assessment/js/finalAssessment.js
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/grading.js b/gemeinsamforschen/src/main/webapp/assessment/js/grading.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/js/grading.js
rename to gemeinsamforschen/src/main/webapp/assessment/js/grading.js
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/rateContribution.js b/gemeinsamforschen/src/main/webapp/assessment/js/rateContribution.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/js/rateContribution.js
rename to gemeinsamforschen/src/main/webapp/assessment/js/rateContribution.js
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/takeQuiz.js b/gemeinsamforschen/src/main/webapp/assessment/js/takeQuiz.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/js/takeQuiz.js
rename to gemeinsamforschen/src/main/webapp/assessment/js/takeQuiz.js
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/viewQuiz.js b/gemeinsamforschen/src/main/webapp/assessment/js/viewQuiz.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/js/viewQuiz.js
rename to gemeinsamforschen/src/main/webapp/assessment/js/viewQuiz.js
diff --git a/gemeinsamforschen/src/main/webapp/libs/css/Community-ChatComments.css b/gemeinsamforschen/src/main/webapp/communication/css/Community-ChatComments.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/css/Community-ChatComments.css
rename to gemeinsamforschen/src/main/webapp/communication/css/Community-ChatComments.css
diff --git a/gemeinsamforschen/src/main/webapp/libs/css/Team-Boxed.css b/gemeinsamforschen/src/main/webapp/communication/css/Team-Boxed.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/css/Team-Boxed.css
rename to gemeinsamforschen/src/main/webapp/communication/css/Team-Boxed.css
diff --git a/gemeinsamforschen/src/main/webapp/libs/css/footer.css b/gemeinsamforschen/src/main/webapp/core/appearance/footer.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/css/footer.css
rename to gemeinsamforschen/src/main/webapp/core/appearance/footer.css
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/footer.js b/gemeinsamforschen/src/main/webapp/core/appearance/footer.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/js/footer.js
rename to gemeinsamforschen/src/main/webapp/core/appearance/footer.js
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/utility.js b/gemeinsamforschen/src/main/webapp/core/appearance/utility.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/js/utility.js
rename to gemeinsamforschen/src/main/webapp/core/appearance/utility.js
diff --git a/gemeinsamforschen/src/main/webapp/libs/css/Contact-Form-Clean.css b/gemeinsamforschen/src/main/webapp/core/login/css/Contact-Form-Clean.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/css/Contact-Form-Clean.css
rename to gemeinsamforschen/src/main/webapp/core/login/css/Contact-Form-Clean.css
diff --git a/gemeinsamforschen/src/main/webapp/libs/css/Login-Form-Clean.css b/gemeinsamforschen/src/main/webapp/core/login/css/Login-Form-Clean.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/css/Login-Form-Clean.css
rename to gemeinsamforschen/src/main/webapp/core/login/css/Login-Form-Clean.css
diff --git a/gemeinsamforschen/src/main/webapp/libs/css/Sidebar-Menu-1.css b/gemeinsamforschen/src/main/webapp/core/login/css/Sidebar-Menu-1.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/css/Sidebar-Menu-1.css
rename to gemeinsamforschen/src/main/webapp/core/login/css/Sidebar-Menu-1.css
diff --git a/gemeinsamforschen/src/main/webapp/libs/css/Sidebar-Menu.css b/gemeinsamforschen/src/main/webapp/core/login/css/Sidebar-Menu.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/css/Sidebar-Menu.css
rename to gemeinsamforschen/src/main/webapp/core/login/css/Sidebar-Menu.css
diff --git a/gemeinsamforschen/src/main/webapp/libs/css/Sidebar-Menu1.css b/gemeinsamforschen/src/main/webapp/core/login/css/Sidebar-Menu1.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/css/Sidebar-Menu1.css
rename to gemeinsamforschen/src/main/webapp/core/login/css/Sidebar-Menu1.css
diff --git a/gemeinsamforschen/src/main/webapp/index.jsp b/gemeinsamforschen/src/main/webapp/core/login/index.jsp
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/index.jsp
rename to gemeinsamforschen/src/main/webapp/core/login/index.jsp
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/register.js b/gemeinsamforschen/src/main/webapp/core/login/js/register.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/js/register.js
rename to gemeinsamforschen/src/main/webapp/core/login/js/register.js
diff --git a/gemeinsamforschen/src/main/webapp/register.jsp b/gemeinsamforschen/src/main/webapp/core/login/register.jsp
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/register.jsp
rename to gemeinsamforschen/src/main/webapp/core/login/register.jsp
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/createProject.js b/gemeinsamforschen/src/main/webapp/course/js/createProject.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/js/createProject.js
rename to gemeinsamforschen/src/main/webapp/course/js/createProject.js
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/enrollProject.js b/gemeinsamforschen/src/main/webapp/course/js/enrollProject.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/js/enrollProject.js
rename to gemeinsamforschen/src/main/webapp/course/js/enrollProject.js
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/showProjects.js b/gemeinsamforschen/src/main/webapp/course/js/showProjects.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/js/showProjects.js
rename to gemeinsamforschen/src/main/webapp/course/js/showProjects.js
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/specificRequirement.js b/gemeinsamforschen/src/main/webapp/course/js/specificRequirement.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/js/specificRequirement.js
rename to gemeinsamforschen/src/main/webapp/course/js/specificRequirement.js
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/specificSkills.js b/gemeinsamforschen/src/main/webapp/course/js/specificSkills.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/js/specificSkills.js
rename to gemeinsamforschen/src/main/webapp/course/js/specificSkills.js
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/changePhase.js b/gemeinsamforschen/src/main/webapp/docent/js/changePhase.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/js/changePhase.js
rename to gemeinsamforschen/src/main/webapp/docent/js/changePhase.js
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/overview-docent.js b/gemeinsamforschen/src/main/webapp/docent/js/overview-docent.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/js/overview-docent.js
rename to gemeinsamforschen/src/main/webapp/docent/js/overview-docent.js
diff --git a/gemeinsamforschen/src/main/webapp/libs/css/viewfeedback.css b/gemeinsamforschen/src/main/webapp/feedback/css/viewfeedback.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/css/viewfeedback.css
rename to gemeinsamforschen/src/main/webapp/feedback/css/viewfeedback.css
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/givepeerfeedback.js b/gemeinsamforschen/src/main/webapp/feedback/js/givepeerfeedback.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/js/givepeerfeedback.js
rename to gemeinsamforschen/src/main/webapp/feedback/js/givepeerfeedback.js
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/peerfeedback.js b/gemeinsamforschen/src/main/webapp/feedback/js/peerfeedback.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/js/peerfeedback.js
rename to gemeinsamforschen/src/main/webapp/feedback/js/peerfeedback.js
diff --git a/gemeinsamforschen/src/main/webapp/libs/css/create-journal.css b/gemeinsamforschen/src/main/webapp/journal/css/create-journal.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/css/create-journal.css
rename to gemeinsamforschen/src/main/webapp/journal/css/create-journal.css
diff --git a/gemeinsamforschen/src/main/webapp/libs/css/e-portfolio.css b/gemeinsamforschen/src/main/webapp/journal/css/e-portfolio.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/css/e-portfolio.css
rename to gemeinsamforschen/src/main/webapp/journal/css/e-portfolio.css
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/e-portfolio.js b/gemeinsamforschen/src/main/webapp/journal/js/e-portfolio.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/js/e-portfolio.js
rename to gemeinsamforschen/src/main/webapp/journal/js/e-portfolio.js
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/editDescription.js b/gemeinsamforschen/src/main/webapp/journal/js/editDescription.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/js/editDescription.js
rename to gemeinsamforschen/src/main/webapp/journal/js/editDescription.js
diff --git a/gemeinsamforschen/src/main/webapp/libs/css/Customizable-Carousel-swipe-enabled.css b/gemeinsamforschen/src/main/webapp/libs/carousel/Customizable-Carousel-swipe-enabled.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/css/Customizable-Carousel-swipe-enabled.css
rename to gemeinsamforschen/src/main/webapp/libs/carousel/Customizable-Carousel-swipe-enabled.css
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/Customizable-Carousel-swipe-enabled.js b/gemeinsamforschen/src/main/webapp/libs/carousel/Customizable-Carousel-swipe-enabled.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/js/Customizable-Carousel-swipe-enabled.js
rename to gemeinsamforschen/src/main/webapp/libs/carousel/Customizable-Carousel-swipe-enabled.js
diff --git a/gemeinsamforschen/src/main/webapp/libs/css/editDescription.css b/gemeinsamforschen/src/main/webapp/libs/css/editDescription.css
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/gemeinsamforschen/src/main/webapp/libs/css/jquery.tagsinput.css b/gemeinsamforschen/src/main/webapp/libs/css/jquery.tagsinput.css
deleted file mode 100644
index c595e249f9fd8b449e8bbb725bf0805792135e43..0000000000000000000000000000000000000000
--- a/gemeinsamforschen/src/main/webapp/libs/css/jquery.tagsinput.css
+++ /dev/null
@@ -1,7 +0,0 @@
-div.tagsinput { border:1px solid #CCC; background: #FFF; padding:5px; width:300px; height:100px; overflow-y: auto;}
-div.tagsinput span.tag { border: 1px solid #a5d24a; -moz-border-radius:2px; -webkit-border-radius:2px; display: block; float: left; padding: 5px; text-decoration:none; background: #cde69c; color: #638421; margin-right: 5px; margin-bottom:5px;font-family: helvetica; font-size:13px;}
-div.tagsinput span.tag a { font-weight: bold; color: #82ad2b; text-decoration:none; font-size: 11px; }
-div.tagsinput input { width:80px; margin:0px; font-family: helvetica; font-size: 13px; border:1px solid transparent; padding:5px; background: transparent; color: #000; outline:0px; margin-right:5px; margin-bottom:5px; }
-div.tagsinput div { display:block; float: left; }
-.tags_clear { clear: both; width: 100%; height: 0px; }
-.not_valid {background: #FBD8DB !important; color: #90111A !important;}
diff --git a/gemeinsamforschen/src/main/webapp/libs/css/projects.css b/gemeinsamforschen/src/main/webapp/libs/css/projects.css
deleted file mode 100644
index e175d05822f1525c1bbaac947faa83d0d191bd6d..0000000000000000000000000000000000000000
--- a/gemeinsamforschen/src/main/webapp/libs/css/projects.css
+++ /dev/null
@@ -1,27 +0,0 @@
-.tagLabel {
- color: #000 !important;
- text-shadow: none !important;
- -webkit-box-shadow: none !important;
- box-shadow: none !important;
- display: inline !important;;
- padding: .2em .6em .3em !important;
- margin: 3px !important;
- font-size: 75% !important;;
- font-weight: 700 !important;;
- line-height: 1 !important;;
- color: #fff !important;;
- text-align: center !important;;
- white-space: nowrap !important;;
- vertical-align: baseline !important;;
- border-radius: .25em !important;;
- background-color: #5cb85c !important;
-
-}
-
-.label {
- border: 1px solid #000;
-}
-
-
-
-
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/jquery.min.js b/gemeinsamforschen/src/main/webapp/libs/jquery/jquery.min.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/js/jquery.min.js
rename to gemeinsamforschen/src/main/webapp/libs/jquery/jquery.min.js
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/Sidebar-Menu.js b/gemeinsamforschen/src/main/webapp/libs/js/Sidebar-Menu.js
deleted file mode 100644
index 75d87e9ab3437b44784b97cf2e600b636f8b4257..0000000000000000000000000000000000000000
--- a/gemeinsamforschen/src/main/webapp/libs/js/Sidebar-Menu.js
+++ /dev/null
@@ -1,4 +0,0 @@
-$("#menu-toggle").click(function(e) {
- e.preventDefault();
- $("#wrapper").toggleClass("toggled");
-});
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/jquery.tagsinput.js b/gemeinsamforschen/src/main/webapp/libs/js/jquery.tagsinput.js
deleted file mode 100644
index b6c75e4dbb7cf0d91e67eb4ed9e4a35d0e058f80..0000000000000000000000000000000000000000
--- a/gemeinsamforschen/src/main/webapp/libs/js/jquery.tagsinput.js
+++ /dev/null
@@ -1,390 +0,0 @@
-/*
-
- jQuery Tags Input Plugin 1.3.3
-
- Copyright (c) 2011 XOXCO, Inc
-
- Documentation for this plugin lives here:
- http://xoxco.com/clickable/jquery-tags-input
-
- Licensed under the MIT license:
- http://www.opensource.org/licenses/mit-license.php
-
- ben@xoxco.com
-
-*/
-
-(function($) {
-
- var delimiter = new Array();
- var tags_callbacks = new Array();
- $.fn.doAutosize = function(o){
- var minWidth = $(this).data('minwidth'),
- maxWidth = $(this).data('maxwidth'),
- val = '',
- input = $(this),
- testSubject = $('#'+$(this).data('tester_id'));
-
- if (val === (val = input.val())) {return;}
-
- // Enter new content into testSubject
- var escaped = val.replace(/&/g, '&').replace(/\s/g,' ').replace(/</g, '<').replace(/>/g, '>');
- testSubject.html(escaped);
- // Calculate new width + whether to change
- var testerWidth = testSubject.width(),
- newWidth = (testerWidth + o.comfortZone) >= minWidth ? testerWidth + o.comfortZone : minWidth,
- currentWidth = input.width(),
- isValidWidthChange = (newWidth < currentWidth && newWidth >= minWidth)
- || (newWidth > minWidth && newWidth < maxWidth);
-
- // Animate width
- if (isValidWidthChange) {
- input.width(newWidth);
- }
-
-
- };
- $.fn.resetAutosize = function(options){
- // alert(JSON.stringify(options));
- var minWidth = $(this).data('minwidth') || options.minInputWidth || $(this).width(),
- maxWidth = $(this).data('maxwidth') || options.maxInputWidth || ($(this).closest('.tagsinput').width() - options.inputPadding),
- val = '',
- input = $(this),
- testSubject = $('<tester/>').css({
- position: 'absolute',
- top: -9999,
- left: -9999,
- width: 'auto',
- fontSize: input.css('fontSize'),
- fontFamily: input.css('fontFamily'),
- fontWeight: input.css('fontWeight'),
- letterSpacing: input.css('letterSpacing'),
- whiteSpace: 'nowrap'
- }),
- testerId = $(this).attr('id')+'_autosize_tester';
- if(! $('#'+testerId).length > 0){
- testSubject.attr('id', testerId);
- testSubject.appendTo('body');
- }
-
- input.data('minwidth', minWidth);
- input.data('maxwidth', maxWidth);
- input.data('tester_id', testerId);
- input.css('width', minWidth);
- };
-
- $.fn.addTag = function(value,options) {
- options = jQuery.extend({focus:false,callback:true},options);
- this.each(function() {
- var id = $(this).attr('id');
-
- var tagslist = $(this).val().split(delimiter[id]);
- if (tagslist[0] == '') {
- tagslist = new Array();
- }
-
- value = jQuery.trim(value);
-
- if (options.unique) {
- var skipTag = $(this).tagExist(value);
- if(skipTag == true) {
- //Marks fake input as not_valid to let styling it
- $('#'+id+'_tag').addClass('not_valid');
- }
- } else {
- var skipTag = false;
- }
-
- if (value !='' && skipTag != true) {
- $('<span>').addClass('tag').append(
- $('<span>').text(value).append(' '),
- $('<a>', {
- href : '#',
- title : 'Removing tag',
- text : 'x'
- }).click(function () {
- return $('#' + id).removeTag(escape(value));
- })
- ).insertBefore('#' + id + '_addTag');
-
- tagslist.push(value);
-
- $('#'+id+'_tag').val('');
- if (options.focus) {
- $('#'+id+'_tag').focus();
- } else {
- $('#'+id+'_tag').blur();
- }
-
- $.fn.tagsInput.updateTagsField(this,tagslist);
-
- if (options.callback && tags_callbacks[id] && tags_callbacks[id]['onAddTag']) {
- var f = tags_callbacks[id]['onAddTag'];
- f.call(this, value);
- }
- if(tags_callbacks[id] && tags_callbacks[id]['onChange'])
- {
- var i = tagslist.length;
- var f = tags_callbacks[id]['onChange'];
- f.call(this, $(this), tagslist[i-1]);
- }
- }
-
- });
-
- return false;
- };
-
- $.fn.removeTag = function(value) {
- value = unescape(value);
- this.each(function() {
- var id = $(this).attr('id');
-
- var old = $(this).val().split(delimiter[id]);
-
- $('#'+id+'_tagsinput .tag').remove();
- str = '';
- for (i=0; i< old.length; i++) {
- if (old[i]!=value) {
- str = str + delimiter[id] +old[i];
- }
- }
-
- $.fn.tagsInput.importTags(this,str);
-
- if (tags_callbacks[id] && tags_callbacks[id]['onRemoveTag']) {
- var f = tags_callbacks[id]['onRemoveTag'];
- f.call(this, value);
- }
- });
-
- return false;
- };
-
- $.fn.tagExist = function(val) {
- var id = $(this).attr('id');
- var tagslist = $(this).val().split(delimiter[id]);
- return (jQuery.inArray(val, tagslist) >= 0); //true when tag exists, false when not
- };
-
- // clear all existing tags and import new ones from a string
- $.fn.importTags = function(str) {
- var id = $(this).attr('id');
- $('#'+id+'_tagsinput .tag').remove();
- $.fn.tagsInput.importTags(this,str);
- }
-
- $.fn.tagsInput = function(options) {
- var settings = jQuery.extend({
- interactive:true,
- defaultText:'add a tag',
- minChars:0,
- width:'300px',
- height:'100px',
- autocomplete: {selectFirst: false },
- hide:true,
- delimiter: ',',
- unique:true,
- removeWithBackspace:true,
- placeholderColor:'#666666',
- autosize: true,
- comfortZone: 20,
- inputPadding: 6*2
- },options);
-
- var uniqueIdCounter = 0;
-
- this.each(function() {
- // If we have already initialized the field, do not do it again
- if (typeof $(this).attr('data-tagsinput-init') !== 'undefined') {
- return;
- }
-
- // Mark the field as having been initialized
- $(this).attr('data-tagsinput-init', true);
-
- if (settings.hide) {
- $(this).hide();
- }
- var id = $(this).attr('id');
- if (!id || delimiter[$(this).attr('id')]) {
- id = $(this).attr('id', 'tags' + new Date().getTime() + (uniqueIdCounter++)).attr('id');
- }
-
- var data = jQuery.extend({
- pid:id,
- real_input: '#'+id,
- holder: '#'+id+'_tagsinput',
- input_wrapper: '#'+id+'_addTag',
- fake_input: '#'+id+'_tag'
- },settings);
-
- delimiter[id] = data.delimiter;
-
- if (settings.onAddTag || settings.onRemoveTag || settings.onChange) {
- tags_callbacks[id] = new Array();
- tags_callbacks[id]['onAddTag'] = settings.onAddTag;
- tags_callbacks[id]['onRemoveTag'] = settings.onRemoveTag;
- tags_callbacks[id]['onChange'] = settings.onChange;
- }
-
- var markup = '<div id="'+id+'_tagsinput" class="tagsinput"><div id="'+id+'_addTag">';
-
- if (settings.interactive) {
- markup = markup + '<input id="'+id+'_tag" value="" data-default="'+settings.defaultText+'" />';
- }
-
- markup = markup + '</div><div class="tags_clear"></div></div>';
-
- $(markup).insertAfter(this);
-
- $(data.holder).css('width',settings.width);
- $(data.holder).css('min-height',settings.height);
- $(data.holder).css('height',settings.height);
-
- if ($(data.real_input).val()!='') {
- $.fn.tagsInput.importTags($(data.real_input),$(data.real_input).val());
- }
- if (settings.interactive) {
- $(data.fake_input).val($(data.fake_input).attr('data-default'));
- $(data.fake_input).css('color',settings.placeholderColor);
- $(data.fake_input).resetAutosize(settings);
-
- $(data.holder).bind('click',data,function(event) {
- $(event.data.fake_input).focus();
- });
-
- $(data.fake_input).bind('focus',data,function(event) {
- if ($(event.data.fake_input).val()==$(event.data.fake_input).attr('data-default')) {
- $(event.data.fake_input).val('');
- }
- $(event.data.fake_input).css('color','#000000');
- });
-
- if (settings.autocomplete_url != undefined) {
- autocomplete_options = {source: settings.autocomplete_url};
- for (attrname in settings.autocomplete) {
- autocomplete_options[attrname] = settings.autocomplete[attrname];
- }
-
- if (jQuery.Autocompleter !== undefined) {
- $(data.fake_input).autocomplete(settings.autocomplete_url, settings.autocomplete);
- $(data.fake_input).bind('result',data,function(event,data,formatted) {
- if (data) {
- $('#'+id).addTag(data[0] + "",{focus:true,unique:(settings.unique)});
- }
- });
- } else if (jQuery.ui.autocomplete !== undefined) {
- $(data.fake_input).autocomplete(autocomplete_options);
- $(data.fake_input).bind('autocompleteselect',data,function(event,ui) {
- $(event.data.real_input).addTag(ui.item.value,{focus:true,unique:(settings.unique)});
- return false;
- });
- }
-
-
- } else {
- // if a user tabs out of the field, create a new tag
- // this is only available if autocomplete is not used.
- $(data.fake_input).bind('blur',data,function(event) {
- var d = $(this).attr('data-default');
- if ($(event.data.fake_input).val()!='' && $(event.data.fake_input).val()!=d) {
- if( (event.data.minChars <= $(event.data.fake_input).val().length) && (!event.data.maxChars || (event.data.maxChars >= $(event.data.fake_input).val().length)) )
- $(event.data.real_input).addTag($(event.data.fake_input).val(),{focus:true,unique:(settings.unique)});
- } else {
- $(event.data.fake_input).val($(event.data.fake_input).attr('data-default'));
- $(event.data.fake_input).css('color',settings.placeholderColor);
- }
- return false;
- });
-
- }
- // if user types a default delimiter like comma,semicolon and then create a new tag
- $(data.fake_input).bind('keypress',data,function(event) {
- if (_checkDelimiter(event)) {
- event.preventDefault();
- if( (event.data.minChars <= $(event.data.fake_input).val().length) && (!event.data.maxChars || (event.data.maxChars >= $(event.data.fake_input).val().length)) )
- $(event.data.real_input).addTag($(event.data.fake_input).val(),{focus:true,unique:(settings.unique)});
- $(event.data.fake_input).resetAutosize(settings);
- return false;
- } else if (event.data.autosize) {
- $(event.data.fake_input).doAutosize(settings);
-
- }
- });
- //Delete last tag on backspace
- data.removeWithBackspace && $(data.fake_input).bind('keydown', function(event)
- {
- if(event.keyCode == 8 && $(this).val() == '')
- {
- event.preventDefault();
- var last_tag = $(this).closest('.tagsinput').find('.tag:last').text();
- var id = $(this).attr('id').replace(/_tag$/, '');
- last_tag = last_tag.replace(/[\s]+x$/, '');
- $('#' + id).removeTag(escape(last_tag));
- $(this).trigger('focus');
- }
- });
- $(data.fake_input).blur();
-
- //Removes the not_valid class when user changes the value of the fake input
- if(data.unique) {
- $(data.fake_input).keydown(function(event){
- if(event.keyCode == 8 || String.fromCharCode(event.which).match(/\w+|[áéÃóúÃÉÃÓÚñÑ,/]+/)) {
- $(this).removeClass('not_valid');
- }
- });
- }
- } // if settings.interactive
- });
-
- return this;
-
- };
-
- $.fn.tagsInput.updateTagsField = function(obj,tagslist) {
- var id = $(obj).attr('id');
- $(obj).val(tagslist.join(delimiter[id]));
- };
-
- $.fn.tagsInput.importTags = function(obj,val) {
- $(obj).val('');
- var id = $(obj).attr('id');
- var tags = val.split(delimiter[id]);
- for (i=0; i<tags.length; i++) {
- $(obj).addTag(tags[i],{focus:false,callback:false});
- }
- if(tags_callbacks[id] && tags_callbacks[id]['onChange'])
- {
- var f = tags_callbacks[id]['onChange'];
- f.call(obj, obj, tags[i]);
- }
- };
-
- /**
- * check delimiter Array
- * @param event
- * @returns {boolean}
- * @private
- */
- var _checkDelimiter = function(event){
- var found = false;
- if (event.which == 13) {
- return true;
- }
-
- if (typeof event.data.delimiter === 'string') {
- if (event.which == event.data.delimiter.charCodeAt(0)) {
- found = true;
- }
- } else {
- $.each(event.data.delimiter, function(index, delimiter) {
- if (event.which == delimiter.charCodeAt(0)) {
- found = true;
- }
- });
- }
-
- return found;
- }
-})(jQuery);
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/project-student.js.orig b/gemeinsamforschen/src/main/webapp/libs/js/project-student.js.orig
deleted file mode 100644
index 91e62e10ffcba41e1d9200d943e1ae662256b591..0000000000000000000000000000000000000000
--- a/gemeinsamforschen/src/main/webapp/libs/js/project-student.js.orig
+++ /dev/null
@@ -1,110 +0,0 @@
-$(document).ready(function(){
- // fetch all submission part project representations from database
- getSubmissionPartsByProjectId(getQueryVariable("projectId"), function (response) {
-
- // iterate over response and display each element
- for (let i = 0; i < response.length; i++) {
- displaySubmission(response[i].user, response[i].category, response[i].fullSubmissionId);
- }
-
- // add click listener to feedback buttons
- $('.annotationview').click(function () {
- let fullSubmissionId = $(this).closest("li").data("fullSubmissionId");
- let category = $(this).closest("li").data("category");
- location.href="annotation-document.jsp?token=" + getUserTokenFromUrl() +
- "&projectId=" + getQueryVariable("projectId") +
- "&fullSubmissionId=" + fullSubmissionId +
- "&category=" + category;
- });
-
- }, function () {
- // display empty view
- displayEmptyView()
- });
-
- /*
- var memberTable = $('#myGroupMembers');
- memberTable.hide();
- $('#nextPhase').on('click',function(){
- memberTable.show();
- });
- */
- $('.givefeedback').click(function () {
- location.href="givefeedback.jsp?token="+getUserTokenFromUrl();
- });
- $('.viewfeedback').click(function () {
- location.href="viewfeedback.jsp?token="+getUserTokenFromUrl();
- });
-
- $('.annotationview').click(function () {
- location.href="annotation-document.jsp?token="+getUserTokenFromUrl();
- });
-
- $('#btnUnstructuredUpload').click(function () {
- location.href="unstructured-upload.jsp?token="+getUserTokenFromUrl() + "&projectId=" + getQueryVariable("projectId");
- })
-
- $('.viewprojectstudent').click(function () {
- location.href="project-student.jsp?token="+getUserTokenFromUrl();
- })
-});
-
-/**
- * Display category of submission part in list
- *
- * @param user The user of the submission part
- * @param category The category of the submission part
- * @param fullSubmissionId The id of the full submission the submission part belongs to
- */
-function displaySubmission(user, category, fullSubmissionId) {
- // build link
- $('#submissionUpload').append(
- $('<li>')
- .append($('<span>').append(category.toUpperCase() + " eingereicht"))
- .append($('<a>').attr("class", "annotationview").attr("role", "button")
- .append($('<label>').css("font-size", "10px")
- .append($('<i>').attr("class", "far fa-comments").css("font-size", "15px"))
- .append("feedback")
- )
- )
- // add data to link
- .data("fullSubmissionId", fullSubmissionId)
- .data("category", category)
- );
-
-}
-
-/**
- * Display a not found message if there are no submission parts in the database (or on error)
- */
-function displayEmptyView() {
- // build link
- $('#submissionUpload').append(
- $('<li>')
- .append($('<span>').append("keine Daten gefunden"))
- );
-}
-
-/**
- * GET: Get all representations of a submission part for a given project id
- *
- * @param projectId The id of the project
- * @param responseHandler The response handler
- * @param errorHandler The error handler
- */
-function getSubmissionPartsByProjectId(projectId, responseHandler, errorHandler) {
- var url = "../rest/submissions/project/" + projectId;
- $.ajax({
- url: url,
- type: "GET",
- dataType: "json",
- success: function (response) {
- // handle the response
- responseHandler(response);
- },
- error: function () {
- // handle the error
- errorHandler();
- }
- })
-}
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/profile.js b/gemeinsamforschen/src/main/webapp/profile/js/profile.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/js/profile.js
rename to gemeinsamforschen/src/main/webapp/profile/js/profile.js
diff --git a/gemeinsamforschen/src/main/webapp/libs/css/researchReport.css b/gemeinsamforschen/src/main/webapp/researchReport/css/researchReport.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/css/researchReport.css
rename to gemeinsamforschen/src/main/webapp/researchReport/css/researchReport.css
diff --git a/gemeinsamforschen/src/main/webapp/libs/css/researchReportOverview.css b/gemeinsamforschen/src/main/webapp/researchReport/css/researchReportOverview.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/css/researchReportOverview.css
rename to gemeinsamforschen/src/main/webapp/researchReport/css/researchReportOverview.css
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/createReportBibo.js b/gemeinsamforschen/src/main/webapp/researchReport/js/createReportBibo.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/js/createReportBibo.js
rename to gemeinsamforschen/src/main/webapp/researchReport/js/createReportBibo.js
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/createReportConcept.js b/gemeinsamforschen/src/main/webapp/researchReport/js/createReportConcept.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/js/createReportConcept.js
rename to gemeinsamforschen/src/main/webapp/researchReport/js/createReportConcept.js
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/createReportDo.js b/gemeinsamforschen/src/main/webapp/researchReport/js/createReportDo.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/js/createReportDo.js
rename to gemeinsamforschen/src/main/webapp/researchReport/js/createReportDo.js
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/createReportEvaluation.js b/gemeinsamforschen/src/main/webapp/researchReport/js/createReportEvaluation.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/js/createReportEvaluation.js
rename to gemeinsamforschen/src/main/webapp/researchReport/js/createReportEvaluation.js
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/createReportMethod.js b/gemeinsamforschen/src/main/webapp/researchReport/js/createReportMethod.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/js/createReportMethod.js
rename to gemeinsamforschen/src/main/webapp/researchReport/js/createReportMethod.js
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/createReportOverview.js b/gemeinsamforschen/src/main/webapp/researchReport/js/createReportOverview.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/js/createReportOverview.js
rename to gemeinsamforschen/src/main/webapp/researchReport/js/createReportOverview.js
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/createReportProgress.js b/gemeinsamforschen/src/main/webapp/researchReport/js/createReportProgress.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/js/createReportProgress.js
rename to gemeinsamforschen/src/main/webapp/researchReport/js/createReportProgress.js
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/createReportQuestion.js b/gemeinsamforschen/src/main/webapp/researchReport/js/createReportQuestion.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/js/createReportQuestion.js
rename to gemeinsamforschen/src/main/webapp/researchReport/js/createReportQuestion.js
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/createReportRecherche.js b/gemeinsamforschen/src/main/webapp/researchReport/js/createReportRecherche.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/js/createReportRecherche.js
rename to gemeinsamforschen/src/main/webapp/researchReport/js/createReportRecherche.js
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/createReportTitle.js b/gemeinsamforschen/src/main/webapp/researchReport/js/createReportTitle.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/js/createReportTitle.js
rename to gemeinsamforschen/src/main/webapp/researchReport/js/createReportTitle.js
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/researchReportUpload.js b/gemeinsamforschen/src/main/webapp/researchReport/js/researchReportUpload.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/js/researchReportUpload.js
rename to gemeinsamforschen/src/main/webapp/researchReport/js/researchReportUpload.js
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/overview-student.js b/gemeinsamforschen/src/main/webapp/student/js/overview-student.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/js/overview-student.js
rename to gemeinsamforschen/src/main/webapp/student/js/overview-student.js
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/project-student.js b/gemeinsamforschen/src/main/webapp/student/js/project-student.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/libs/js/project-student.js
rename to gemeinsamforschen/src/main/webapp/student/js/project-student.js