diff --git a/pom.xml b/pom.xml index 5b77c25756503e1dad5955c8656f1ac3dcbd1044..a9064c24f5b71487cfc5f3021acf0c859d1b9003 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 5787c0a2cdb20c024c82fedc592605e67e7cb5ac..094261af43bd7d1374e53786b5d877d94b2d6981 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">