Mercurial > hgrepos > hgweb.cgi > skipweb

changeset 2730:0fee65b32702

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merged
author GOTO Sakuya <c113061@e.koeki-u.ac.jp>
date Tue, 17 Nov 2015 22:03:32 +0900
parents dbdfb0f49aff
children 38fae0c3bddf
files syuzai/higawari/base.html syuzai/higawari/higawari.css syuzai/higawari/higawari.html
diffstat 3 files changed, 16 insertions(+), 33 deletions(-) [+]
line wrap: on
line diff
--- a/syuzai/higawari/base.html	Tue Nov 17 21:14:12 2015 +0900
+++ b/syuzai/higawari/base.html	Tue Nov 17 22:03:32 2015 +0900
@@ -10,32 +10,6 @@
 <link rel="stylesheet" type="text/css"href="../../skip.css">
 <link rel="stylesheet" type="text/css" href="higawari.css">
 
-<script type="text/javascript"src="http://maps.googleapis.com/maps/api/js?sensor=false"></script>
-<script type="text/javascript">
-/* map */
-function initialize() {
-  var latlng = new google.maps.LatLng(38.9165038, 139.8353126);
-  var myOptions = {
-  zoom: 16,
-  center: latlng,
-  mapTypeId: google.maps.MapTypeId.ROADMAP, //
-  panControl: true, //1.左上の丸いの表示
-  streetViewControl: true, //2.左の黄色い人形(pegman=ペグマン)表示
-  zoomControl: true, //3.左の上下スライダー表示
-  mapTypeControl: true, //4.右上の「地図/航空写真」表示
-  scaleControl: false, //5.右下の定規の表示
-  overviewMapControl: false //6.右下の概観マップの表示
-  //disableDefaultUI: true  //全コントローラを非表示
-  };
-  var map = new google.maps.Map(document.getElementById('map_canvas'),
-  myOptions);
-  var marker = new google.maps.Marker({
-    position: latlng,
-    map: map,
-    title: 'カフェeジェラート モアレ'
-  });
-}
-</script>
 </head>
 <!--以上設定等-->
 
@@ -59,13 +33,22 @@
 <!--お店情報-->
 
 <div class="tizu">
+
+<div id="map">
+<p><iframe src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d3104.32700659984!2d139.83532121478825!3d38.91650265342395!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x5f8e9e5d74ee910b%3A0xb144cb3582e6fae5!2z44K444Kn44Op44O844OI44Oi44Ki44Os!5e0!3m2!1sja!2sjp!4v1447764084328"
+width="600" height="450" frameborder="0" style="border:0"allowfullscreen></iframe>
+<!--地図上で表示-->
+</p>
+
 <p>住所:山形県----</p>
 <p>Tel:zzz-xxxx-yyyy</p>
 <p>営業時間:AM11:00~PM14:00</p>
+<p><a href="higawari.html">戻る</a></p>
 </div>
-<!--場所情報-->
-
-<p><a href="higawari.html">戻る</a></p>
+<!--mapの終了-->
+</div>
+<!--場所情報終了-->
 
 </body>
 </html>
+
--- a/syuzai/higawari/higawari.css	Tue Nov 17 21:14:12 2015 +0900
+++ b/syuzai/higawari/higawari.css	Tue Nov 17 22:03:32 2015 +0900
@@ -26,11 +26,11 @@
 
 div.tizu{
 	background-color: #ffd355;
-	margin-width: 25%;
+	margin-width1: 25%;
 	float: left;
 	}
 
 #map_canvas {
-  width: 760px;
-  height: 320px;
+  width: 600px;
+  height: 400px;
 }
--- a/syuzai/higawari/higawari.html	Tue Nov 17 21:14:12 2015 +0900
+++ b/syuzai/higawari/higawari.html	Tue Nov 17 22:03:32 2015 +0900
@@ -1,4 +1,4 @@
-<html>
+/<html>
 <head>
 <title>日替わりランチ</title>
 <link rel="stylesheet" type="text/css" href="higawari.css">

yatex.org