Skip to content
Snippets Groups Projects
Commit 242d1955 authored by Thomas Schnaak's avatar Thomas Schnaak
Browse files

Merge branch 'development_master' into Journal

parents 0e690ba0 cc4b1143
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
gemeinsamforschen/src/main/webapp/assets/css/annotationStyle.css
+ 3
− 0
View file @ 242d1955
...@@ -138,6 +138,9 @@ ol { ...@@ -138,6 +138,9 @@ ol {
.flex { .flex {
display: flex; display: flex;
} }
.flex .container-fluid{
flex: 1;
}
.full-height { .full-height {
height: 100%; height: 100%;
} }
......
gemeinsamforschen/src/main/webapp/pages/annotation-document.jsp
+ 5
− 28
View file @ 242d1955
<%@ 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" %>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<meta charset="utf-8"> <omniDependencies:omniDependencies/>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>muster-gemeinsam-forschen</title>
<!-- css - annotationStyle --> <!-- css - annotationStyle -->
<link rel="stylesheet" type="text/css" href="../assets/css/annotationStyle.css"> <link rel="stylesheet" type="text/css" href="../assets/css/annotationStyle.css">
<!-- css - contextMenu --> <!-- css - contextMenu -->
<link href="https://swisnl.github.io/jQuery-contextMenu/dist/jquery.contextMenu.css" rel="stylesheet" type="text/css" /> <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 --> <!-- js - jQuery validation plugin -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.14.0/jquery.validate.min.js"></script> <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 --> <!-- js - jQuery ui position -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js" type="text/javascript"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js" type="text/javascript"></script>
<!-- js - contextMenu script --> <!-- js - contextMenu script -->
<script src="https://swisnl.github.io/jQuery-contextMenu/dist/jquery.contextMenu.js" type="text/javascript"></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 --> <!-- js - annotation websocket script -->
<script src="../assets/js/annotationWebsocket.js"></script> <script src="../assets/js/annotationWebsocket.js"></script>
<!-- js - annotation REST script --> <!-- js - annotation REST script -->
<script src="../assets/js/annotationRest.js"></script> <script src="../assets/js/annotationRest.js"></script>
<!-- js - annotationScript --> <!-- js - annotationScript -->
<script src="../assets/js/annotationScript.js"></script> <script src="../assets/js/annotationScript.js"></script>
</head> </head>
<body> <body>
...@@ -50,15 +35,7 @@ ...@@ -50,15 +35,7 @@
<div class="container-fluid full-height"> <div class="container-fluid full-height">
<div class="container-fluid-content"> <div class="container-fluid-content">
<div class="flex"> <div class="flex">
<h1>gemeinsam Forschen <headLine:headLine/>
<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>
</div> </div>
<div class="content-mainpage"> <div class="content-mainpage">
<div class="leftcolumn"> <div class="leftcolumn">
......
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