Mercurial > hgrepos > hgweb.cgi > skipweb

changeset 2838:caa3a981a412

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author ARAKI Tsuyohito <c113007@e.koeki-u.ac.jp>
date Tue, 01 Dec 2015 18:17:32 +0900
parents 1f707e76af6d (diff) 04efe5f4049b (current diff)
children b4886f404796
files opencampus2015/accountcheck.rb opencampus2015/admin/.htaccess opencampus2015/admin/check.rb opencampus2015/cookie.rb opencampus2015/gets.rb opencampus2015/img/foot.png opencampus2015/img/head.png opencampus2015/index.html opencampus2015/list.csv opencampus2015/prof.rb opencampus2015/profeel.css opencampus2015/quest.rb
diffstat 26 files changed, 398 insertions(+), 169 deletions(-) [+]
line wrap: on
line diff
--- a/oasis2015/prof.rb	Tue Dec 01 17:49:42 2015 +0900
+++ b/oasis2015/prof.rb	Tue Dec 01 18:17:32 2015 +0900
@@ -135,6 +135,7 @@
 getAC = ARGV[0].to_i  ###URL?以降の文字(特定の乱数)を取得してgetACに代入
 qr = qrAC[getAC]      ###特定の"乱数"が一致すると、"乱数"=>"記号"がqrに正しく入力される。
 qr = ARGV[0]
+
 if qr =="a" && q1 == 0
   q1 += 1
   jikan2 = db.execute(jikan1, "a")
Binary file syuzai/higawari/donmono.jpg has changed
--- a/syuzai/higawari/higawari.html	Tue Dec 01 17:49:42 2015 +0900
+++ b/syuzai/higawari/higawari.html	Tue Dec 01 18:17:32 2015 +0900
@@ -15,12 +15,17 @@
 <p></p>
 <p>˥塼</p>
 <p>(ˤʤ̿򥯥åǾܺ٥ڡ)</p>
-<p><a href="moare.html"><img src="negisamon.jpg"alt="֤ͤȥΥ꡼"width="400"hight="300"></a></p>
-<p><a href="higawari2.html"><img src="ramen2.jpg"alt="̣顼"width="400"hight="300"></a></p>
-<p><a href="hayashi.html"><img src="hayashirice.jpg"alt="ϥ䥷饤"width="400"hight="300"></a></p>
-<p><a href="mabodon.html"><img src="mabodon.jpg"alt="ޡܡЧ"width="400"hight="300"></a></p>
-<p><img src="noimage.png"alt=""width="400"hight="300"></p>
-<p><img src="noimage.png"alt=""width="400"hight="300"></p>
+<p>֤ͤȥΥ꡼ѥ</p>
+<p><a href="moare.html"><img src="negisamon.jpg"alt="֤ͤȥΥ꡼"width="150"hight="100"></a></p>
+<p>̣顼</p>
+<p><a href="higawari2.html"><img src="ramen2.jpg"alt="̣顼"width="150"hight="100"></a></p>
+<p>Х󥫥졼</p>
+<p><a href="hayashi.html"><img src="kimagure.jpg"alt="ϥ䥷饤"width="150"hight="100"></a></p>
+<p>Ч</p>
+<p><a href="mabodon.html"><img src="donmono.jpg"alt="ޡܡЧ"width="150"hight="100"></a></p>
+<p>ޤεȤ</p>
+<p><img src="teisyoku.jpg"alt=""width="150"hight="100"></p>
+<p><img src=""alt=""width=""hight=""></p>
 
 </body>
 </html>
--- a/syuzai/higawari/higawari3.html	Tue Dec 01 17:49:42 2015 +0900
+++ b/syuzai/higawari/higawari3.html	Tue Dec 01 18:17:32 2015 +0900
@@ -1,9 +1,15 @@
 <html>
 <head>
+
 <title>ؤ</title>
+
+<meta http-equiv="Content-Type" content="text/html; charset=Euc-jp">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<meta http-equiv="Content-Script-Type" content="text/javascript">
+
 <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>
+
 </head>
 <!--ʾ-->
 
@@ -11,31 +17,35 @@
 <body>
 <h1>굮²</h1>
 
-<div class="menu">
-<p><img src=".jpg"alt=""></p>
-<!--img src=""alt="̾">
+<table>
+<tr>
+<td>
+<p><img src="kizoku1.jpg"alt="()顼ˤȤᤷ"></p>
+<p>1120ʶˤؤ</p>
+<li>()顼ˤȤᤷ</li>
+<li>800</li>
+<tr>
+</table>
 
-<p>ѥ</p>
-<li>Ĥ󤿤</li>
-<li>֤ͤȥΥ꡼</li>
-<li>ΥФε</li>
-<p>顼</p>
-<li>߼</li>
-<li>ߥ</li>
-<li>㥷祳</li>
 
-</div>
-</div>
 <!--Ź-->
 
 <div class="tizu">
