[pisa-src] r2924 - in apps/mobac-services/www/floorplan: ap30px.png floorplan.html floorplan.js umic-floorplan-800px-plain.png
- From: Nicolai Viol <Nicolai.Viol@xxxxxxxxxxxxxxxxxxxxx>
- To: pisa-src@xxxxxxxxxxxxx
- Date: Tue, 13 Mar 2012 18:06:41 +0100
Author: viol
Date: Tue Mar 13 18:06:40 2012
New Revision: 2924
Log:
update ap positions in floorplan demo
Added:
apps/mobac-services/www/floorplan/ap30px.png (contents, props changed)
apps/mobac-services/www/floorplan/umic-floorplan-800px-plain.png
(contents, props changed)
Modified:
apps/mobac-services/www/floorplan/floorplan.html
apps/mobac-services/www/floorplan/floorplan.js
Added: apps/mobac-services/www/floorplan/ap30px.png
==============================================================================
Binary file. No diff available.
Modified: apps/mobac-services/www/floorplan/floorplan.html
==============================================================================
--- apps/mobac-services/www/floorplan/floorplan.html Tue Mar 13 15:31:31
2012 (r2923)
+++ apps/mobac-services/www/floorplan/floorplan.html Tue Mar 13 18:06:40
2012 (r2924)
@@ -6,25 +6,38 @@
<link rel="stylesheet" type="text/css" href="ap-monitor.css">
<style type="text/css">
- img.marker_img { width:100px; hight:100px; }
+ div.ap {width:100px; height:100px;}
+ img.marker { position:absolute; top:0; left:0; width:100px;
height:100px; }
td { color:white;}
td.info {color:#00ff00}
+ img.ap_img {position:absolute; top:35px; left:35px; }
- #floorplan_img { width:800px; z-index:-1; background:gray;}
- #iris { position:absolute; left:128px; top:28px; z-index:1;}
- #freya { position:absolute; left:418px; top:30px; z-index:1;}
- #gaia { position:absolute; left:595px; top:30px; z-index:1;}
- #hebe { position:absolute; left:400px; top:125px; z-index:1;}
- #hyperion { position:absolute; left:500px; top:165px; z-index:1;}
- #nike { position:absolute; left:80px; top:420px; z-index:1;}
- #selene { position:absolute; left:510px; top:290px; z-index:1;}
- #pan { position:absolute; left:495px; top:372px; z-index:1;}
+ #floorplan_img {position:absolute; max-width:800px; z-index:-1;
background:gray;}
+ #ap_iris { position:absolute; right:-15px; top:105px; z-index:1;}
+ #ap_freya { position:absolute; left:408px; top:20px; z-index:1;}
+ #ap_gaia { position:absolute; left:585px; top:20px; z-index:1;}
+ #ap_hebe { position:absolute; left:430px; top:155px; z-index:1;}
+ #ap_hyperion { position:absolute; left:490px; top:155px; z-index:1;}
+ #ap_nike { position:absolute; right:50px; top:360px; z-index:1;}
+ #ap_selene { position:absolute; left:500px; top:280px; z-index:1;}
+ #ap_pan { position:absolute; left:435px; top:380px; z-index:1;}
#info-box { visibility:visible; position:absolute; color:green;
padding:12px; vertical-align:bottom; left:10px; top:250px; z-index:8;
width:250px; hight:150px;
background-image:url(info-box-dummy.png);
background-repeat:no-repeat;
- background-color:grey;}
- #status {visibility:visible; position:absolute; lest:10px, top:10px;}
+ background-color:gray;}
+ #status {visibility:visible; position:absolute; left:10px, top:10px;}
+ #markers {position:absolute; width:800px;}
+ p.label{
+ position:absolute;
+ top:35px;
+ left:42px;
+ z-index:1;
+ text-align:center;
+ font-family:sans-serif;
+ color:white;
+ text-shadow:black 0 0 4444px;
+ font-size:small}
</style>
</head>
@@ -43,17 +56,43 @@
<area shape="rect" alt="" title="selene" coords="530,310,570,350"
onclick="enableMarker('selene')"/>
<area shape="rect" alt="" title="pan" coords="513,390,553,430"
onclick="enableMarker('pan')"/>
</map>
- <img src="./umic-floorplan-alt-800px.png" USEMAP="#router_map">
+ <img src="./umic-floorplan-800px-plain.png" USEMAP="#router_map">
</div>
<div id="markers">
- <div id="iris" class="marker" ><img class="marker_img"
src="./marker.png" title="iris" onclick="enableMarker('iris')"></div>
- <div id="freya" class="marker" ><img class="marker_img"
src="./marker.png" title="freya" onclick="enableMarker('freya')"> </div>
- <div id="gaia" class="marker" ><img class="marker_img"
src="./marker.png" title="gaia" onclick="enableMarker('gaia')"> </div>
- <div id="hebe" class="marker" ><img class="marker_img"
src="./marker.png" title="hebe" onclick="enableMarker('hebe')"> </div>
- <div id="hyperion" class="marker" ><img class="marker_img"
src="./marker.png" title="hyperion" onclick="enableMarker('hyperion')"> </div>
- <div id="nike" class="marker" ><img class="marker_img"
src="./marker.png" title="nike" onclick="enableMarker('nike')"> </div>
- <div id="selene" class="marker" ><img class="marker_img"
src="./marker.png" title="selene" onclick="enableMarker('selene')"> </div>
- <div id="pan" class="marker" ><img class="marker_img"
src="./marker.png" title="pan" onclick="enableMarker('pan')"> </div>
+ <div id="ap_iris" class="ap" >
+ <img class="ap_img" src="./ap30px.png">
+ <img class="marker" id="iris" src="./marker.png" title="iris"
onclick="enableMarker('iris')">
+ <p class="label">116</p>
+ </div>
+
+ <div id="ap_freya" class="ap" >
+ <img class="ap_img" src="./ap30px.png">
+ <img class="marker" id="freya" src="./marker.png"
title="freya" onclick="enableMarker('freya')"> <p class="label">126</p>
+</div>
+ <div id="ap_gaia" class="ap" >
+ <img class="ap_img" src="./ap30px.png">
+ <img class="marker" id="gaia" src="./marker.png" title="gaia"
onclick="enableMarker('gaia')"> <p class="label">125</p>
+</div>
+ <div id="ap_hebe" class="ap" >
+ <img class="ap_img" src="./ap30px.png">
+ <img class="marker" id="hebe" src="./marker.png" title="hebe"
onclick="enableMarker('hebe')"> <p class="label">120</p>
+</div>
+ <div id="ap_hyperion" class="ap" >
+ <img class="ap_img" src="./ap30px.png">
+ <img class="marker" id="hyperion" src="./marker.png"
title="hyperion" onclick="enableMarker('hyperion')"> <p class="label">127</p>
+</div>
+ <div id="ap_nike" class="ap" >
+ <img class="ap_img" src="./ap30px.png">
+ <img class="marker" id="nike" src="./marker.png" title="nike"
onclick="enableMarker('nike')"> <p class="label">119</p>
+</div>
+ <div id="ap_selene" class="ap" >
+ <img class="ap_img" src="./ap30px.png">
+ <img class="marker" id="selene" src="./marker.png"
title="selene" onclick="enableMarker('selene')"> <p class="label">117</p>
+</div>
+ <div id="ap_pan" class="ap" >
+ <img class="ap_img" src="./ap30px.png">
+ <img class="marker" id="pan" src="./marker.png" title="pan"
onclick="enableMarker('pan')"> <p class="label">118</p>
+</div>
</div>
<div id=info-box>
<table id="info-table">
Modified: apps/mobac-services/www/floorplan/floorplan.js
==============================================================================
--- apps/mobac-services/www/floorplan/floorplan.js Tue Mar 13 15:31:31
2012 (r2923)
+++ apps/mobac-services/www/floorplan/floorplan.js Tue Mar 13 18:06:40
2012 (r2924)
@@ -28,12 +28,15 @@
}
else
{
+
requestCount += 1;
}
}
function infoCallback(info)
{
+ errorCount = 0;
+ requestCount = 0;
if (info.HOSTNAME !== lastHostname){
lastHostname = info.HOSTNAME;
$.ajax({url: 'http://192.168.8.1:29868/request_ap_info',
@@ -49,14 +52,12 @@
type: "GET",
dataType: "jsonp",
});
- errorCount = 0;
- requestCount = 0;
- }
+ }
}
function disableAllRouter()
{
- $('div.marker:visible').each(function(){$(this).hide();});
+ $('img.marker:visible').each(function(){$(this).hide();});
}
function toggleRouter(router)
@@ -75,6 +76,7 @@
$('#connection').html('online').css('color','#00ff00');
})
.error(function(){
+ document.errorCount += 1;
$('#connection').html('offline').css('color','#ff0000');
});
}
Added: apps/mobac-services/www/floorplan/umic-floorplan-800px-plain.png
==============================================================================
Binary file. No diff available.
--
This is the pisa developer mailing list. Please also subscribe to the main pisa
list at:
//www.freelists.org/list/pisa
Other related posts:
- » [pisa-src] r2924 - in apps/mobac-services/www/floorplan: ap30px.png floorplan.html floorplan.js umic-floorplan-800px-plain.png - Nicolai Viol
