Mercurial > hgrepos > hgweb.cgi > skipweb

changeset 673:9b51ab10dbac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
marged
author MURAKAMI Masaki <c112124@h.koeki-u.ac.jp>
date Fri, 27 Feb 2015 13:23:53 +0900
parents 949adaae9f1b
children 429212bce479
files index.html index.html.orig minato2014/.htaccess minato2014/account.html minato2014/accountcheck.rb minato2014/howto.html
diffstat 6 files changed, 150 insertions(+), 34 deletions(-) [+]
line wrap: on
line diff
--- a/index.html	Fri Feb 27 13:18:39 2015 +0900
+++ b/index.html	Fri Feb 27 13:23:53 2015 +0900
@@ -114,8 +114,44 @@
 <p class="line"><a harf="">SKIPのサイトをリニューアル</a></p>
 </div>				<!-- news end -->
 
+<<<<<<< local
+<div class="main_title">
+<img src="skip-kamo-small.png" alt="kamon">
+</div>
+
+
+
+
+<p class="new"><span>新着情報</span> <a href="staff/want.html">高校生メンバー募集!!</a></p>
+
+<h1 class="want"><a href="staff/want.html">>> 高校生SKIPメンバー募集!! <<</a></h1>
+
+<h3>SKIPとは…</h3>
+<p>SKIPは、東北公益文科大学の情報特別選抜から設立されたサークルであり、
+酒田商工会議所が主催する「<a href="https://ja-jp.facebook.com/SWAN.PROJECT">SWAN　Project</a>」と協力して酒田地域の情報を発信することを目的としている。</p>
+
+
+<div class="staff">
+<h3>
+☆STAFF☆
+</h3>
+<table style="border-collapse: collapse; margin-left:
+ auto; margin-right: auto;">
+ <tr>
+  <td><a href="staff/ayae/index.html"><img src="staff/ayae-80.jpg" alt="あやえ"></a></td>
+  <td><a href="staff/kei/index.html"><img src="staff/kei1-80.jpg" alt="kei"></a></td>
+ <td><a href="staff/masaki/index.html"><img src="staff/murakami-80.jpg" alt="村上"></a></td>
+<td><a href="staff/rina/index.html"><img src="staff/rina-80.jpg" alt="rina&#9825;"></a></td>
+<td><a href="staff/oyamada/index.html"><img src="staff/oyamada-80.jpg" alt="小山田"></a></td>
+<td><a href="staff/chokai/index.html"><img src="staff/chokai-80.jpg" alt="chokai"></a></td>
+
+
+</tr>
+</table>
+=======
 <!-- coming soon...
 <div class="sttaf">
+>>>>>>> other
 
 </div>
 -->
--- a/index.html.orig	Fri Feb 27 13:18:39 2015 +0900
+++ b/index.html.orig	Fri Feb 27 13:23:53 2015 +0900
@@ -6,9 +6,6 @@
 </head>
 
 <body>
-<<<<<<< local
-=======
-
 <div class="side_photo_right">
 <p><a href="syuzai/dezima.html">
 <img src="syuzai/dezima4-150.JPG" alt="dezima" width="" style="align: right;">
@@ -36,7 +33,6 @@
 </a></p>
 </div>
 
->>>>>>> other
 <div class="fix">
 <div class="menu">
 <table style="border-collapse: collapse; margin-left:
@@ -48,34 +44,6 @@
 </div>
 </div>
 
-<div class="base_sheet">
-<div class="side_photo_right">
-<p><a href="syuzai/dezima.html">
-<img src="syuzai/dezima4-150.JPG" alt="dezima" width="" style="align: right;">
-</a></p>
-<p><a href="syuzai/nisimura.html">
-<img src="syuzai/nisimura1-150.JPG" alt="nisimura" width="" style="align: right;">
-</a></p>
-<p><a href="enq/ogawaen.html">
-<img src="syuzai/ogawaen1-150.jpg" alt="photo" width="" style="align: right;">
-</a></p>
-<p><a href="enq/pom.html">
-<img src="syuzai/pom3-150.jpg" alt="photo" width="" style="align: right;">
-</a></p>
-<p><a href="index.html">
-<img src="syuzai/romantei2-150.jpg" alt="photo" width="" style="align: right;">
-</a></p>
-<p><a href="url">
-<img src="syuzai/rupo1-150.jpg" alt="photo" width="" style="align: right;">
-</a></p>
-<p><a href="syuzai/tukusi.html">
-<img src="syuzai/tukusi1-150.JPG" alt="photo" width="" style="align: right;">
-</a></p>
-<p><a href="enq/als.html">
-<img src="syuzai/ars1-150.jpg" alt="photo" width="" style="align: right;">
-</a></p>
-</div>
-
 <div class="main_title">
 <img src="skip-kamo-small.png" alt="kamon">
 </div>
@@ -83,7 +51,9 @@
 
 
 