+<div id="map">
+<p>
+<iframesrc="https://www.google.co.jp/maps/place/%E9%AD%9A%E5%B1%B1%E4%BA%BA/@38.916468,139.8373719,21z/data=!4m2!3m1!1s0x0000000000000000:0x6d59a92319a589e6"width="600" height="400" frameborder="0" style="border:0" allowfullscreen>
+</iframe>
+<!--Ͽ޾ɽ-->
+</p>
+
 <p>:----</p>
 <p>Tel:zzz-xxxx-yyyy</p>
 <p>ĶȻ:AM11:00~PM14:00</p>
 </div>
+</div>
 <!---->
 
-<p><a href="skip.koeki-prj.org/syuzai/higawari.html"></a></p>
+<p><p><a href="higawari.html"></a></p>
 
 </body>
 </html>
Binary file syuzai/higawari/kimagure.jpg has changed
Binary file syuzai/higawari/kizoku.jpg has changed
Binary file syuzai/higawari/kizoku1.jpg has changed
Binary file syuzai/higawari/teisyoku.jpg has changed
--- a/syuzai/ijyuu.html	Tue Dec 01 17:49:42 2015 +0900
+++ b/syuzai/ijyuu.html	Tue Dec 01 18:17:32 2015 +0900
@@ -8,219 +8,231 @@
 <link rel="stylesheet" type="text/css"href="./main.css">
 <style type="text/css">
 <!--
+div + h1{padding-top:2em;}
+div.menu table td {
+    width:7em;
+    text-align:center;
+}
 -->
 </style>
+
+<script type="text/javascript">
+<!--
+var doc = document.documentElement;
+doc.setAttribute('data-useragemt',navigator.userAgent);
+-->
+</script>
+
 </head>
+
 <body>
-<h1></h1>
 
+<div class="fix">
+<div class="menu">
+<table style="border-collapse: collapse; margin-left:
+ auto; margin-right: auto;">
+ <tr><td><a href="syuzai.html"></a></td>
+<td><a href="rupo/rupo.html">⤰⤰</a></td>
+<td><a href="zoo/index.html">ưʪ</a></td>
+<td><a href="higawari/higawari.html">ؤ</a></td>
+<td><a href="tokusan/tokusan.html">ûʪ</a></td>
+<td><a href="dezima/dezima.html"></a></td></tr>
+</table>
+</div>
+</div>
 
+<h1>Ļ԰ܽQ&A</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="./ijyuu.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/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>
 <header><img src="image/sakataiju.png"></header>
 <form>
-<label>
-<input type="checkbox"name="sakata" ><span class="dekai">ߤˤĤ</span><div>
 
-<li>Q.ļˤ˥ѡ?</li>
-<dd>A.9ޤǤǤƽˤޤᲬޤ­򿭤Фȥåԥ󥰥⡼⤢ޤ</dd>
+<input type="checkbox"name="sakata" id="label-1">
+<label for="label-1"><span class="dekai">ߤˤĤ</span></label><div>
 
-<li>Q.ˤ̲ۻҲʤƻҶĤޤʤ󤸤ʤ?</li>
-<dd>A.̲ۻҲޤŲۻޤ䡢¾ˤ⤿󤢤ΤǡΤ
-  ̲ۻҲ򤪻ҤõƤߤƤ</dd>
-<li>Q.ڻߤäƤʤˤ?</li>
+<input type="checkbox"name="sakata" >Q.ļˤ˥ѡ?
+<dd>A.9ޤǤǤƽˤޤĮᲬԤޤ­򿭤Фȥåԥ󥰥⡼⤢ޤ</dd><br>
+
+<input type="checkbox"name="sakata" >Q.ˤ̲ۻҲʤƻҶĤޤʤ󤸤ʤ?
+<dd>A.̲ۻҲޤŲۻޤ䡢¾ˤ⤿󤢤ΤǡΤʤ̲ۻҲ򤪻ҤõƤߤƤ</dd><br>
+<input type="checkbox"name="sakata" >Q.ڻߤäƤʤˤ?
 <dd>A.饪󥿡ͥåȥեХåƥ󥰥󥿡ܡ󥰡޽ۡ
-סʤɽ¤Ƥޤ! ޤ­򿭤ФȱDzۤ⤢ޤ</dd>
+סʤɽ¤Ƥޤ! Įޤ­򿭤ФȱDzۤ⤢ޤ</dd><br>
 
-   <li>Q.ӥˤϤɤʴǤ?⤽⤢ΤǤ?</li>
-<dd>A.ԳϤ˽ˤϤǤ礦ʳϼ֤ǰưʤ
-  é失ޤ־Ϥä㹭Ǥ</dd>
+<input type="checkbox"name="sakata" >Q.ӥˤϤɤʴǤ?⤽⤢ΤǤ?
+<dd>A.ԳϤ˽ˤϤǤ礦ʳϼ֤ǰưʤб󤯴뤫⤷ޤ󡣥ӥˤˤϡ־줬֤ͭߤ뤳Ȥޤ</dd><br>
 
