Changeset 101 for ATGoogleMaps

Timestamp:

08/18/06 00:55:52 (5 years ago)

Author:

takanori

Message:

情報画面のタブ表示に対応

Location:

ATGoogleMaps/trunk/skins/googlemaps

Files:

• atgooglemaps.js.dtml (modified) (1 diff)
• gmap.py (modified) (1 diff)
• gmap_view.pt (modified) (2 diffs)

ATGoogleMaps/trunk/skins/googlemaps/atgooglemaps.js.dtml

@@ -86 +86 @@
 }
 
-function addMarker(map, marker_id, lat, lng) {
+function addMarker(map, tabs, marker_id, lat, lng) {
     var point = new GLatLng(lat, lng);
     var marker = new GMarker(point, icon);
     map.addOverlay(marker);
-    var f = function(){
-        //map.centerAtLatLng(point);
-        marker.openInfoWindowHtml(document.getElementById('marker_html_' + marker_id).innerHTML);
-    };
+    f = function() {marker.openInfoWindowTabsHtml(tabs)};
     GEvent.addListener(marker, 'click', f);
     var marker_field = document.getElementById('marker_link_'+ marker_id);

ATGoogleMaps/trunk/skins/googlemaps/gmap.py

@@ -16 +16 @@
         latitude = marker.point['latitude']
         longitude = marker.point['longitude']
-        print "        addMarker(map, '%s', %s, %s);" % (marker.id, latitude, longitude)
+        print "        var tabs = ["
+        print "          new GInfoWindowTab('%s', document.getElementById('marker_html_%s').innerHTML)" % (marker.tab1, marker.id)
+        if marker.detail:
+            print "          ,new GInfoWindowTab('%s', document.getElementById('detail_html_%s').innerHTML)" % (marker.tab2, marker.id)
+        print "        ];"
+        print "        addMarker(map, tabs, '%s', %s, %s);" % (marker.id, latitude, longitude)
     except:
         continue

ATGoogleMaps/trunk/skins/googlemaps/gmap_view.pt

@@ -36 +36 @@
 
     <!-- gmarker -->
-    <ul>
-    <tal:gmarker tal:repeat="marker python: here.objectValues(['GMarker'])">
+    <ul tal:define="markers python: here.objectValues(['GMarker'])">
+    <tal:gmarker tal:repeat="here markers">
       <li id=""
-          tal:condition="marker/point | nothing"
-          tal:attributes="id string:marker_link_${marker/id}">
-        <a href="javascript:void(0)" onclick="this.blur()" tal:content="marker/pretty_title_or_id">
+          tal:condition="here/point | nothing"
+          tal:attributes="id string:marker_link_${here/id}">
+        <a href="javascript:void(0)" onclick="this.blur()" tal:content="here/pretty_title_or_id">
           Gmarker title
         </a>
         <!-- info window -->
         <div id="" style="display: none;"
-             tal:attributes="id string:marker_html_${marker/id}">
+             tal:attributes="id string:marker_html_${here/id}">
           <div style="width: 290px;">
             <div class="documentActions">
-              <a href="" tal:condition="marker/url"
-                 tal:attributes="href marker/url"
+              <a href="" tal:condition="here/url"
+                 tal:attributes="href here/url"
                  i18n:translate="" i18n:domain="plone">
                  Link
@@ -56 +56 @@
             </div>
             <h1 class="documentFirstHeading">
-              <a href="" tal:content="marker/pretty_title_or_id"
-                 tal:attributes="href marker/absolute_url">
+              <a href="" tal:content="here/pretty_title_or_id"
+                 tal:attributes="href here/absolute_url">
                 Title or id
               </a>
             </h1>
             <img src="" style="float: left; margin: 5px;"
-                 tal:condition="marker/imageurl"
-                 tal:attributes="src marker/imageurl" />
+                 tal:condition="here/imageurl"
+                 tal:attributes="src here/imageurl" />
 
             <div class="documentDescription"
-                 tal:content="marker/Description"
-                 tal:condition="marker/Description">
+                 tal:content="here/Description"
+                 tal:condition="here/Description">
               Description
             </div>
     
             <div class="address"
-                 tal:content="marker/address"
-                 tal:condition="marker/address">
+                 tal:content="here/address"
+                 tal:condition="here/address">
               address
             </div>
     
             <div class="phone"
-                 tal:content="marker/phone"
-                 tal:condition="marker/phone">
+                 tal:content="here/phone"
+                 tal:condition="here/phone">
               phone
             </div>
     
-            <div style="clear: both;" tal:condition="marker/getText"
-                 tal:content="structure marker/getText">
+            <div style="clear: both;" tal:condition="here/getText"
+                 tal:content="structure here/getText">
                Body Text
             </div>
-    
+
+            <div metal:use-macro="here/document_relateditems/macros/relatedItems">
+              show related items if they exist
+            </div>
           </div>
         </div>
+        <div id="" style="display: none;"
+             tal:attributes="id string:detail_html_${here/id}"
+             tal:condition="here/detail">
+          <div style="width: 290px;">
+            <div class="documentActions">
+              <a href="" tal:condition="here/url"
+                 tal:attributes="href here/url"
+                 i18n:translate="" i18n:domain="plone">
+                 Link
+              </a>
+            </div>
+            <h1 class="documentFirstHeading">
+              <a href="" tal:content="here/pretty_title_or_id"
+                 tal:attributes="href here/absolute_url">
+                Title or id
+              </a>
+            </h1>
+            <div tal:content="structure here/getDetail">
+               Detail Text
+            </div>
+          </div>
+        </div>
       </li>
     </tal:gmarker>
     </ul>
     
-    <div id="map" style="position: relative; height: 480px;"
-         tal:attributes="style string:position: relative;; height: ${here/height}px;;">
+    <div id="map"
+         tal:attributes="style string:height: ${here/height}px;;">
     </div>
+
     <div class="poweredBy">
         Powered by <a href="http://takanory.net/plone/develop/atgooglemaps">ATGoogleMaps</a>