Mercurial > hgrepos > hgweb.cgi > skipweb

changeset 287:e19d92fcb2e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author KAMADA Kei <c110206@f.koeki-u.ac.jp>
date Fri, 23 Aug 2013 16:49:57 +0900
parents 555eca02ecb3 (current diff) c9099fdde3f2 (diff)
children 6834c2c2e3d2
files anquate.html enq.html index.html
diffstat 4 files changed, 96 insertions(+), 62 deletions(-) [+]
line wrap: on
line diff
--- a/anquate.html	Fri Aug 23 16:07:07 2013 +0900
+++ b/anquate.html	Fri Aug 23 16:49:57 2013 +0900
@@ -1,42 +0,0 @@
-<html lang="ja">
-
-<head>
-<title>SKIP - Shonai Koeki Information Project</title>
-<link rel="stylesheet" type="text/css" href="skip.css">
-</head>
-
-<body>
-
-<div class="side_photo_right">
-<p><a href="url">
-<img src="1dezima150.JPG" alt="photo" width="" style="align: right;">
-</a></p>
-<p><a href="url">
-<img src="2dezima150.JPG" alt="photo" width="" style="align: right;">
-</a></p>
-<p><a href="url">
-<img src="3dezima150.JPG" alt="photo" width="" style="align: right;">
-</a></p>
-</div>
-
-
-
-<div class="fix">
-
-<div class="main_title">
-<img src="photo" alt="title logo">
-</div>
-
-<div class="menu">
-<table style="border-collapse: collapse; margin-left:
- auto; margin-right: auto;">
- <tr><td><a href=".">top</a></td><td><a href="."><img src="" alt="title
- logo"></a></td><td><a href="."><img src="blog32.png" alt="title
- logo"></a></td><td><a href=".">プログラム</a></td><td><a href="http://skip.koeki-prj.org/anquate.html">アンケート</a></td></tr>
-</table>
-</div>
-
-
-</div>
-</body>
-</html>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/enq.html	Fri Aug 23 16:49:57 2013 +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="side_photo_right">
+<p><a href="url">
+<img src="1dezima150.JPG" alt="photo" width="" style="align: right;">
+</a></p>
+<p><a href="url">
+<img src="2dezima150.JPG" alt="photo" width="" style="align: right;">
+</a></p>
+<p><a href="url">
+<img src="3dezima150.JPG" alt="photo" width="" style="align: right;">
+</a></p>
+</div>
+
+<div class="fix">
+
+<div class="main_title">
+<img src="photo" alt="title logo">
+</div>
+
+<div class="menu">
+<table style="border-collapse: collapse; margin-left:
+ auto; margin-right: auto;">
+ <tr><td><a href=".">top</a></td><td><a href="."><img src="" alt="title
+ logo"></a></td><td><a href="."><img src="blog32.png" alt="title
+ logo"></a></td><td><a href="http://skip.koeki-prj.org/program.html">プログラム</a></td><td><a href="http://skip.koeki-prj.org/enq.html">アン
+ ケート</a></td></tr>
+</table>
+</div>
+
+<p class="new"><span>新着情報</span> </p>
+<div class="staff">
+<h3>
+アンケート結果
+</h3>
+<p><a href="http://skip.koeki-prj/staff/kei/als.html">アルス美容院</a></p>
+<p><a href="http://skip.koeki-prj/staff/kei/butudan.html">仏壇の佐藤</a></p>
+<p><a href="http://skip.koeki-prj/staff/kei/horumon.html">庄内ホルモン</a></p>
+<p><a href="http://skip.koeki-prj/staff/kei/kameya.html">亀屋</a></p>
+<p><a href="http://skip.koeki-prj/staff/kei/kikuti.html">菊池菓子舗
+</a></p>
+<p><a href="http://skip.koeki-prj/staff/kei/konoki.html">小の木</a></p>
+<p><a href="http://skip.koeki-prj/staff/kei/kurihara.html">栗原甘泉堂
+</a></p>
+<p><a href="http://skip.koeki-prj/staff/kei/minato.html">港タクシー</a></p>
+<p><a href="http://skip.koeki-prj/staff/kei/minato_ya.html">港時計店
+</a></p>
+<p><a href="http://skip.koeki-prj/staff/kei/moare.html">モアレ</a></p>
+<p><a href="http://skip.koeki-prj/staff/kei/ogawaen.html">尾川園</a></p>
+<p><a href="http://skip.koeki-prj/staff/kei/pom.html">cafe+POM</a></p>
+<p><a href="http://skip.koeki-prj/staff/kei/takeuti.html">竹内菓子舗
+</a></p>
+<p><a href="http://skip.koeki-prj/staff/kei/tigusa.html">きもの千尋草</a></p>
+<p><a href="http://skip.koeki-prj/staff/kei/tomizou.html">佐々木富蔵商店</a></p>
+<p><a href="http://skip.koeki-prj/staff/kei/tukushi.html">土筆</a></p>
+</body>
+</html>
\ No newline at end of file
--- a/index.html	Fri Aug 23 16:07:07 2013 +0900
+++ b/index.html	Fri Aug 23 16:49:57 2013 +0900
@@ -32,7 +32,8 @@
  auto; margin-right: auto;">
  <tr><td><a href=".">top</a></td><td><a href="."><img src="" alt="title
  logo"></a></td><td><a href="."><img src="blog32.png" alt="title
- logo"></a></td><td><a href=".">プログラム</a></td><td><a href="http://skip.koeki-prj.org/anquate.html">アンケート</a></td></tr>
+ logo"></a></td><td><a href="http://skip.koeki-prj.org/program.html">プログラム</a></td><td><a href="http://skip.koeki-prj.org/enq.html">アン
+ ケート</a></td></tr>
 </table>
 </div>
 
@@ -46,8 +47,7 @@
  <tr>
   <td><a href="http://skip.koeki-prj.org/staff/ayae/index.html">あやえ</a></td><td><a href="http://skip.koeki-prj.org/staff/kei/index.html">kei</a></td>
   <td><a href="http://skip.koeki-prj.org/staff/masaki/index.html">村上</a></td><td><a href="http://skip.koeki-prj.org/staff/rina/index.html">rina&#9825;</a></td>
-  <td><a href="http://skip.koeki-prj.org/staff/oyamada/index.html">小山
-   田</a></td><td><a href=http://skip.koeki-prj.org/staff/chokai/index.html">chokai</a></td>
+  <td><a href="http://skip.koeki-prj.org/staff/oyamada/index.html">小山田</a></td><td><a href=http://skip.koeki-prj.org/staff/chokai/index.html">chokai</a></td>
  </tr>
 </table>
 </body>
--- a/program.html	Fri Aug 23 16:07:07 2013 +0900
+++ b/program.html	Fri Aug 23 16:49:57 2013 +0900
@@ -3,25 +3,39 @@
  <title>SKIP - Shonai Koeki Information Project</title>
  <link rel="stylesheet" type="text/css" href="skip.css">
 </head>
+
+
 <body>
-<div class="title">
-<a href="skip-demo.html"><img src="skip.png" width="439" height="281"></a>
-<img src="skip-kamo-small.png" width="295" height="236">
+
+<div class="side_photo_right">
+<p><a href="url">
+<img src="1dezima150.JPG" alt="photo" width="" style="align: right;">
+</a></p>
+<p><a href="url">
+<img src="2dezima150.JPG" alt="photo" width="" style="align: right;">
+</a></p>
+<p><a href="url">
+<img src="3dezima150.JPG" alt="photo" width="" style="align: right;">
+</a></p>
 </div>
+
+
+
+<div class="fix">
+
+<div class="main_title">
+<img src="photo" alt="title logo">
+</div>
+
 <div class="menu">
-<table>
- <tr>
-  <td><pre><a href="gaiyou.html"><img src="home128.png">
-概要</a></pre></td>
-  <td><pre><a href="program.html"><img src="program128.png">
-プログラム</a></pre></td>
-  <td><pre><a href="girl.html"><img src="kirari128.png">
-きらりびと</a></pre></td>
-  <td><pre><a href="blog.html"><img src="blog128.png">
-ブログ</a></pre></td>
- </tr>
+<table style="border-collapse: collapse; margin-left:
+ auto; margin-right: auto;">
+ <tr><td><a href=".">top</a></td><td><a href="."><img src="" alt="title logo"></a></td><td><a href="."><img src="blog32.png" alt="title logo"></a></td><td><a href="http://skip.koeki-prj.org/program.html">プログラム</a></td></tr>
 </table>
 </div>
+
+
+<body>
 <p>復刻したプログラムと授業で作成したプログラムの一覧です。</p>
 <h1>復刻版</h1>
 <div class="link">
@@ -39,8 +53,6 @@
  <p><a href="http://roy.e.koeki-u.ac.jp/~c110097/cgi-bin/top.html">Cチーム</a></p>
 </div>
 </div>
-<div class="footer">
-東北公益文化大学 SKIP
-</div>
+
 </body>
 </html>
\ No newline at end of file

yatex.org