[Mapbender-commits] r10395 - in trunk/mapbender/http: css javascripts php

[svn_mapbender at osgeo.org]

Author: hollsandre
Date: 2020-01-31 01:38:32 -0800 (Fri, 31 Jan 2020)
New Revision: 10395

Added:
   trunk/mapbender/http/css/copyright.css
Modified:
   trunk/mapbender/http/css/jquery.ui.autocomplete.2019.css
   trunk/mapbender/http/javascripts/mod_termsOfUse.php
   trunk/mapbender/http/php/mod_getWmcDisclaimer.php
Log:
modifications for 2019 modern gui

- responsive address search
- css copyright module for mapviewer

thx to karlo!


Added: trunk/mapbender/http/css/copyright.css
===================================================================
--- trunk/mapbender/http/css/copyright.css	                        (rev 0)
+++ trunk/mapbender/http/css/copyright.css	2020-01-31 09:38:32 UTC (rev 10395)
@@ -0,0 +1,54 @@
+* {
+line-height: 1.5em;
+color: #000;
+font-family: sans-serif;
+letter-spacing: 0.1em;
+box-sizing: border-box;
+}
+
+br {
+line-height: 0;
+}
+
+body > img {
+display: none;
+}
+
+body > a {
+padding: 0.3em 0.3em;
+display: block;
+font-size: 1.2em;
+margin: 0.7em 0.1em 0 0.1em;
+background-color: #ddd;
+font-weight: bold;
+}
+body > a::after {
+content:url(../img/geoportal2019/info_bk.svg);
+}
+
+tr:nth-child(2n+1) {
+background-color: #ddd;
+}
+tr:nth-child(2n) {
+background-color: #eee;
+}
+
+th {
+padding: 0.3em;
+}
+
+td {
+padding: 0 0.3em;
+}
+
+td > img, td > a > img {
+width: 7em;
+}
+
+th, td {
+display: block;
+text-align: left;
+border-left: 20px solid white;
+width: calc(100vw - 37px);
+}
+

Modified: trunk/mapbender/http/css/jquery.ui.autocomplete.2019.css
===================================================================
--- trunk/mapbender/http/css/jquery.ui.autocomplete.2019.css	2020-01-30 14:10:25 UTC (rev 10394)
+++ trunk/mapbender/http/css/jquery.ui.autocomplete.2019.css	2020-01-31 09:38:32 UTC (rev 10395)
@@ -37,12 +37,12 @@
 
 #geographicName {display:none;}
 #geographicName {
-       float:left;
-       height: 37px;
-       padding: 0px 31px 0px 10px;
-       font-family: Helvetica Neue, Helvetica, Roboto, Arial, sans-serif;
-       font-size:15px;
-       letter-spacing:1px;
+	float:left;
+	height: 37px;
+	padding: 0px 31px 0px 10px;
+	font-family: Helvetica Neue, Helvetica, Roboto, Arial, sans-serif;
+	font-size:15px;
+	letter-spacing:1px;
 	background-color:whitesmoke;
 	overflow: auto;
 	border: 1px solid #aaa;
@@ -49,6 +49,7 @@
 	border-radius: 0;
 	margin-right: -34px;
 	margin-top: 6px;
+	max-width: calc(100vw - 60px);
 	}
 #geographicName:focus {
 	border: 1px solid #d62029;
@@ -120,5 +121,11 @@
 	border-right:none;	       /*neu*/
 	border-bottom: solid 1px #efefef;       /*neu*/
 	padding:.2em .4em;       /*neu*/
-	
 }
+
+body ul.ui-autocomplete{
+	max-height: calc(-50px + 100vh);
+	max-width: calc(100vw - 66px);
+	overflow-y: auto;
+	overflow-x: hidden;
+	}

Modified: trunk/mapbender/http/javascripts/mod_termsOfUse.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_termsOfUse.php	2020-01-30 14:10:25 UTC (rev 10394)
+++ trunk/mapbender/http/javascripts/mod_termsOfUse.php	2020-01-31 09:38:32 UTC (rev 10395)
@@ -37,7 +37,7 @@
 function mod_copyright(){
 	var myMapObj = Mapbender.modules[mod_copyright_target];
 
-	var str_c = "<div style='z-index:110;font-family:" + mod_copyright_font + ";font-size:" + mod_copyright_fontsize + ";color:" + mod_copyright_color2 + ";position:absolute;bottom:5px;right:5px'><a style='color: blue;text-decoration: underline;' href='../php/mod_getWmcDisclaimer.php?id=current' target='_blank'><?php echo _mb('Terms of use');?></a></div>";
+	var str_c = "<div style='z-index:110;font-family:" + mod_copyright_font + ";font-size:" + mod_copyright_fontsize + ";color:" + mod_copyright_color2 + ";position:absolute;bottom:5px;right:5px'><a style='color: blue;text-decoration: underline;' href='../php/mod_getWmcDisclaimer.php?id=current&withHeader=true' target='_blank'><?php echo _mb('Terms of use');?></a></div>";
 	
 	var map_el = myMapObj.getDomElement();
 	if(!map_el.ownerDocument.getElementById(myMapObj.elementName+"_copyright")){

Modified: trunk/mapbender/http/php/mod_getWmcDisclaimer.php
===================================================================
--- trunk/mapbender/http/php/mod_getWmcDisclaimer.php	2020-01-30 14:10:25 UTC (rev 10394)
+++ trunk/mapbender/http/php/mod_getWmcDisclaimer.php	2020-01-31 09:38:32 UTC (rev 10395)
@@ -130,11 +130,13 @@
 		'<meta http-equiv="content-language" content="'.$languageCode.'" />'.
 		'<meta http-equiv="content-style-type" content="text/css" />'.
 		'<meta http-equiv="Content-Type" content="text/html; charset='.CHARSET.'">' . 	
+		'<link rel="stylesheet" type="text/css" href="../css/copyright.css">' .
 		'</head>';
 		echo $html.$metadataStr;
 
 }
 //generate header for disclaimer:
+echo "<div style='padding:10px;display:block;text-align:center;'><a href='javascript:window.close()'>Fenster schliessen</a></div>";
 echo "<b>"._mb('The document includes data resources from different organizations. The following parapgraph shows the different terms of use for the includes resources:')."</b><br><br>";#
 
 //Part for wms