Skip to content

Commit

Permalink
Agregado interpolacion
Browse files Browse the repository at this point in the history
  • Loading branch information
angelmartz committed Oct 31, 2012
1 parent 5689ff7 commit e7e040c
Show file tree
Hide file tree
Showing 4 changed files with 148 additions and 38 deletions.
2 changes: 1 addition & 1 deletion app/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
padding: 10px;
}
.resultados{
padding: 26px;
padding: 5px;
}
.resultados td{
text-align:center;
Expand Down
140 changes: 118 additions & 22 deletions app/app.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion cache.manifest
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CACHE MANIFEST
# Date Thu Mar 11 08:43:10 PST 2010
# Date Thu Mar 11 11aa:43:53a0 PST 2012
index.html
termoh20.sql
app/app.js
Expand All @@ -13,6 +13,7 @@ iui/t/default/back-img.png
iui/t/default/backButton.png
iui/t/default/backButtonBack.png
iui/t/default/backButtonBrdr.png
iui/t/default/backButtonSel.png
iui/t/default/blueButton.png
iui/t/default/cancel.png
iui/t/default/default-theme.css
Expand Down
41 changes: 27 additions & 14 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
<head>
<title>Propiedades del Agua H20</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"/>
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black" />
<meta charset="utf-8">
<link rel="stylesheet" href="iui/iui.css" type="text/css" />

Expand All @@ -18,7 +20,7 @@ <h1 id="pageTitle"></h1>
</div>
<div id="instalacion" title="Instalación H20" selected="true" class="panel">
<div class="row blanco">
<p>Para poder utilizar correctamente esta aplicación por favor Instalala</p>
<p>Hola Para poder utilizar correctamente esta aplicación por favor Instalala</p>
<section class="work" style="display:none;">
<div class="ui-progress-bar ui-container" id="progress_bar">
<div class="ui-progress" style="width: 7%;">
Expand All @@ -38,23 +40,16 @@ <h1 id="pageTitle"></h1>
</div>
<div id="menu" title="Menú">
<div style="">
<ul>
<li>
<a href="#temperatura">Tabla de liquido comprimido Temperaturas</a>
</li>
<li>
<a href="#presion">Tabla de liquido comprimido Presiones</a>
</li>
</ul>


<a href="#temperatura" class="whiteButton">Tabla de liquido comprimido (Temperaturas)</a>
<a href="#presion" class="whiteButton">Tabla de liquido comprimido (Presiones)</a>

</div>
</div>
<div id="temperatura" title="Temperatura">
<div id="calculos" style="">
Temperatura [°C]: <input type="text" pattern="[0-9]*" id="val_temperatura"/><br/>
Temperatura [°C]: <input type="text" id="val_temperatura"/><br/>
<button id="cal_temperatura" class="whiteButton">Calcular</button>
<div class="interpolado"></div>
<div class="resultados">
<table id="res_temperatura" width="100%" cols="6">
<tbody>
Expand Down Expand Up @@ -116,8 +111,9 @@ <h1 id="pageTitle"></h1>
</div>
<div id="presion" title="Presión">
<div id="calculos" style="">
Presión (bar): <input type="text" pattern="[0-9]*" id="val_presion"/><br/>
Presión (bar): <input type="text" id="val_presion"/><br/>
<button id="cal_presion" class="whiteButton">Calcular</button>
<div class="interpolado"></div>
<div class="resultados">
<table id="res_presion" width="100%" cols="6">
<tbody>
Expand Down Expand Up @@ -186,6 +182,23 @@ <h1 id="pageTitle"></h1>
App.init();
});
//]]>
</script>
// Actualizar APP si hay una version nueva.
window.addEventListener('load', function(e) {
console.log("hola");
window.applicationCache.addEventListener('updateready', function(e) {
if (window.applicationCache.status == window.applicationCache.UPDATEREADY) {
// Actualizando Cache
window.applicationCache.swapCache();
if (confirm('Esta disponible una nueva version. ¿Deses cargala?')) {
window.location.reload();
}
} else {
// Nada nuevo
}
}, false);

}, false);
</script>

</body>
</html>

0 comments on commit e7e040c

Please sign in to comment.