-<p class="new"><span>新着情報</span> <a href="syuzai/nakamura.html">手打ちそば　なかむらを取材！！<a></p>
+<p class="new"><span>新着情報</span> <a href="staff/want.html">高校生メンバー募集!!</a></p>
+
+<h1 class="want"><a href="staff/want.html">>> 高校生SKIPメンバー募集!! <<</a></h1>
 
 <h3>SKIPとは…</h3>
 <p>SKIPは、東北公益文科大学の情報特別選抜から設立されたサークルであり、
@@ -109,6 +79,5 @@
 </table>
 
 </div>
-</div>
 </body>
 </html>
--- a/minato2014/.htaccess	Fri Feb 27 13:18:39 2015 +0900
+++ b/minato2014/.htaccess	Fri Feb 27 13:23:53 2015 +0900
@@ -1,4 +1,10 @@
+<<<<<<< local
+AddHandler cgi-script   .rb
+AddType	"text/html; charset=UTF-8" .rb
+Options +ExecCGI
+=======
 AddHandler cgi-script   .rb
 AddType	"text/html; charset=UTF-8" .rb
 AddType	"text/html; charset=UTF-8" .html
 Options +ExecCGI
+>>>>>>> other
--- a/minato2014/account.html	Fri Feb 27 13:18:39 2015 +0900
+++ b/minato2014/account.html	Fri Feb 27 13:23:53 2015 +0900
@@ -1,3 +1,48 @@
+<<<<<<< local
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+	"http://www.w3.org/TR/html4/strict.dtd">
+
+<html>
+<head>
+<title>吟ゃ括泣潟</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<link rel="stylesheet" type="text/css" href="design.css">
+</head>
+
+<body>
+<h1>帥鴻帥潟主脂蚊若</h1>
+<p>ュ</p>
+<form method="POST" action="./accountcheck.rb">
+<p>:<input name="name" type="text">(若)</p>
+<p>:<select name="sex">
+	 <option value="B">
+	 <option value="G">絅
+	 </select></p>
+<p>綛岩撮:<select name="age">
+	 <option>10篁
+	 <option>20篁
+	 <option>30篁
+	 <option>40篁
+	 <option>50篁
+	 <option>60篁ｄ札筝
+	</select></p>
+<p>肴昆:<select name="home">
+	 <option>医
+	 <option>絮怨就 
+	 <option>紊 
+	 </select></p>
+<p>吾с:<select name="job">
+	   <option value="sensi">紕
+	   <option value="madousi">薛羈篏帥
+	   <option value="yumi">綣篏帥
+	   <option value="thief">莖
+	</select></p>
+<p>(傑キ筝荐吾ст吾с)</p>
+<input type="submit" value="OK">
+</form>
+</body>
+</html>
+=======
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
 	"http://www.w3.org/TR/html4/strict.dtd">
 <html>
@@ -15,3 +60,4 @@
 
 </body>
 </html>
+>>>>>>> other
--- a/minato2014/accountcheck.rb	Fri Feb 27 13:18:39 2015 +0900
+++ b/minato2014/accountcheck.rb	Fri Feb 27 13:23:53 2015 +0900
@@ -1,3 +1,39 @@
+<<<<<<< local
+#!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
+
+#require 'sqlite3'
+require 'cgi'
+
+c = CGI.new(:tag_maker => "html5", :accept_charest => "UTF-8")
+#db = SQLite3::Database.new("sql/stump.sq3")
+
+print("Content-type: text/html; charset=UTF-8 \n\n")
+
+name = c["name"]
+job = c["job"]
+sex = c["sex"]
+
+print'
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+	"http://www.w3.org/TR/html4/strict.dtd">
+
+<html>
+<head>
+<title>Registering Account</title>
+<link rel="stylesheet" type="text/css" href="design.css">
+</head>
+'
+printf'
+<p>脂蚊絎篋障筝荐潟鴻帥潟若若ユ筝!</p>
+<p><a href="hoge.rb?%s+%s+%s"> >> Let\'s go to Stamp Rally << </a></p>
+',name,job,sex
+print'
+<p></p>
+<p><a href="account.html"> >> ≪潟脂牙脂≪祉 << </a></p>
+'
+print'</body></html>'
+=======
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
 
@@ -66,3 +102,4 @@
 
 </body></html>
 ',id.to_i-1
+>>>>>>> other
--- a/minato2014/howto.html	Fri Feb 27 13:18:39 2015 +0900
+++ b/minato2014/howto.html	Fri Feb 27 13:23:53 2015 +0900
@@ -1,3 +1,24 @@
+<<<<<<< local
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+	"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<title>sample how to play</title>
+<style type="text/css">
+<!--
+
+-->
+</style>
+<link rel="stylesheet" type="text/css" href="main.css">
+</head>
+
+<body>
+<h1>現在準備中 … <br>under constuction …</h1>
+<p></p>
+
+</body>
+</html>
+=======
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
 	"http://www.w3.org/TR/html4/strict.dtd">
 <html>
@@ -18,3 +39,4 @@
 
 </body>
 </html>
+>>>>>>> other

yatex.org