-<li>Q.ļˤˤ±ʤµ˼ԤĤΤǤ?</li>
-<dd>A.ޤ</dd>
+<input type="checkbox"name="sakata" >Q.ļˤˤ±ʤʹޤޤ?
+<dd>A.ĿͷбĤ±±ޤб򤷤Ƥ±⤢ꡢ۵޻˺뤳ȤϤޤ</dd><br>
 
-<li>Q.̾</li>
-<dd>A.ʪۤѴۤޤ</dd>
+<input type="checkbox"name="sakata" >Q.ĤǴѸ̾Ϥޤ?
+<dd>A.ʪۤѴۤޤޤҸˤޤ</dd><br>
 
-<li>Q.ݡĻ</li>
-<dd>A.ݡĥबޤ</dd>
+<input type="checkbox"name="sakata" >Q.ݡĻߤޤ?
+<dd>A.ݡĥबޤ</dd><br>
 
-<li>Q.Ĥ˲äƤޤ</li>
-<dd>A.ߤϤ󡢷򹯥ɤ⤢ޤ</dd>
+<input type="checkbox"name="sakata" >Q.Ĥ˲äƤޤ
+<dd>A.ߤϤ󡢷򹯥ɤ⤢ޤ</dd><br>
 
-<li>Q.ȱڤȤäƤޤ</li>
-<dd>A.ĤˤƱ󤢤ޤ</dd>
-
-<li>Q.Ĥ˱DzۤäƤޤ</li>
-<dd>A.ΤϤޤϤޤ</dd>
+<input type="checkbox"name="sakata" >Q.ƱäƤޤ
+<dd>A.ĤˤϡƱ¿ޤ</dd><br>
 
-<li>Q.ĤˤϤɤ줰餤عΡ</li>
-<dd>A.ĤˤϾعع⹻عȤ󤢤ޤ</dd>
+<input type="checkbox"name="sakata" >Q.Ĥ˱DzۤäƤޤ
+<dd>A.ΤϤޤߤϤޤ</dd><br>
+<input type="checkbox"name="sakata" >Q.ĤˤϤɤ줰餤عΡ
+<dd>A.Ĥˤϡعع⹻عȶ鵡ؤ¿ޤ</dd><br>
 
-<li>Q.Ĥˤ͹ضɤäƤɤ줰餤Ρ</li>
-<dd>A.Ĥˤϣսꤢޤ</dd>
+<input type="checkbox"name="sakata" >Q.Ĥˤ͹ضɤäƤɤ줰餤Ρ
+<dd>A.ϰˤΤѻ˺뤳Ȥ̵Ǥ礦</dd><br>
 
-<li>Q.Ĥˤ϶ԤϤΡ</li>
-<dd>A.ĤˤԤʤɤޤ</dd>
+<input type="checkbox"name="sakata" >Q.Ĥˤ϶ԤϤΡ
+<dd>A.ĤˤϡԤʤɤޤ</dd><br>
 
-<li>Q.Ĥˤ־äƤΡ</li>
-<dd>A.ϤĮˤ־줬ޤ</dd>
+<input type="checkbox"name="sakata" >Q.Ĥˤ־äƤΡ
+<dd>A.ϤĮˤ־줬ޤ</dd><br>
 
-<li>Q.Ǥ? Ź?</li>
-<dd>A.顼󲰤˭٤Ǥܳγι򤤤Ź򲰤Įˤ󤢤ޤ</dd>
+<input type="checkbox"name="sakata" >Q.Ǥ? Ź?
+<dd>A.顼󲰤˭٤Ǥܳγι򤤤Ź򲰤¿ޤ</dd><br>
 
-<li>Q.ɤȤ˿ͤޤޤ?</li>
-<dd>A.ĤϿ衢ä˥顼󲰤˿ͤޤ䤹ǤĤΥ顼Ϥ
-ѤȤ𥹡פΤŹ¿Τạ̇̄äƤߤƲ</dd>
+<input type="checkbox"name="sakata" >Q.ɤȤ˿ͤޤޤ?
+<dd>A.ĤϿ衢ä˥顼󲰤˿ͤޤ䤹ǤĤΥ顼ϡäѤȤ𥹡פΤŹ¿Τạ̇̄äƤߤƲ</dd><br>
 
-<li>Q.Ĥ̾ʪäƤΡ</li>
-<dd>A.Ĥϥ顼󤬤Τǰٿ٤ƤߤȤǤ</dd>
+<input type="checkbox"name="sakata" >Q.Ĥ̾ʪäƤΡ
+<dd>A.Ĥϥ顼󤬤Τǰٿ٤ƤߤƤ</dd><br>
 
-<li>Q.פȤɤʤ?</li>
-A.٥ȤŤʪˤϤȷ礭ޤ󡣥٥ȤΤʤΤۤʤۤɤǤˤʤΤõƤߤޤ礦
-<br><a href="http://www.sakata-kankou.com/event/">http://www.sakata-kankou.com/event/(Ĥݡ٥)</a>
+<input type="checkbox"name="sakata" >Q.פȤɤʤ?
+<dd>A.٥ȤŤʪˤϤȷ礭ޤ󡣥٥ȤΤʤΤۤʤۤɤǤ̣ΤõƤߤޤ礦<br>
+<a href="http://www.sakata-kankou.com/event/">http://www.sakata-kankou.com/event/(Ĥݡ٥)</a></dd>
 </ol>
 </div>
