Explorar el Código

changed iframe style to make sure it uses whole height (minus header)

George Ruinelli hace 3 años
padre
commit
c322cd8b48
Se han modificado 2 ficheros con 22 adiciones y 208 borrados
  1. 11 107
      sd-card/html/index.html
  2. 11 101
      sd-card/html/index_configure.html

+ 11 - 107
sd-card/html/index.html

@@ -1,78 +1,20 @@
 <!DOCTYPE html>
 <!DOCTYPE html>
-<html style="width: fit-content">
+<html>
 <head>
 <head>
 <link rel="icon" href="favicon.ico" type="image/x-icon">
 <link rel="icon" href="favicon.ico" type="image/x-icon">
 <title>jomjol - AI on the edge</title>
 <title>jomjol - AI on the edge</title>
 <meta charset="utf-8">
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
+<link rel="stylesheet" href="style.css" type="text/css" >
 
 
-<style>
-.h_iframe iframe {width:995px;height:605px;}
-.h_iframe {width:995px;height:605px;}
-
-h1 {font-size: 2em; margin-block-end: 0.3em;}
-h2 {font-size: 1.5em;margin-block-start: 0.3em;}
-h3 {font-size: 1.2em;}
-p {font-size: 1em;}
-
-ul {
-  list-style-type: none;
-  margin: 0;
-  padding: 0;
-  overflow: hidden;
-  background-color: #333;
-  width:1000px;
-}
-
-li {
-  float: left;
-  font-family: arial;
-  font-size: 18px;
-}
-
-li a, .dropbtn {
-  display: inline-block;
-  color: white;
-  text-align: center;
-  padding: 14px 16px;
-  text-decoration: none;
-}
-
-li a:hover, .dropdown:hover .dropbtn {
-  background-color: red;
-}
-
-li.dropdown {
-  display: inline-block;
-}
-
-.dropdown-content {
-  display: none;
-  position: absolute;
-  background-color: #f9f9f9;
-  min-width: 160px;
-  box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
-  z-index: 1;
-  font-family: arial;
-}
-
-.dropdown-content a {
-  color: black;
-  padding: 12px 16px;
-  text-decoration: none;
-  display: block;
-  text-align: left;
-}
-
-.dropdown-content a:hover {background-color: #f1f1f1;}
-
-.dropdown:hover .dropdown-content {
-  display: block;
-}
-</style>
+<script type="text/javascript" src="common.js"></script>
+<script type="text/javascript" src="gethost.js"></script>
+<script type="text/javascript" src="readconfigcommon.js"></script>
+<script type="text/javascript" src="readconfigparam.js"></script>
 </head>
 </head>
 
 
-<body style="font-family: arial">
+<body>
+<div class="main">
 
 
 <table style="border: none">
 <table style="border: none">
   <tr><td style="padding-right: 10px;"><img src="favicon.ico"></td>
   <tr><td style="padding-right: 10px;"><img src="favicon.ico"></td>
@@ -101,52 +43,14 @@ li.dropdown {
 	  <a href="#"onclick="document.getElementById('maincontent').src = '/info.html';">Info</a>      
 	  <a href="#"onclick="document.getElementById('maincontent').src = '/info.html';">Info</a>      
 	</div> 
 	</div> 
 </ul>
 </ul>
-<p>
-
-<div class="h_iframe">
-	 <iframe name="maincontent" id ="maincontent" src="/wasserzaehler_roi.html" title="fileserver" allowfullscreen></iframe> 
-</div>
-
-<script type="text/javascript" src="./gethost.js"></script> 
-<script type="text/javascript" src="./readconfigcommon.js"></script>  
-<script type="text/javascript" src="./readconfigparam.js"></script>  
 
 
+<iframe name="maincontent" class="iframe" id="maincontent" src="wasserzaehler_roi.html"></iframe>
 
 
 <script type="text/javascript">
 <script type="text/javascript">
-	var basepath = "http://192.168.178.22";
-
-
-function LoadHostname() {
-	_basepath = getbasepath(); 
-
-
-	var xhttp = new XMLHttpRequest();
-	xhttp.addEventListener('load', function(event) {
-	  if (xhttp.status >= 200 && xhttp.status < 300) {
-		hostname = xhttp.responseText;
-		  document.title = hostname + " - jomjol - AI on the edge";
-		  document.getElementById("id_title").innerHTML  = "Digitizer - AI on the edge - " + hostname;
-	  } else {
-		 console.warn(request.statusText, request.responseText);
-	  }
-	 });
-
-//     var xhttp = new XMLHttpRequest();
-	 try {
-		  url = _basepath + '/version?type=Hostname';     
-		  xhttp.open("GET", url, true);
-		  xhttp.send();
-
-	 }
-	 catch (error)
-	 {
-//               alert("Loading Hostname failed");
-	 }
-  }
-
   LoadHostname();
   LoadHostname();
-
 </script>
 </script>
 
 
+</div>
+
 </body>
 </body>
 </html>
 </html>

+ 11 - 101
sd-card/html/index_configure.html

@@ -5,73 +5,11 @@
 <title>jomjol - AI on the edge</title>
 <title>jomjol - AI on the edge</title>
 <meta charset="utf-8">
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-	
-<style>
-.h_iframe iframe {width:995px;height:765px;}
-.h_iframe {width:995px;height:765px;}
+<link rel="stylesheet" href="style.css" type="text/css" >
+</head>
 
 
-h1 {font-size: 2em; margin-block-end: 0.3em;}
-h2 {font-size: 1.5em;margin-block-start: 0.3em;}
-h3 {font-size: 1.2em;}
-p {font-size: 1em;}
-
-ul {
-  list-style-type: none;
-  margin: 0;
-  padding: 0;
-  overflow: hidden;
-  background-color: #333;
-  width:1000px;
-}
-
-li {
-  float: left;
-  font-family: arial;
-  font-size: 18px;
-}
-
-li a, .dropbtn {
-  display: inline-block;
-  color: white;
-  text-align: center;
-  padding: 14px 16px;
-  text-decoration: none;
-}
-
-li a:hover, .dropdown:hover .dropbtn {
-  background-color: red;
-}
-
-li.dropdown {
-  display: inline-block;
-}
-
-.dropdown-content {
-  display: none;
-  position: absolute;
-  background-color: #f9f9f9;
-  min-width: 160px;
-  box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
-  z-index: 1;
-  font-family: arial;
-}
-
-.dropdown-content a {
-  color: black;
-  padding: 12px 16px;
-  text-decoration: none;
-  display: block;
-  text-align: left;
-}
-
-.dropdown-content a:hover {background-color: #f1f1f1;}
-
-.dropdown:hover .dropdown-content {
-  display: block;
-}
-</style>
-
-<body style="font-family: arial">
+<body>
+<div class="main">
 
 
 <table style="border: none">
 <table style="border: none">
   <tr><td style="padding-right: 10px;"><img src="favicon.ico"></td>
   <tr><td style="padding-right: 10px;"><img src="favicon.ico"></td>
@@ -98,45 +36,17 @@ li.dropdown {
 		</div> 
 		</div> 
 	</li>		
 	</li>		
 </ul>
 </ul>
-<p>
-<div class="h_iframe">
-	 <iframe width="1020px" height="650px" name="maincontent" id ="maincontent" src="edit_config_param.html" title="fileserver"></iframe> 
-</div>
-<script type="text/javascript" src="./gethost.js"></script> 
-
-<script type="text/javascript">
-	var basepath = "http://192.168.178.22";
-
-
-function LoadHostname() {
-	_basepath = getbasepath(); 
-  
-	var xhttp = new XMLHttpRequest();
-	xhttp.addEventListener('load', function(event) {
-	  if (xhttp.status >= 200 && xhttp.status < 300) {
-		  hostname = xhttp.responseText;
-      document.title = hostname + " - Configure";
-		  document.getElementById("id_title").innerHTML  = "Configure - " + hostname;
-	  } else {
-		 console.warn(request.statusText, request.responseText);
-	  }
-	 });
 
 
-//     var xhttp = new XMLHttpRequest();
-	 try {
-		  url = _basepath + '/version?type=Hostname';     
-		  xhttp.open("GET", url, true);
-		  xhttp.send();
+<iframe name="maincontent" class="iframe" id="maincontent" src="edit_config_param.html"></iframe>
 
 
-	 }
-	 catch (error)
-	 {
-//               alert("Loading Hostname failed");
-	 }
-  }
+<script type="text/javascript" src="common.js"></script>
+<script type="text/javascript" src="gethost.js"></script>
 
 
+<script type="text/javascript">
   LoadHostname();
   LoadHostname();
-
 </script>
 </script>
+
+</div>
+
 </body>
 </body>
 </html>
 </html>