Mercurial > hgrepos > hgweb.cgi > skipweb

changeset 2723:9070d13922b9

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 20:26:54 +0900
parents dc82090212a0 (diff) 816d6672ccfa (current diff)
children 2f6a90387d6a
files
diffstat 7 files changed, 40 insertions(+), 99 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/syuzai/higawari/.#higawari.html	Tue Nov 17 20:26:54 2015 +0900
@@ -0,0 +1,1 @@
+c113061@roy.e.koeki-u.ac.jp.15780
\ No newline at end of file
--- a/syuzai/higawari/base.html	Tue Nov 17 19:39:34 2015 +0900
+++ b/syuzai/higawari/base.html	Tue Nov 17 20:26:54 2015 +0900
@@ -3,7 +3,34 @@
 <title>日替わりランチ</title>
 <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"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>
 <!--以上設定等-->
 
@@ -35,7 +62,7 @@
 </div>
 <!--場所情報-->
 
-<p><a href="skip.koeki-prj.org/syuzai/higawari/higawari.html">戻る</a></p>
+<p><a href="higawari.html">戻る</a></p>
 
 </body>
 </html>
--- a/syuzai/higawari/higawari.css	Tue Nov 17 19:39:34 2015 +0900
+++ b/syuzai/higawari/higawari.css	Tue Nov 17 20:26:54 2015 +0900
@@ -16,29 +16,19 @@
 
 a:hover{background-color: red;}
 
-div.menu1{
-	background-color: #ffd355;
-	position: relative;
-	margin: 10px;
-	border: solid #ff9900 5px;}
-
-div.menu1a{
-	background-
-
-div.menu2{
+div.menu{
 	background-color: #ffd355;
 	position: relative;
 	margin: 10px;
-	border: solid #ff9900 5px;}
+	border: solid #ff9900 5px;
+	float: left;}
 
-div.menu3{
+div.tizu{
 	background-color: #ffd355;
-	position: rerative;
-	margin: 10px;
-	border: solid #ff9900 5px;}
+	float: right;
+	}
 
-div.menu4{
-	background-color: #ffd355;
-	position: rerative;
-	margin: 10px;
-	border: solid #ff9900 5px;}
+#map_canvas {
+  width: 760px;
+  height: 320px;
+}
--- a/syuzai/higawari/higawari.html.orig	Tue Nov 17 19:39:34 2015 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-<html>
-<head>
-<title>日替わりランチ</title>
-<link rel="stylesheet" type="text/css" href="higawari.css">
-<script type="text/javascript" src="http://maps.googleapis.com/maps/api/js?sensor=false"></script>
-</head>
-<!--以上設定等-->
-
-
-<body>
-<h1>ランチ特集</h1>
-<p>本日のランチは...</p>
-
-
-<div class="menu1">
-<p><img src="negisamon.jpg"alt="赤ねぎとサーモンのクリーム"width=""hight=""></p>
-<p>パスタ</p>
-<li>青じそめんたい子</li>
-<li>赤ねぎとサーモンのクリーム</li>
-<li>ジェノバの漁師風</li>
-<p>店名：カフェeジェラート　モアレ</p>
-<p></p>
-</div>
-<!--一つ目のお店-->
-
-<div class="menu2">
-<p><img src=""alt=""width=""hight=""></p>
-<p>公益定食</p>
-<p>公益屋</p>
-</div>
-
-<div class="menu3">
-<p><img src=""alt=""width=""hight=""></p>
-<p>公益ラーメン</p>
-<p>touhoku-university-of-service-and-science</p>
-</div>
-
-<div class="menu4">
-<p><img src=""alt="東北公益文科大学カフェテリア"width=""hight=""></p>
-<li>定食：</li>
-<li>丼もの：マーボー丼</li>
-<li>気まぐれメニュー：</li>
-</div>
-
-</body>
-</html>
--- a/syuzai/higawari/higawari2.html~	Tue Nov 17 19:39:34 2015 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-<html>
-<head>
-<title>ユ帥潟</title>
-<link rel="stylesheet" type="text/css" href=".css">
-</head>
-
-<body>
-<h1>ユ帥潟</h1>
-<h1>綺</h1>
-<p>ャ潟絎蕋</p>
-<p><img src=""></p>
-<p>絎合換篁</p>
-<p>ャ潟絎蕋</p>
-<p><img src=""></p>
-<p>絎合換篁</p>
-<p>羂贋ャ潟絎蕋</p>
-<p><img src=""></p>
-<p>絎合換篁</p>
-<p>ャ潟絎蕋</p>
-<p><img src=""></p>
-<p>絎合換篁</p>
-<p>ャ潟絎蕋</p>
-<p>img src=""></p>
-<p>絎合換篁</p>
-
-<p>
-<a href="http://skip.koeki-prj.org/syuzai/higawari/higawari.html">ユ帥潟
-</p>
-
-</body>
-</html>
Binary file syuzai/higawari/ikachiri.jpg has changed
Binary file syuzai/higawari/toriteri.jpg has changed

yatex.org