-</label><br>
-<label>
-<input type="checkbox"name="sakata" ><span class="dekai">ĤϰˤĤ</span><div>
-<li>Q.ۤȤ˿ƻϰΤ?</li>
-<dd>A.ǾΤ夷ƳƲˤȤɤƤޤ</dd><br>
-<a href="http://www.water.sakata.yamagata.jp/map2.html">http://www.water.sakata.yamagata.jp/map2.html(ĻԿƻɡĻԤοƻȿ帻)</a>
+<br>
+
+<input type="checkbox"name="sakata" id="label2">
+<label for="label2"><span class="dekai">ĤϰˤĤ</span></label><div>
+ <input type="checkbox"name="sakata" >Q.ۤȤ˿ƻϰΤ?</li>
+<dd>A.ǾΤ夷ƳƲˤϤƤޤ<br>
+<a href="http://www.water.sakata.yamagata.jp/map2.html">http://www.water.sakata.yamagata.jp/map2.html(ĻԿƻɡĻԤοƻȿ帻)</a></dd><br>
 
-<li>Q.ǽαƶݤǤ</li>
-<dd>A.ǽ̤ϼĻHPƥӤΥǡ뤳ȤǤޤ</dd>
+ <input type="checkbox"name="sakata" >Q.ǽαƶݤǤ 
+<dd>A.ǽ̤ϼĻHPƥӤΥǡ뤳ȤǤޤ</dd><br>
 
-<li>Q.ĤäϢ³ƥӥɥޤΤϤǤʪϤȰ
-    Ǥ</li>
-<dd>A.ʿ٤ƤΤƱǤ</dd>
+ <input type="checkbox"name="sakata" >Q.ĤäϢ³ƥӥɥޤΤϤǤʪϤȰ
+    Ǥ 
+<dd>A.ʿ٤ƤΤƱǤ</dd><br>
 
-<li>Q.ʪ̣դϤɤΤ褦ʴǤ?</li>
-<dd>A.ǻ٤ͤ˰¿Ϳ䤵̣ޤͤο
-β򴶤ΤǡҰٿ٤ƤߤƲ</dd>
+ <input type="checkbox"name="sakata" >Q.ʪ̣դϤɤΤ褦ʴǤ? 
+<dd>A.ǻ٤ͤ˰¿Ϳ䤵̣ޤͤοβ򴶤ΤǡҰٿ٤ƤߤƲ</dd><br>
 
-<li>Q.ޯ򤷤ƤͤϼϤ鸫⤤Ƥޤޤ?</li>
-<dd>A.ޯ٤ˤޤåʳ湥褯Ǥ褦˻פޤ
-ʼʬ򸫤ĤˤϤäƤȻפޤ</dd>
+ <input type="checkbox"name="sakata" >Q.ޯ򤷤ƤͤϼϤ鸫⤤Ƥޤޤ? 
+<dd>A.ޯ٤ˤޤåʳ湥褯Ǥ褦˻פޤͤʼʬ򸫤ĤˤϤäƤȻפޤ</dd><br>
 
-<li>Q.Ϥޤ?</li>
-<dd>A.ϰȤȤǤˤΤϰǤΤ򤹤ޤ
-ˤϻ֤ꡢ˽ǤԤǤäƤʬʤä
-ȱǤ򤹤뤳ȤǾȤϰɤΤ뤳
-ȤǤΤǡһƤߤƤۤǤ</dd>
+ <input type="checkbox"name="sakata" >Q.Ϥޤ? 
+<dd>A.ϰȤȤǤˤΤϰǤΤ򤹤ޤǤˤϻ֤ꡢ˽ǤԤǤäƤʬʤäȱǤ򤹤뤳ȤǾȤϰɤΤ뤳ȤǤΤǡһƤߤƤۤǤ</dd><br>
+
+ <input type="checkbox"name="sakata" >Q.äȤĶϤޤ? 
+<dd>A.ΤԲۤWi-fiĶäƤϤޤ󤬡äؤ򴶤뤳ȤϤʤȻפޤ</dd><br>
 
-<li>Q.äȤĶϤޤ?</li>
-<dd>A.ΤԲۤWi-fiĶäƤϤޤ󤬡äǤؤ
-٤ѲǽǤ</dd>
-
-<li>Q.Ĥοͤäݤʤ</li>
-<dd>A.츫ݤ⤷ޤ󤬤ȤƤ⤤ͤФǤ</dd>
+ <input type="checkbox"name="sakata" >Q.Ĥοͤäݤʤ 
+<dd>A.츫ݤ⤷ޤͥͤФǤ</dd><br>
 
