Mercurial > hgrepos > hgweb.cgi > skipweb

changeset 946:22740c3a0988

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 Mon, 16 Nov 2015 20:58:23 +0900
parents 0d9e81b3cadc (current diff) 7887e857732f (diff)
children eae66a438857
files syuzai/higawari/higawari.html syuzai/higawari/higawari.html.orig syuzai/syuzai.html
diffstat 8 files changed, 181 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/syuzai/#syuzai.html#	Mon Nov 16 20:58:23 2015 +0900
@@ -0,0 +1,64 @@
+<html lang="ja">
+
+<head>
+<title>SKIP - Shonai Koeki Information Project</title>
+<link rel="stylesheet" type="text/css" href="../skip.css">
+</head>
+
+<body>
+
+<div class="fix">
+<div class="menu">
+<table style="border-collapse: collapse; margin-left:
+ auto; margin-right: auto;">
+ <tr><td><a href="../">top</a></td><td><a href="syuzai.html">取材</a></td><td><a href="../program/program.html">プログラム
+ </a></td><td><a href="../enq/enq.html">アンケート</a></td><td><a href="../kiraribito/girl.html">きらりびと</a></td></tr>
+</table>
+</div>
+</div>
+
+<div class="main_title">
+<img src="../skip-kamo-small.png" alt="kamon">
+</div>
+
+<p class="new"><span>新着情報</span> <a href="kagetsu/kagetsu.html">「花月」記事を更新！！</a></p>
+
+<!-- このコードの使用は、Google カスタム検索の利用規約への同意を前提とし -->
+<!-- ます。 -->
+<!-- 利用規約は http://www.google.com//cse/docs/tos.html?hl=ja でご覧い -->
+<!-- ただけます -->
+<form name="cse" id="searchbox_demo"
+action="https://www.google.com/cse">
+  <input type="hidden" name="cref" value="" />
+  <input type="hidden" name="ie" value="utf-8" />
+  <input type="hidden" name="hl" value="ja" />
+  <input name="q" type="text" size="40" />
+  <input type="submit" name="sa" value="検索" />
+</form>
+<script type="text/javascript"
+src="https%3A%2F%2Fcse.google.com%2Fcse/tools/onthefly?form=searchbox_demo&#x6c;ang=ja"></script>
+                                
+
+<h1>取材一覧</h1>
+
+
+
+
+
+<table>
+<tr><th>もぐもぐ</th><th>移住情報</th><th>動物園</th><th>日替わりランチ
+ </th><th>特産物</th><th>釣り情報</th>
+<tr><th><a href="rupo/rupo.html"><img
+     src="rupo/rupo1-150.jpg"></a></th><th><a href="moare/moare.html"><img src="moare/moare1-150.JPG"></a></th>
+
+<th><a href="romantei/romantei.html"><img src="romantei/romantei1-150.jpg"></a></th><th><a href="higawari/higawari.html"><img src="higawari/higawari.jpg"></a></th>
+<th><a href="tukusan/tukusan.html"><img src="tukusi/tukusi1-150.JPG"></a></th><th><a href="dezima/dezima.html"><img src="dezima/dezima4-150.JPG"></a></th></tr></tr>
+
+
+</table>
+</body>
+</html>
+
+
+
+
--- a/syuzai/higawari/higawari.html	Mon Nov 16 20:55:14 2015 +0900
+++ b/syuzai/higawari/higawari.html	Mon Nov 16 20:58:23 2015 +0900
@@ -8,6 +8,7 @@
 
 
 <body>
+<<<<<<< local
 <h1>ý</h1>
 <p>Υ...</p>
 
@@ -42,5 +43,6 @@
 <li>ޤ˥塼</li>
 </div>
 
+
 </body>
 </html>
--- a/syuzai/higawari/higawari.html.orig	Mon Nov 16 20:55:14 2015 +0900
+++ b/syuzai/higawari/higawari.html.orig	Mon Nov 16 20:58:23 2015 +0900
@@ -1,27 +1,46 @@
 <html>
 <head>
 <title>ؤ</title>
-<link rel="stylesheet" type="text/css" href=".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>
 </head>
+<!--ʾ-->
+
 
 <body>
-<h1>ؤ</h1>
-<<<<<<< local
+<h1>ý</h1>
 <p>Υ...</p>
-<p>⡡餢꿩</p>
-<p>祫եͤЧܥ顼1.5̡ˡȥ</p>
-<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>
+<!--ܤΤŹ-->
 
-<h1></h1>
-<p>
-<a href="http://skip.koeki-prj.org/syuzai/higawari/higawari2.html">ؤŹ</a>
-</p>
-=======
-<p><a href="">....</a></p>
->>>>>>> other
-<p><a href="">...</a></p>
-<p><a href="">..</a></p>
-<p><a href="">.</a></p>
+<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>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/syuzai/higawari/kcafe.html	Mon Nov 16 20:58:23 2015 +0900
@@ -0,0 +1,16 @@
+<html>
+<head>
+<title>祫եƥꥢ</title>
+<link rel="stylesheet" type="text/css" href=".css">
+<script type="text/javascript"src="http://maps.googleapis.com/maps/api/js?sens\
+or=false"></script>
+</head>
+
+<body>
+<h1≯ʸإեƥꥢ</h1>
+<p>ؤ꿩</p>
+<p></p>
+<p><img src=".jpg" alt=""posission="left"></p>
+
+</body>
+</html>
Binary file syuzai/higawari/とりてり丼.jpg has changed
Binary file syuzai/higawari/イカチリ.jpg has changed
--- a/syuzai/syuzai.html	Mon Nov 16 20:55:14 2015 +0900
+++ b/syuzai/syuzai.html	Mon Nov 16 20:58:23 2015 +0900
@@ -54,7 +54,6 @@
 <th><a href="zoo/index.html"><img src="zoo/domon_a.jpg" width="150" height="100"></a></th><th><a href="higawari/higawari.html"><img src="higawari/higawari.jpg"></a></th>
 <th><a href="tokusan/tokusan.html"><img src="tokusan/tokusan_top.jpg" width="150" height="100"></a></th><th><a href="dezima/dezima.html"><img src="dezima/dezima4-150.JPG"></a></th></tr></tr>
 
-
 </table>
 </body>
 </html>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/syuzai/syuzai.html.orig	Mon Nov 16 20:58:23 2015 +0900
@@ -0,0 +1,64 @@
+<html lang="ja">
+
+<head>
+<title>SKIP - Shonai Koeki Information Project</title>
+<link rel="stylesheet" type="text/css" href="../skip.css">
+</head>
+
+<body>
+
+<div class="fix">
+<div class="menu">
+<table style="border-collapse: collapse; margin-left:
+ auto; margin-right: auto;">
+ <tr><td><a href="../">top</a></td><td><a href="syuzai.html"></a></td><td><a href="../program/program.html">ץ
+ </a></td><td><a href="../enq/enq.html">󥱡</a></td><td><a href="../kiraribito/girl.html">Ӥ</a></td></tr>
+</table>
+</div>
+</div>
+
+<div class="main_title">
+<img src="../skip-kamo-small.png" alt="kamon">
+</div>
+
+<p class="new"><span></span> <a href="kagetsu/kagetsu.html">ֲַ׵򹹿</a></p>
+
+<!-- ΥɤλѤϡGoogle มѵؤƱդȤ -->
+<!-- ޤ -->
+<!-- ѵ http://www.google.com//cse/docs/tos.html?hl=ja Ǥ -->
+<!-- ޤ -->
+<form name="cse" id="searchbox_demo"
+action="https://www.google.com/cse">
+  <input type="hidden" name="cref" value="" />
+  <input type="hidden" name="ie" value="utf-8" />
+  <input type="hidden" name="hl" value="ja" />
+  <input name="q" type="text" size="40" />
+  <input type="submit" name="sa" value="" />
+</form>
+<script type="text/javascript"
+src="https%3A%2F%2Fcse.google.com%2Fcse/tools/onthefly?form=searchbox_demo&#x6c;ang=ja"></script>
+                                
+
+<h1></h1>
+
+
+
+
+
+<table>
+<tr><th>⤰⤰</th><th>ܽ</th><th>ưʪ</th><th>ؤ
+ </th><th>ûʪ</th><th></th>
+<tr><th><a href="rupo/rupo.html"><img
+     src="rupo/rupo1-150.jpg"></a></th><th><a href="iturn/iturn.html"><img src="iturn/i20091123-1450-00.jpg" width="150" height="100"></a></th>
+
+<th><a href="zoo/index.html"><img src="zoo/domon_a.jpg" width="150" height="100"></a></th><th><a href="higawari/higawari.html"><img src="higawari/higawari.jpg"></a></th>
+<th><a href="tokusan/tokusan.html"><img src="tokusan/"></a></th><th><a href="dezima/dezima.html"><img src="dezima/dezima4-150.JPG"></a></th></tr></tr>
+
+
+</table>
+</body>
+</html>
+
+
+
+

yatex.org