Merge pull request #16 from isawnyu/issue15

Issue15 resolves #15
isawnyu · Jul 24, 2015 · 7233502 · 7233502
2 parents 70a0cb2 + b8ecac2
commit 7233502
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 30 deletions.
diff --git a/skins/PleiadesEntity/location_view.pt b/skins/PleiadesEntity/location_view.pt
@@ -80,23 +80,28 @@
         <div id="map-block" title="Locations of this particular place are shown in blue.">
           <div id="map"></div>
           <div id="below-map">
-            <p tal:condition="where">Show area in 
+            <p tal:condition="where">Show place in 
               <a href=""
-                tal:attributes="href string:http://awmc.unc.edu/awmc/applications/alacarte/?pid=${place/getId}"
-                >Antiquity &Agrave;-la-carte</a><span
-                  tal:define="mlon python:where['reprPt'][0]; mlat python:where['reprPt'][1]; underscore string:_"
-                  >, <a tal:attributes="href string:http://www.geonames.org/maps/google_$mlat$underscore$mlon.html" href=""
-                  >GeoNames</a>, 
-                    <a 
-                      tal:attributes="href string:$placeurl/kml" href=""
-                      >Google Earth</a>,
-                    <a 
-                      tal:attributes="href string:http://maps.google.com/?q=$mlat,$mlon" href=""
-                      >Google Maps</a>,
-                    or <a 
-                      tal:attributes="href string:http://openstreetmap.org/?mlat=$mlat&mlon=$mlon&zoom=12&layers=M" href=""
-                      >OpenStreetMap</a></span>.</p>
-          </div>
+                tal:attributes="href string:http://awmc.unc.edu/awmc/applications/alacarte/?pid=${place/getId}">
+                AWMC's Antiquity &Agrave;-la-carte</a>,
+              <a href=""
+                 tal:attributes="href string:$placeurl/kml">
+                Google Earth</a>, or 
+              <a href=""
+                tal:attributes="href string:http://pelagios.org/peripleo/map#places=http%3A%2F%2Fpleiades.stoa.org%2Fplaces%2F${place/getId}">Pelagios' Peripleo</a>.
+            </p>
+            <p tal:condition="where"
+               tal:define="mlon python:where['reprPt'][0]; mlat python:where['reprPt'][1]; underscore string:_">Show area in
+              <a href=""
+                 tal:attributes="href string:http://www.geonames.org/maps/google_$mlat$underscore$mlon.html">
+                GeoNames</a>, 
+              <a href="" 
+                 tal:attributes="href string:http://maps.google.com/?q=$mlat,$mlon">
+                Google Maps</a>, or 
+              <a href=""
+                 tal:attributes="href string:http://openstreetmap.org/?mlat=$mlat&mlon=$mlon&zoom=12&layers=M">
+                OpenStreetMap</a>.
+            </p>          </div>
         </div>
 
       <div id="fields-continued">

diff --git a/skins/PleiadesEntity/place_view.pt b/skins/PleiadesEntity/place_view.pt
@@ -81,21 +81,28 @@
         <div id="map-block" title="Locations of this particular place are shown in blue.">
           <div id="map"></div>
           <div id="below-map">
-            <p tal:condition="where">Show area in 
+            <p tal:condition="where">Show place in 
               <a href=""
-                tal:attributes="href string:http://awmc.unc.edu/awmc/applications/alacarte/?pid=${here/getId}"
-                >Antiquity &Agrave;-la-carte</a><span
-                  tal:define="mlon python:where['reprPt'][0]; mlat python:where['reprPt'][1]; underscore string:_"
-                  >, <a tal:attributes="href string:http://www.geonames.org/maps/google_$mlat$underscore$mlon.html" href=""
-                  >GeoNames</a>, 
-                    <a 
-                      tal:attributes="href string:$url/kml" href=""
-                      >Google Earth</a>, <a 
-                      tal:attributes="href string:http://maps.google.com/?q=$mlat,$mlon" href=""
-                      >Google Maps</a>,
-                    or <a 
-                      tal:attributes="href string:http://openstreetmap.org/?mlat=$mlat&mlon=$mlon&zoom=12&layers=M" href=""
-                      >OpenStreetMap</a></span>.</p>
+                tal:attributes="href string:http://awmc.unc.edu/awmc/applications/alacarte/?pid=${here/getId}">
+                AWMC's Antiquity &Agrave;-la-carte</a>,
+              <a href=""
+                 tal:attributes="href string:$url/kml">
+                Google Earth</a>, or 
+              <a href=""
+                tal:attributes="href string:http://pelagios.org/peripleo/map#places=http%3A%2F%2Fpleiades.stoa.org%2Fplaces%2F${here/getId}">Pelagios' Peripleo</a>.
+            </p>
+            <p tal:condition="where"
+               tal:define="mlon python:where['reprPt'][0]; mlat python:where['reprPt'][1]; underscore string:_">Show area in
+              <a href=""
+                 tal:attributes="href string:http://www.geonames.org/maps/google_$mlat$underscore$mlon.html">
+                GeoNames</a>, 
+              <a href="" 
+                 tal:attributes="href string:http://maps.google.com/?q=$mlat,$mlon">
+                Google Maps</a>, or 
+              <a href=""
+                 tal:attributes="href string:http://openstreetmap.org/?mlat=$mlat&mlon=$mlon&zoom=12&layers=M">
+                OpenStreetMap</a>.
+            </p>
           </div>
 
         </div>