-<li>Q.ϤϤɤΤ褦ʨΤǤŤѤΤǤ</li>
-<dd>A.ȤˤäƤ줾ۤʤޤŤѤƤϾʤȻפ
-ޤ</dd>
+ <input type="checkbox"name="sakata" >Q.ϤϤɤΤ褦ʨΤǤŤѤΤǤ 
+<dd>A.ȤˤäƤ줾ۤʤޤŤѤƤϾʤȻ
+    ޤ̤βǤϡܥ򲡤ȤǤǤޤ</dd><br>
 
-<li>Q.ǥȥ˹ԤʤäƤ⤫ʤȹԤʤǤ?</li>
-<dd>A.Ϥ֤ǤγФǤ</dd>
+ <input type="checkbox"name="sakata" >Q.ǥȥ˹ԤʤäƤ⤫ʤȹԤʤǤ? 
+<dd>A.ӥˤ䥹ѡ˥ȥ줬ޤʳϡ̱Ȥ˥ȥߤƤ褦ˤꤤΤɤΤޤ</dd><br>
 
 
-<li>Q.ͷӤϤǤޤ?</li>
-<dd>A.ҤɤãϤߤʼȤȤ˰ޤƤޤǰʤǶϰ
-⾯ʤˤȤǤʤ¿Ǥ</dd>
+ <input type="checkbox"name="sakata" >Q.ͷӤϤǤޤ? 
+<dd>A.ҤɤãϤߤʼȤȤ˰ޤƤޤǰʤǶϰ⾯ʤˤȤǤʤ¿ǤǤƤˤϡDZˤȤޤ</dd><br>
 
-<li>Q.</li>
-<dd>A.籫ϡݾդޤ礦</dd>
+ <input type="checkbox"name="sakata" >Q. 
+<dd>A.籫ϡݾդޤ礦</dd>
 
 </div>
-</label>
+
+
 <br>
-<label>
-<input type="checkbox"name="sakata" ><span class="dekai">ĤεˤĤ</span><div>
-<li>Q.ŷ</li>
-<dd>A.Ǥ</dd>
+<input type="checkbox"name="sakata"id="label3" ><label for="label3"> <span class="dekai">ĤεˤĤ</span></label>
+<div>
+ <input type="checkbox"name="sakata" >Q.Ϥɤ줯餤դޤ? 
+<dd>A.ǯֹ߿̤1770.5mmȤʤäƤޤٻԤ1336.5mmԤ1280.0mmԤ1416.5mmȼĻԤ̤Ǥ˹⤤ͤȤʤäƤޤ</dd><br>
 
-<li>Q.</li>
-<dd>A.̤ϾʤǤΤ褦ˤʤޤ</dd>
+ <input type="checkbox"name="sakata" >Q.ޤ? 
+<dd> ϡܶξʤϰǤΤʤǤ⡢ܳ¦˰֤ĻԤϡοϩ鳰뤳Ȥ¿ܶᤷǤϤޤ뤳Ȥ¿ᡢ뱫䶯ﳲ뤳ȤϡۤȤɤޤ</dd><br>
 
-<li>Q.ܳ¦ߤʤΤǤ</li>
+ <input type="checkbox"name="sakata" >Q.ܳ¦ߤʤΤǤ 
 <dd>A.ǤϤʤǤ϶¿ǤξʤɤǤä
-뤿ᡢžˤդƤĹ⤯ȡ񤷤
-ޤ</dd>
+뤿ᡢžˤդƤ桢Ĺ⤯ȡ񤷤
+ޤ</dd><br>
 
- <li>Q.㲼٤äƤɤ줯餤Ǥ</li>
-<dd>A.Ȥ٤ʤ˲Ƥ</dd>
+  <input type="checkbox"name="sakata" >Q.㲼٤äƤɤ줯餤Ǥ 
+<dd>A.Ȥ٤ʤ˲ƤޤߤνɬܤǤǤ㤬10cmʾˤʤȼĻԤȼԤ˰ƻƻ֤ǽ㤷Ƥޤ</dd><br>
 
-<li>Q.ϲåȥ뤢न߱ۤޤ</li>
-<dd>A.50åȥǽʬǤ</dd>
+ <input type="checkbox"name="sakata" >Q.ϲåȥ뤢न߱ۤޤ 
+<dd>A.50åȥǽʬǤ</dd><br>
 
-<li>Q.Ƥ⴨ΤǤ</li>
-<dd>A.ƤϽ뤤ǤǤΤᤤ褦ˤⴶޤ</dd>
+ <input type="checkbox"name="sakata" >Q.ߤϤɤɤǤ? 
+<dd>󥸥㥱åȤ䥳ȤɬפǤޤޥե顼ޤɬפǤĤȹɤǤ</dd><br>
 
-<li>Q.Ϥʤ졢Ϥˤʤ뤳ȤϤޤ?</li>
-<dd>A.¿Ƥ֤뤬ޤ٤Ǥ</dd>
+ <input type="checkbox"name="sakata" >Q.Ƥ⴨ΤǤ 
+<dd>A.ƤϽ뤤ǤǤΤᤤ褦ˤⴶޤ</dd><br>
 
-<li>Q.Ȼ֤ʤǤ?</li>
-<dd>A.ʤǤ?</dd>
+ <input type="checkbox"name="sakata" >Q.Ϥʤ졢Ϥˤʤ뤳ȤϤޤ? 
+<dd>A.¿Ƥ֤뤬ޤ٤Ǥ</dd><br>
+
+ <input type="checkbox"name="sakata" >Q.Ȼ֤ʤǤ? 
+<dd>A.ûǤ˻پϤǤޤߤΤȤͤʪ򴥤Τ˴絡Τޤ</dd><br>
 
-<li>Q.ƻüưʪ⤤ƤǤӽФƤꤷޤ</li>
-<dd>A.ˤ⤤ƤϤޤ󤬡ӽФƤΤդǤ</dd>
+ <input type="checkbox"name="sakata" >Q.ƻüưʪ⤤ƤǤӽФƤꤷޤ 
+<dd>A.ˤ⤤ƤϤޤ󤬡ӽФƤΤդɬפǤ</dd><br>
 
-<li>Q.̶̳ؤϡåޤϥȥʥǹԤäꤹΤǤ</li>
-<dd>A.åȥʥưʪΤޤ󡣼֤ХʤɤѤޤ</dd>
+ <input type="checkbox"name="sakata" >Q.̶̳ؤϡåޤϥȥʥǹԤäꤹΤǤ 
+<dd>A.åȥʥưʪΤޤ󡣼֤ХʤɤѤޤ</dd><br>
 
-<li>Q.вϥĤ䥽ǵǤ</li>
+ <input type="checkbox"name="sakata" >Q.вϥĤ䥽ǵǤ 
 <dd>A.ˤϤΤ褦ʼʤǵͤ⤤뤫⤷ޤ󤬡Ⱦ⡦ž֡
 ֤ǵޤ</dd>
 
 </div>
-</label>
+
+
 <br>
-<label>
-<input type="checkbox"name="sakata" ><span class="dekai">Ĥθ̤ˤĤ</span><div>
-<li>Q.</li>
+<input type="checkbox"name="sakata" id="label4"><label for="label4"><span class="dekai">Ĥθ̤ˤĤ</span></label><div>
+ <input type="checkbox"name="sakata" >Q. 
 <dd>A.ż֤ǰưǽǤϥХǰưǽǤ
-ޤ֤ǽĻԤ仳Ԥʤɤ˹ԤǤޤ</dd>
+ޤ֤ǽĻԤ仳Ԥʤɤ˹ԤǤޤ</dd><br>
+
+ <input type="checkbox"name="sakata" >Q.Ǥż֤ؤαƶϤޤ? 
+<dd>A.ˤ뱿ߴϡ®20mʾǽԱž®25mDZž碌ȤʤΤѤݤϵݾ˵Ĥޤ礦</dd><br>
 
-<li>Q.ؤDzǤʤǤ?</li>
-<dd>A.Ϥ֤ǤγФǤ</dd>
+ <input type="checkbox"name="sakata" >Q.ؤDzǤʤǤ? 
+<dd>A.ϰˤȻפޤѡ䥳ӥˤޤ</dd><br>
 
-<li>Q.̻Τǯ˲勞餤Ƥޤ</li>
-<dd>A.678Ǥʿ22ǯסߤƻϩΤǡѴǤ</dd>
+ <input type="checkbox"name="sakata" >Q.̻Τǯ˲勞餤Ƥޤ 
+<dd>A.678Ǥʿ22ǯסߤƻϩꡢ˴Ǥߤ˼֤Ѥݤϡåɥ쥹(ߤ褦Υ)ˤʤФʤޤ</dd>
 
 </div>
-</label><br>
-<label>
-<input type="checkbox"name="sakata" ><span class="dekai">ܳˤĤ</span>
+<br>
+
+<input type="checkbox"name="sakata"id="label5"><label for="label5"><span class="dekai">ܳˤĤ</span></label>
 <div>
 
-<li>Q.ܳˤȤΤǤ</li>
-<dd>A.礭Ȥޤ礭ȤƤޤ󡣥ꥢ
-ߤǤϤʤߤľʤΤǡȤ뤳ȤϤޤͤ
-󤬡ϩγǧʤɤɬפǤ</dd>
+ <input type="checkbox"name="sakata" >Q.ܳˤȤΤǤ 
+<dd>A.礭Ȥޤ礭ȤƤޤ󡣥ꥢߤǤϤʤߤľʤΤǡȤ뤳ȤϤۤȤɹͤޤ󤬡ϩγǧʤɤɬפǤ</dd><br>
+
+ <input type="checkbox"name="sakata" >Q.ܳ˥ϤΡ 
+<dd>A.˥¿˸ޤ󤬡ǤȹͤޤդƲ</dd><br>
 
-<li>Q.ܳ˥ϤΡ</li>
-<dd>A.˥¿˸ޤ󤬡Ǥȹͤޤդ
-</dd>
+ <input type="checkbox"name="sakata" >Q.ܳϥߤήĤƤʥ᡼Ǥˤ뤯餤
+    Ǥ 
+<dd>A.ܳȤӤΤ˥ߤήĤȤ⤢ޤȤƤʳǤǯѸҤ¿ˬ졢ʤɤڤǤޤ᤯˲Ȥ⤢ꡢƤεٲˤˤϺŬǤ</dd><br>
 
-<li>Q.ܳϥߤήĤƤʥ᡼Ǥˤ뤯餤
-    Ǥ</li>
-<dd>A.ܳȤӤΤ˥ߤήĤȤ⤢ޤȤƤ
-ȤǤǯѸҤ¿ˬ졢ʤɤڤǤޤ᤯
-˲Ȥ⤢ꡢƤεٲˤˤϺŬǤ</dd>
+ <input type="checkbox"name="sakata" >Q.Ȥι⤵ϤɤΤ餤Ǥ? 
+<dd>A.Ȥι⤵ˤä礭ѤΤǰ쳵ˤϸޤ˱ƶ뤳ȤϤޤޤ󡣲Ƥθ褤Ȥι⤵ꡢ褯ڤळȤǤ礦ޤĤγϡǯ720˹Ԥޤ</dd>
 
 </div>
-</label>
 </form>
 
 
Binary file syuzai/images/Q1.png has changed
Binary file syuzai/images/sakataiju.png has changed
--- a/syuzai/iturn/.#iturn.html	Tue Dec 01 17:49:42 2015 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-c115036@roy.e.koeki-u.ac.jp.25240
\ No newline at end of file
--- a/syuzai/main.css	Tue Dec 01 17:49:42 2015 +0900
+++ b/syuzai/main.css	Tue Dec 01 18:17:32 2015 +0900
@@ -7,14 +7,17 @@
 li +dd{color:blue;}
 
 
-input[type="checkbox"][name="sakata"] +span + div {display: none; opacity:0;}
-input[type="checkbox"][name="sakata"]:checked + span + div {display: block;
+input[type="checkbox"][name="sakata"] +label+ div {display: none; opacity:0;}
+input[type="checkbox"][name="sakata"]:checked + label + div {display: block;
   opacity: 1.0; transition: 3s ease-in-out;
   transition:  1s linear;}
 
+input[type="checkbox"][name="sakata"] +dd {display: none;}
+input[type="checkbox"][name="sakata"]:checked + dd {display: block;}
 span.dekai{font-size:2em;}
 
 
 label input{ image
 	opacity: 0;
 }
+
Binary file syuzai/zoo/dsc02735.jpg has changed
Binary file syuzai/zoo/haku1.jpg has changed
Binary file syuzai/zoo/haku2.jpg has changed
Binary file syuzai/zoo/haku3.jpg has changed
--- a/syuzai/zoo/index.html	Tue Dec 01 17:49:42 2015 +0900
+++ b/syuzai/zoo/index.html	Tue Dec 01 18:17:32 2015 +0900
@@ -1,11 +1,42 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 5 Transitional//EN">
 <html>
 <head>
  <title>
 ʪޤȤ
  </title>
  <meta charset="euc-jp">
+<<<<<<< local
+ <link rel="stylesheet" href="../../skip.css" type="text/css">
+=======
+ <link rel="stylesheet" href="../../skip.css"> 
+<style type="text/css">
+<!--
+h2{color:red;}
+-->
+</style>
+>>>>>>> other
+
 </head>
 <body>
+
+<div class="fix">
+<div class="menu">
+<table style="border-collapse: collapse; margin-left:
+ auto; margin-right: auto;">
+ <tr><td><a href="../syuzai.html"></a></td>
+<td><a href="../rupo/rupo.html">⤰⤰</a></td>
+<td><a href="../ijyuu.html">ܽ</a></td>
+<td><a href="../higawari/higawari.html">ؤ</a></td>
+<td><a href="../tokusan/tokusan.html">ûʪ</a></td>
+<td><a href="../dezima/dezima.html"></a></td></tr>
+</table>
+</div>
+</div>
+
+
+<br><br><br>
+
+
 <h2>
 ʪޤȤʲ
 </h2>
@@ -16,16 +47,28 @@
 
 <h3>ܴѴۤθ
 </h3>
-<p><img src="honma2.jpg"></p>
+<p><a href="shosai/homma.html"><img src="honma2.jpg" width="150" height="100"></a></p>
 
 
 <h3>ǰۤθ
 </h3>
-<p><img src="domon_a.jpg"></p>
+<p><a href="shosai/domon.html"><img src="domon_a.jpg" width="150" height="100"></a></p>
 <!--
 ȤǤ⤦ޥʼ̿ɲá`ء)
 
 -->
 
+<<<<<<< local
+=======
+<h3>ᲬĻ
+</h3>
+<p><img src="haku2.jpg" width="150" height="100"></p>
+
+>>>>>>> other
+
+
+<a href="../syuzai.html"></a>
+<br>
+<a href="../../index.html">home</a>
 </body>
 </html>
Binary file syuzai/zoo/kamo.jpg has changed
Binary file syuzai/zoo/kamo2.jpg has changed
--- a/syuzai/zoo/kuma.html	Tue Dec 01 17:49:42 2015 +0900
+++ b/syuzai/zoo/kuma.html	Tue Dec 01 18:17:32 2015 +0900
@@ -1,6 +1,16 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 5 Transitional//EN">
 <html>
 <head>
 <title></title>
+<!--
+<meta http-equiv="content-type" content="text/html; charset=euc-jp">
+-->
+
+
+
+<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+
+
 <style type="text/css">
 
 <!--
@@ -12,7 +22,7 @@
 <body>
 <h1>朝日村</h1>
 <p>くまさん家</p>
-<p><a href="DSC02735.JPG"></p>
+<p><img src="dsc02735.jpg" width="450" height="300"></p>
 
 
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/syuzai/zoo/map.html	Tue Dec 01 18:17:32 2015 +0900
@@ -0,0 +1,26 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 5 Transitional//EN">
+<html>
+<head>
+<title>
+map（仮）
+</title>
+
+<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+<!--
+<meta http-equiv="content-type" content="text/html; charset=euc-jp">
+-->
+
+<style type="text/css"></style>
+
+</head>
+<body>
+
+<p><img src="map_shonai.png"></p>
+
+
+
+
+
+
+</body>
+</html>
Binary file syuzai/zoo/map_shonai.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/syuzai/zoo/shosai/domon.html	Tue Dec 01 18:17:32 2015 +0900
@@ -0,0 +1,23 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 5 Transitional//EN">
+<html>
+<head>
+<title>
+ǰۤθ
+</title>
+
+<meta charset="euc-jp">
+</head>
+<body>
+<h1>ǰۤθ</h1>
+<p><img src="../domon_a.jpg"></p>
+<p>ä˲ǤǤʤɡäѤǤ<br>
+ˬݤϤɤѥäƹԤäƤƤ</p>
+<iframe src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d3105.429433751393!2d139.82152155041635!3d38.89129405480964!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x5f8e9fd57020c16f%3A0x7f97f98442f6cde3!2z5Zyf6ZaA5ouz6KiY5b-16aSo!5e0!3m2!1sja!2sjp!4v1448873646925" width="600" height="450" frameborder="0" style="border:0" allowfullscreen></iframe>
+
+
+
+<br>
+<a href="../index.html">back</a>
+
+</body>
+</html>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/syuzai/zoo/shosai/homma.html	Tue Dec 01 18:17:32 2015 +0900
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 5 Transitional//EN">
+<html>
+<head>
+<title>
+ܴѴۤθ
+</title>
+
+<meta charset="euc-jp">
+
+ <link rel="stylesheet" href="" type="text/css">
+
+</head>
+<body>
+<h1>ܴѴۤθ</h1>
+
+
+<br>
+<p><img src="../honma2.jpg"></p>
+
+<p>ͥʶӸ񤵤󤿤Ǥ</p>
+
+<iframe src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d1552.0141252260787!2d139.8414904378225!3d38.92333178114775!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x0000000000000000%3A0xa561b3a31fdcfa8b!2z5pys6ZaT576O6KGT6aSo!5e0!3m2!1sja!2sjp!4v1448871468529" width="600" height="450" frameborder="0" style="border:0" allowfullscreen></iframe>
+
+
+<br>
+<a href="../index.html">back</a>
+</body>
+</html>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/syuzai/zoo/tsuruoka.html	Tue Dec 01 18:17:32 2015 +0900
@@ -0,0 +1,69 @@
+<<<<<<< local
+<<<<<<< local
+=======
+=======
+>>>>>>> other
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 5 Transitional//EN">
+<<<<<<< local
+>>>>>>> other
+=======
+>>>>>>> other
+<html>
+<head>
+<<<<<<< local
+<<<<<<< local
+<title>Წ</title>
+<link rel="stylesheet" type="text/css" href="./skip.css">
+<style type="text.css">
+=======
+=======
+>>>>>>> other
+<title>
+</title>
+<meta http-equiv="content-type" content="text/html; charset=euc-jp">
+
+</head>
+<body>
+
+<image src="haku1.jpg" width="450" height="300">
+
+
+
+
+
+<<<<<<< local
+>>>>>>> other
+=======
+>>>>>>> other
+
+<!--
+<<<<<<< local
+<<<<<<< local
+
+=======
+=======
+>>>>>>> other
+鶴岡市の生き物
+<<<<<<< local
+>>>>>>> other
+=======
+>>>>>>> other
+-->
+<<<<<<< local
+<<<<<<< local
+
+</style>
+
+</head>
+
+<body>
+<h1>Წʪã</h1>
+<tr>
+<th><img src="DSC02727.JPG" width="300" height="200"></a></th>
+</tr>
+=======
+>>>>>>> other
+=======
+>>>>>>> other
+</body>
+</html>

yatex.org