X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=bin%2Fplc-kml.py;h=460c0d9eba82a21a9eececa23d74b729d53389f8;hb=c1bd1740729b8a0c6ead549c79949283d78ac0ea;hp=c8b7de938033347569e0faaae2469e1024f32241;hpb=27ae61d51ba27a22a2e9048b90fe158dd3fac592;p=myplc.git

diff --git a/bin/plc-kml.py b/bin/plc-kml.py
index c8b7de9..460c0d9 100755
--- a/bin/plc-kml.py
+++ b/bin/plc-kml.py
@@ -101,42 +101,75 @@ class KmlMap:
         peer_id=site['peer_id']
 
         # open description
-        description='<ul>'
-        # Name and URL
-        description += '<li>'
-        description += '<a href="%(apiurl)s/db/sites/index.php?id=%(site_id)d"> Site page </a>'%locals()
+        description  = "<br/><table style='border: 1px solid black; padding: 5px;' width='500px'>"
+
+        # TESTBED
+        description += "<tr><td></td><td>&nbsp;</td><td></td></tr>"
+        description += "<tr><td align='center'>"
+        description += "<b>Testbed</b>"
+        description += "</td><td>"
+        if peer_id:
+            peername = 'PlanetLab Central'
+	    peerurl = 'http://www.planet-lab.org'
+            #self.peer_name(site,peers)
+        else:
+            peername = 'PlanetLab Europe'
+	    peerurl = 'http://www.planet-lab.eu'
+        description += "<a style='text-decoration: none;' href='%(peerurl)s'> %(peername)s </a>"%locals()
+        #description += "<a style='text-decoration: none;' href='%(apiurl)s/db/peers/index.php?id=%(peer_id)d'>[description]</a>"%locals()
+        description += "</td><td>"
+        if peer_id:
+            description += "<img src='%(apiurl)s/sites/plc24-32.png'/>"%locals()
+        else:
+            description += "<img src='%(apiurl)s/sites/ple24-32.png'/>"%locals()
+	description += "</td></tr>"
+
+	# URL
         if site['url']:
             site_url=site['url']
-            description += ' -- <a href="%(site_url)s"> %(site_url)s </a>'%locals()
-        description += '</li>'
+            description += "<tr><td align='center'>"
+            description += "<b>Website</b>"
+            description += "</td><td>"
+            description += "<a style='text-decoration: none;' href='%(site_url)s'> %(site_url)s </a>"%locals()
+            description += "</td><td></td></tr>"
+
+        description += "<tr><td></td><td>&nbsp;</td><td></td></tr>"
+        description += "<tr><td align='center'>Usage details:</td><td></td><td></td></tr>"
+        description += "<tr><td></td><td>&nbsp;</td><td></td></tr>"
+
         # NODES
+        description += "<tr><td align='center'>"
+        description += "<img src='%(apiurl)s/sites/node.png'/>"%locals()
+        description += "</td><td>"
         if nb_nodes:
-            description += '<li>'
-            description += '<a href="%(apiurl)s/db/nodes/index.php?site_id=%(site_id)d">%(nb_nodes)d node(s)</a>'%locals()
-            description += '<a href="%(apiurl)s/db/nodes/comon.php?site_id=%(site_id)d"> (in Comon)</a>'%locals()
-            description += '</li>'
+            description += "<a style='text-decoration: none;' href='%(apiurl)s/db/nodes/index.php?site_id=%(site_id)d'>%(nb_nodes)d node(s)</a>"%locals()
+            #description += "<a style='text-decoration: none;' href='%(apiurl)s/db/nodes/comon.php?site_id=%(site_id)d'> (in Comon)</a>"%locals()
         else:
-            description += '<li>No node</li>'
+            description += "<i>No node</i>"
+        description += "</td><td></td></tr>"
+
         #SLICES
+        description += "<tr><td align='center'>"
+        description += "<img src='%(apiurl)s/sites/slice.png'/>"%locals()
+        description += "</td><td>"
         if nb_slices:
-            description += '<li><a href="%(apiurl)s/db/slices/index.php?site_id=%(site_id)d">%(nb_slices)d slice(s)</a></li>'%locals()
+            description += "<a style='text-decoration: none;' href='%(apiurl)s/db/slices/index.php?site_id=%(site_id)d'>%(nb_slices)d slice(s)</a>"%locals()
         else:
-            description += '<li>No slice</li>'
-        # PEER
-        if peer_id:
-            peername = self.peer_name(site,peers)
-            description += '<li>'
-            description += '<a href="%(apiurl)s/db/peers/index.php?id=%(peer_id)d">At peer %(peername)s</a>'%locals()
-            description += '</li>'
+            description += "<i>No slice</i>"
+        description += "</td><td></td></tr>"
+
+        description += "<tr><td></td><td>&nbsp;</td><td></td></tr>"
+
         # close description
-        description +='</ul>'
+        description += "</table>"
 
         if not self.options.labels:
             name=""
             description=""
 
         # STYLE
-        if self.options.use_google_icons:
+        # the size for google icons
+        if not self.options.use_custom_icons:
             if not peer_id:
                 # local sites
                 iconfile=default_local_builtin
@@ -146,6 +179,7 @@ class KmlMap:
                 iconfile=default_foreign_builtin
                 xyspec="<x>160</x><y>0</y><w>32</w><h>32</h>"
             iconurl="root://icons/%(iconfile)s"%locals()
+        # the size for our own brew of icons
         else:
             if not peer_id:
                 iconfile=self.options.local_icon
@@ -184,15 +218,16 @@ def main () :
     parser.add_option("-n","--no-label",action="store_false",dest="labels",
                       default=True,
                       help="outputs only geographic positions, no labels")
-    parser.add_option("-c","--custom",action="store_false",dest="use_google_icons",
-                      default=True,
-                      help="use locally customized icons rather than the google-provided defaults")
+    # default - for private depls. - is to use google-provided icons like palette-3
+    parser.add_option("-c","--custom",action="store_true",dest="use_custom_icons",
+                      default=False,
+                      help="use locally customized icons rather than the %s and %s defaults"%(default_local_builtin,default_foreign_builtin))
     parser.add_option("-l","--local",action="store",dest="local_icon",
                       default=default_local_icon,
-                      help="set icon url to use for local sites marker -- default is %s"%default_local_icon)
+                      help="set icon url to use for local sites marker -- requires -c -- default is %s"%default_local_icon)
     parser.add_option("-f","--foreign",action="store",dest="foreign_icon",
                       default=default_foreign_icon,
-                      help="set icon url to use for foreign sites marker -- default is %s"%default_foreign_icon)
+                      help="set icon url to use for foreign sites marker -- requires -c -- default is %s"%default_foreign_icon)
 
     (options, args) = parser.parse_args()
     if len(args) != 0: