From d59a09f21908ead1c30a088f39d42f6935efaccb Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@bioforsk.no>
Date: Wed, 30 Nov 2016 19:01:20 -0800
Subject: [PATCH] Dependency fix. Minor layout adjustments on fireblight map
---
pom.xml | 14 +++++++-------
src/main/webapp/test/fireblight/index.html | 18 +++++++++---------
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5b77c257..a9064c24 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,6 +40,13 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.6.1</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs</artifactId>
<version>3.0.9.Final</version>
@@ -70,13 +77,6 @@
<type>jar</type>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- <version>4.4.1</version>
- <type>jar</type>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/src/main/webapp/test/fireblight/index.html b/src/main/webapp/test/fireblight/index.html
index 5787c0a2..094261af 100644
--- a/src/main/webapp/test/fireblight/index.html
+++ b/src/main/webapp/test/fireblight/index.html
@@ -41,8 +41,8 @@
/*border: 1px solid #dddddd;*/
}
.ol-zoom {
- top: 2.5em;
- bottom: auto;
+ top: auto;
+ bottom: 3.5em;
left: auto;
right: .5em
}
@@ -57,9 +57,9 @@
.geo-location
{
- top: 7.0em;
+ top: auto;
right: 0.5em;
- bottom: auto;
+ bottom: 8.0em;
left: auto;
z-index: 1000;
}
@@ -80,11 +80,11 @@
#featureForm {
display: none;
- width: 300px;
+ width: auto;
max-width: 90%;
height: auto;
position: absolute;
- top: 45px;
+ top: 3.0em;
left: 10px;
z-index: 1999;
background-color: white;
@@ -95,8 +95,8 @@
#legend {
position: absolute;
- top: auto;
- bottom: 40px;
+ top: 3.0em;
+ bottom: auto;
right: 10px;
z-index: 1999;
background-color: white;
@@ -170,7 +170,7 @@
<body>
<div id="map" class="map">
- <div class="geo-location ol-unselectable ol-control"><button onclick="navToLocation();"></button></div>
+ <div class="geo-location ol-unselectable ol-control"><button onclick="navToLocation();" title="Finn min posisjon"></button></div>
</div>
<div id="searchFieldContainer">
<div id="searchFieldInnerContainer">
--
GitLab