Skip to content
Snippets Groups Projects
Commit 69f869e5 authored by Maren Schulze's avatar Maren Schulze
Browse files

styling grups, servey, annotation

parent 6914df56
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 290 additions and 159 deletions
gemeinsamforschen/src/main/webapp/annotation/create-unstructured-annotation.jsp
+ 31
− 28
View file @ 69f869e5
......@@ -42,41 +42,44 @@
<jsp:param name="hierarchy" value="1"/>
</jsp:include>
<main>
<jsp:include page="../taglibs/timeLine.jsp"/>
<div class="col span_content">
<div class="content-mainpage">
<div class="leftcolumn">
<div class="leftcontent">
<div class="leftcontent-text context-menu-one" id="documentText"></div>
<div class="leftcontent-buttons">
<div class="leftcontent-buttons-save">
<button id="btnSave" type="button" class="btn btn-secondary">Speichern</button>
<div class="row group">
<div class="col span_content span_l_of_2">
<h3>Dossier</h3>
<div class="leftcontent-text context-menu-one" id="documentText"></div>
<div class="leftcontent-buttons">
<div class="leftcontent-buttons-save">
<button id="btnSave" type="button" class="btn btn-primary">Speichern</button>
</div>
</div>
</div>
</div>
</div>
<div class="rightcolumn">
<div id="missingAnnotation" class="alert alert-warning"></div>
<div class="rightcontent">
<ol id="annotations">
</ol>
<script id="annotationTemplate" type="text/x-jQuery-tmpl">
<li class="spacing">
<div id="${annotationType}" class="category-card not-added">
<p>${annotationType}</p>
<div class="col span_content span_s_of_2">
<div class="infobox dossier">
<p>Ordne allen Textteilen passende Kategorien zu. Markiere den Text, klicke auf die rechte Mousetaste und wähle die passende Kategorie.</p>
</div>
</li>
<div id="missingAnnotation" class="alert alert-warning"></div>
<ol id="annotations">
</ol>
<script id="annotationTemplate" type="text/x-jQuery-tmpl">
<li class="spacing">
<div id="${annotationType}" class="category-card not-added">
<p>${annotationType}</p>
</div>
</li>
</script>
</script>
</div>
</div>
<div class="col span_chat">
<chat:chatWindow orientation="right" scope="project"/>
<chat:chatWindow orientation="right" scope="group"/>
</div>
</div>
<div class="col span_chat">
<chat:chatWindow orientation="right" scope="project"/>
<chat:chatWindow orientation="right" scope="group"/>
</div>
</main>
<jsp:include page="../taglibs/footer.jsp"/>
</body>
......
gemeinsamforschen/src/main/webapp/annotation/css/unstructured-annotation.css
+ 26
− 0
View file @ 69f869e5
......@@ -195,4 +195,30 @@ body, html {
border-style: solid;
border-color: #a1887f;
color: #a1887f;
}
.infobox.dossier {
}
/*context menu */
.context-menu-list .context-menu-item.context-menu-hover {
background-color: #075f8b;
}
context-menu-list.context-menu-list {
background: transparent;
border: 1px solid transparent;
border-radius: 0;
padding: 0;
}
context-menu-list.context-menu-item {
padding: .5em .5em;
}
context-menu-list.context-menu-item .context-menu-list .context-menu-item {
padding: .5em .1em .5em .5em;
}
\ No newline at end of file
gemeinsamforschen/src/main/webapp/annotation/css/unstructured-upload.css
+ 9
− 1
View file @ 69f869e5
......@@ -47,7 +47,13 @@ body, html {
.upload-text {
display: flex;
flex-flow: column;
height: 100%;
height: 50vh;
}
.upload-text label {
color: #000;
font-size: 1.2em;
margin-bottom: .5em;
}
.upload-text-textarea {
......@@ -68,3 +74,5 @@ label.error {
flex: 1;
}
gemeinsamforschen/src/main/webapp/annotation/upload-unstructured-dossier.jsp
+ 23
− 21
View file @ 69f869e5
......@@ -30,31 +30,33 @@
<jsp:param name="hierarchy" value="1"/>
</jsp:include>
<main>
<jsp:include page="../taglibs/timeLine.jsp"/>
<div class="col span_content">
<form id="upload-textarea-form">
<div class="form-group upload-text" id="documentText">
<label for="upload-textarea">Texteingabe</label>
<textarea class="upload-text-textarea form-control" placeholder="Text einfügen..."
id="upload-textarea" name="uploadtextarea"></textarea>
</div>
</form>
<div class="row group">
<div class="col span_content span_l_of_2">
<form id="upload-textarea-form">
<div class="form-group upload-text" id="documentText">
<label for="upload-textarea">Texteingabe</label>
<textarea class="upload-text-textarea form-control" placeholder="Text einfügen..."
id="upload-textarea" name="uploadtextarea"></textarea>
</div>
</form>
<div>
<label for="file">Alternativ bitte Datei wählen</label>
<input type="file" id="file" name="file">
<div>
<label for="file">Alternativ bitte Datei wählen</label>
<input type="file" id="file" class="primary" name="file">
</div>
<div class="document-text-buttons">
<%--<button type="button" class="btn btn-secondary document-text-buttons-back" id="btnBack">Zurück
</button>--%>
<button type="button" class="btn btn-primary document-text-buttons-next" id="btnNext">Weiter
</button>
</div>
</div>
<div class="document-text-buttons">
<%--<button type="button" class="btn btn-secondary document-text-buttons-back" id="btnBack">Zurück
</button>--%>
<button type="button" class="btn btn-primary document-text-buttons-next" id="btnNext">Weiter
</button>
<div class="col span_content span_l_of_2"></div>
<div class="col span_chat">
<chat:chatWindow orientation="right" scope="project"/>
<chat:chatWindow orientation="right" scope="group"/>
</div>
</div>
<div class="col span_chat">
<chat:chatWindow orientation="right" scope="project"/>
<chat:chatWindow orientation="right" scope="group"/>
</div>
</main>
<jsp:include page="../taglibs/footer.jsp"/>
</body>
......
gemeinsamforschen/src/main/webapp/groupfinding/css/create-groups-manual.css
+ 2
− 2
View file @ 69f869e5
......@@ -8,12 +8,12 @@
}
.student-button.active{
background-color:lightblue;
background-color:#e0071c;
}
.student-button.active:hover{
background-color:lightblue;
}
.student-button.active:focus {
background-color:lightblue;
background-color:#e0071c;
}
gemeinsamforschen/src/main/webapp/groupfinding/enter-preferences.jsp
+ 38
− 36
View file @ 69f869e5
......@@ -24,46 +24,48 @@
<jsp:include page="../taglibs/Menu.jsp">
<jsp:param name="hierarchy" value="1"/>
</jsp:include>
<main>
<jsp:include page="../taglibs/timeLine.jsp"/>
<div class="col span_content span_1_of_2">
<h3>Geben Sie hier ihre Präferenzen ein!</h3>
<!--fieldset>
<legend>Passwort</legend>
<input class="form-control" type="text" placeholder="******" id="projectPassword">
<div class="alert alert-danger" id="projectWrongPassword">Das Passwort ist falsch.</div>
</fieldset>-->
<div class="row group">
<main>
<jsp:include page="../taglibs/timeLine.jsp"/>
<div class="col span_content span_1_of_2">
<h3>Geben Sie hier ihre Präferenzen ein!</h3>
<!--fieldset>
<legend>Passwort</legend>
<input class="form-control" type="text" placeholder="******" id="projectPassword">
<div class="alert alert-danger" id="projectWrongPassword">Das Passwort ist falsch.</div>
</fieldset>-->
<h3>Interessen</h3>
<hr style="margin-top:-9px;">
<p>Umreißen Sie Ihre Interessen in diesem Kurs mit einigen Tags (Substantiven)</p>
<div id="competencies">
<input class="form-control" type="text" id="competencies0" name="competencies" required=""
placeholder="Tag">
</div>
<h3>Tags</h3>
<hr style="margin-top:-9px;">
<p class="alert alert-warning" style="width:520px;">Wähle 2 der hier angegebenen Tags aus, die am ehesten zu
deiner Forschungsfrage passen.</p>
<div id="tags">
<h3>Interessen</h3>
<hr style="margin-top:-9px;">
<p>Umreißen Sie Ihre Interessen in diesem Kurs mit einigen Tags (Substantiven)</p>
<div id="competencies">
<input class="form-control" type="text" id="competencies0" name="competencies" required=""
placeholder="Tag">
</div>
<h3>Tags</h3>
<hr style="margin-top:-9px;">
<p class="alert alert-warning" style="width:520px;">Wähle 2 der hier angegebenen Tags aus, die am ehesten zu
deiner Forschungsfrage passen.</p>
<div id="tags">
</div>
<button class="btn btn-primary" id="studentFormSubmit">
eintragen
</button>
<div class="alert alert-warning" style="width:520px; margin-top: 10px;" role="alert">
Das Verarbeiten der Lernziele und das Gruppenmatching kann einen Moment dauern!
</div>
<div class="col span_chat">
<chat:chatWindow orientation="right" scope="project"/>
<chat:chatWindow orientation="right" scope="group"/>
</div>
<div class="cover"></div>
</div>
<button class="btn btn-primary" id="studentFormSubmit">
eintragen
</button>
<div class="alert alert-warning" style="width:520px; margin-top: 10px;" role="alert">
Das Verarbeiten der Lernziele und das Gruppenmatching kann einen Moment dauern!
</div>
<div class="col span_chat">
<chat:chatWindow orientation="right" scope="project"/>
<chat:chatWindow orientation="right" scope="group"/>
</div>
<div class="cover"></div>
</div>
<div class="row">
<div class="row">
</div>
</main>
</div>
</main>
</div>
<jsp:include page="../taglibs/footer.jsp"/>
</body>
</html>
\ No newline at end of file
gemeinsamforschen/src/main/webapp/groupfinding/groupALSurvey.jsp
+ 7
− 3
View file @ 69f869e5
......@@ -25,10 +25,14 @@
</jsp:include>
<!-- back-->
<div class="row group">
<div id="theSurvey">
<div id="surveyContainer"></div>
<div id="resultLink"></div>
<main class="projects">
<div class="col span_content span_2_of_2 centered">
<div id="theSurvey">
<div id="surveyContainer"></div>
<div id="resultLink"></div>
</div>
</div>
</main>
</div>
<jsp:include page="../taglibs/footer.jsp"/>
</body>
......
gemeinsamforschen/src/main/webapp/project/courses-student.jsp
+ 58
− 55
View file @ 69f869e5
......@@ -15,71 +15,74 @@
<jsp:include page="../taglibs/Menu.jsp">
<jsp:param name="hierarchy" value="1"/>
</jsp:include>
<div class="row group">
</div>
<main class="projects">
<div class="col span_content span_2_of_2 centered">
<!-- filter-->
<h2 id="headLine">Projekt finden</h2>
<p id="introduction"></p>
<!-- filter-->
<div class="filter" id="projectDropdown" style="max-width: 500px;">
<script id="searchingTemplate" type="text/x-jQuery-tmpl">
<div class="projectDynamic">
<select>
{{each(prop,val) projects}}
<option value="${val}" style="max-width: 450px;">${val}</option>
{{/each}}
</select>
</script>
<div class="select_arrow"></div>
</div>
<div class="search">
<input id="searchField" type="text" name="suche" placeholder="Suche">
<i class="fas fa-search"></i>
</div>
</div>
<div class="row group">
<div class="row group projects-grid" id="projects">
<script id="projectTRTemplate" type="text/x-jQuery-tmpl">
<div class="card card-project projectDynamic">
<div class="card-inner">
<h3>${projectName}</h3>
<p>
${projectDescription}
</p>
<label>Stichworte:</label>
<div class='tags'>
{{each(i) projectTags}}
<span class='tag'>${projectTags[i]}</span><div class="spacing"></div>
{{/each}}
<div class="col span_content span_2_of_2 centered">
<!-- filter-->
<h2 id="headLine">Projekt finden</h2>
<p id="introduction"></p>
<!-- filter-->
<div class="filter" id="projectDropdown" style="max-width: 500px;">
<script id="searchingTemplate" type="text/x-jQuery-tmpl">
<div class="projectDynamic">
<select>
{{each(prop,val) projects}}
<option value="${val}" style="max-width: 450px;">${val}</option>
{{/each}}
</select>
</script>
<div class="select_arrow"></div>
</div>
<div class="search">
<input id="searchField" type="text" name="suche" placeholder="Suche">
<i class="fas fa-search"></i>
</div>
{{if isSearching}}
{{if passwordRequired}}
<div style="margin-top:25px;">
<a data-toggle="collapse" data-target="#passwordDiv_${projectName}">Passwort eingeben</a>
<div id="passwordDiv_${projectName}" class="collapse">
<label>
Passwort
<input class="form-control" id="projectPassword" placeholder="********">
</label>
<div id="projectWrongPassword" class="alert alert-alert" style="display:none;">
Falsches Passwort
</div>
<div class="row group projects-grid" id="projects">
<script id="projectTRTemplate" type="text/x-jQuery-tmpl">
<div class="card card-project projectDynamic">
<div class="card-inner">
<h3>${projectName}</h3>
<p>
${projectDescription}
</p>
<label>Stichworte:</label>
<div class='tags'>
{{each(i) projectTags}}
<span class='tag'>${projectTags[i]}</span>
{{/each}}
</div>
{{if isSearching}}
{{if passwordRequired}}
<div style="margin-top:25px;">
<a data-toggle="collapse" data-target="#passwordDiv_${projectName}">Passwort eingeben</a>
<div id="passwordDiv_${projectName}" class="collapse">
<label>
Passwort
<input class="form-control" id="projectPassword" placeholder="********">
</label>
<div id="projectWrongPassword" class="alert alert-alert" style="display:none;">
Falsches Passwort
</div>
</div>
</div>
{{/if}}
{{/if}}
<button class="primary project_Button" name="${projectName}" id="project_${projectName}" style="margin-top:10px;">${projectAction} </button>
</div>
{{/if}}
{{/if}}
<button class="primary project_Button" name="${projectName}" id="project_${projectName}" style="margin-top:10px;">${projectAction} </button>
</div>
</div>
</script>
</div>
</script>
</div>
</div>
</main>
<jsp:include page="../taglibs/footer.jsp"/>
</body>
......
gemeinsamforschen/src/main/webapp/project/create-project.jsp
+ 1
− 1
View file @ 69f869e5
......@@ -93,7 +93,7 @@
<%-- <label>An Kurs selbst teilnehmen <input type="checkbox" id="Teilnehmer"></label>--%>
<div class="form-group">
<button class="primary" style="margin-left:129px;" id="sendProject">erstellen</button>
<button class="primary" id="sendProject">Erstellen</button>
</div>
</div>
......
gemeinsamforschen/src/main/webapp/project/css/projects.css
+ 0
− 2
View file @ 69f869e5
......@@ -23,5 +23,3 @@
}
gemeinsamforschen/src/main/webapp/project/overview-docent.jsp
+ 1
− 1
View file @ 69f869e5
......@@ -60,7 +60,7 @@
<label>Stichworte:</label>
<div class='tags'>
{{each(i) projectTags}}
<span class='tag'>${projectTags[i]}</span><div class="spacing"></div>
<span class='tag'>${projectTags[i]}</span>
{{/each}}
</div>
<button class="primary project_Button" name="${projectName}" id="project_${projectName}"
......
gemeinsamforschen/src/main/webapp/taglibs/css/global.css
+ 93
− 9
View file @ 69f869e5
......@@ -52,7 +52,7 @@ footer {
height: 80px;
background: #ededed;
padding: .5em;
position: absolute;
/* position: absolute;*/
width: 100%;
bottom: 0;
}
......@@ -212,7 +212,7 @@ footer {
content: "\f017";
text-align: center;
display: block;
line-height: 1.8em;
line-height: 2em;
font-size: 1.5em;
color: #fff;
}
......@@ -343,14 +343,16 @@ a:visited {
/* lists */
.complex-list li {
border-bottom: 1px solid #ededed;
padding: .7em .2em .7em .2em;
}
.complex-list li.label {
.complex-list li.label button{
font-weight: 700;
color: #000;
background-color:#ededed;
font-size: 13px;
}
.grouplists {
......@@ -359,6 +361,35 @@ a:visited {
margin: 10px;
}
.groups-manual .info-message p {
margin: 0;
padding: 1em 0 1em 0;
}
.list-group-item.active, .list-group-item.active:focus, .list-group-item.active:hover {
border-color:#ededed;
}
/* + overwrite bootstrap rules */
.complex-list .list-group-item:last-child {
border-bottom-right-radius: 0 ;
border-bottom-left-radius: 0;
}
.complex-list .list-group-item:first-child {
border-top-left-radius: 0;
border-top-right-radius: 0;
}
.complex-list .list-group-item {
border-width: 0 0 1px 0;
padding: 1em .2em .7em 1em;
border-radius:0;
border-bottom: 1px solid #ededed;
}
/*colors*/
body {
......@@ -441,17 +472,24 @@ header .nav-group-left a {
margin-right:2em;
}
/*links and buttons */
button {
button, .btn {
border: none;
backrgound-color: #dedede;
background-color: #dedede;
display: block;
padding: .8em;
color: #075F8B;
border-radius:0;
}
.btn-success {
background-color: #1a3358;
}
.primary {
.primary, .btn-primary {
background-color: #075F8B;
color: #fff;
color: #fff !important;
}
.inline-btn {
......@@ -833,6 +871,8 @@ main.groups-manual{
.spacer-horizontal {
margin-top: .5em;
margin-bottom: .5em;
float: left;
margin-right: 1em;
}
/***custom checkmark ****/
......@@ -910,4 +950,48 @@ main.groups-manual{
transform: rotate(45deg);
}
/* projects-grid page */
.card-project .tag {
background-color: #075F8B;
display:inline-block;
padding:.2em;
margin-right:.2em;
color:#fff;
}
/*overwrite survey.js styles */
.sv_main {
font-family: nunito, helvetica, arial, sans-serif !important;
font-size: 13px !important;
line-height: 1.2em !important;
}
.sv_main.sv_default_css .sv_body {
border-color: #075f8b !important;
}
.sv_main.sv_default_css input[type="button"], .sv_default_css button {
color: #fff;
background-color: #075f8b !important;
padding: .8em !important;
}
.sv_main input[type="button"], .sv_main button {
border-radius: 0px !important;
}
.sv_main.sv_default_css .sv_q_rating_item .sv_q_rating_item_text:hover {
border-color: #075f8b !important;
}
.sv_main.sv_default_css .sv_q_rating_item.active .sv_q_rating_item_text {
background-color: #075f8b !important;
border-color: transparent !important;
}
gemeinsamforschen/src/main/webapp/taglibs/omniDependencies.jsp
+ 1
− 0
View file @ 69f869e5
......@@ -12,6 +12,7 @@
<title>fltrail</title>
<link href="<%=new TagUtilities().hierarchyToString(hierarchyLevel)%>libs/css/googleAPIS400-700.css" rel="stylesheet">
<link href="<%=new TagUtilities().hierarchyToString(hierarchyLevel)%>libs/css/googleAPIS300-400-700.css" rel="stylesheet">
<link rel="stylesheet" href="<%=new TagUtilities().hierarchyToString(hierarchyLevel)%>libs/bootstrap/css/bootstrap3.3.7.min.css">
<link rel="stylesheet" href="<%=new TagUtilities().hierarchyToString(hierarchyLevel)%>taglibs/css/normalize.css">
......
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