From 1eee62a0083c28d4ccebc029802419013ac19504 Mon Sep 17 00:00:00 2001
From: konekoneko <jbh03215@hotmail.co.jp>
Date: Wed, 28 Nov 2012 04:31:04 +0900
Subject: [PATCH] =?utf8?q?=E8=A8=AD=E5=AE=9A=E6=96=B9=E6=B3=95=E3=82=92?=
 =?utf8?q?=E5=A4=89=E6=9B=B4=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 configure.js                | 75 ++++++++++++++++++++++++++-------------------
 profile.js                  |  6 ++--
 public/profile/detail.ejs   |  4 +--
 public/profile/edit.ejs     |  6 ++--
 public/profile/registor.ejs |  6 ++--
 5 files changed, 54 insertions(+), 43 deletions(-)

diff --git a/configure.js b/configure.js
index 0b716bb..e845564 100644
--- a/configure.js
+++ b/configure.js
@@ -22,39 +22,50 @@
 
 	//詳細画面に表示するフィールド名と表示名の組み合わせ
 	//詳細画面で表示される順番はこの変数によって決まります
-	//連想配列の名称と数はinputtype、visiblefield、init.sqlと一致させること
+	//連想配列の名称と数はinit.sqlと一致させること
 	alias : {
-		mailto : "メールアドレス",
-		age : "å¹´é½¢",
-		height : "身長",
-		weight : "体重",
-		gender : "性別",
-		race : "種族",
-		etc : "備考",
+		mailto :
+			{
+				name : "メールアドレス",
+				type : "text",
+				visible : false,
+			},
+		age :
+			{
+				name : "å¹´é½¢",
+				type : "text",
+				visible : true,
+			},
+		height :
+			{
+				name : "身長",
+				type : "text",
+				visible : true,
+			},
+		weight :
+			{
+				name : "体重",
+				type : "text",
+				visible : true,
+			},
+		gender :
+			{
+				name : "性別",
+				type : "text",
+				visible : true,
+			},
+		race :
+			{
+				name : "種族",
+				type : "text",
+				visible : true,
+			},
+		etc :
+			{
+				name : "備考",
+				type : "textarea",
+				visible : true,
+			},
 	},
-
-	//フィールドタイプ
-	//text：一行入力
-	//textarea：複数行入力を表す
-	inputtype : {
-		age : "text",
-		height : "text",
-		weight : "text",
-		gender : "text",
-		race : "text",
-		mailto : "text",
-		etc : "textarea",
-	},
-
-	//詳細画面に表示するなら真。そうでないなら偽
-	visiblefield : {
-		age : true,
-		height : true,
-		weight : true,
-		gender : true,
-		race : true,
-		mailto : false,
-		etc : true,
-	}
 };
 
diff --git a/profile.js b/profile.js
index 19a4ade..207bf57 100644
--- a/profile.js
+++ b/profile.js
@@ -128,7 +128,7 @@ function detail_proc(req, res)
 			RenderMessage(res,resource.notfound_name,req.session.items);
 		else{
 			res.setHeader("X-FRAME-OPTIONS","DENY");
-			res.render("profile/detail",{list:result,alias:config.alias,visiblefield:config.visiblefield,token:req.session._csrf,admin:req.session.items.admin});
+			res.render("profile/detail",{list:result,alias:config.alias,token:req.session._csrf,admin:req.session.items.admin});
 		}
 	});
 }
@@ -176,7 +176,7 @@ function detail_postproc(req, res)
 				RenderMessage(res,err,req.session.items);
 			}else if(result != null){
 				res.setHeader("X-FRAME-OPTIONS","DENY");
-				res.render("profile/edit",{list:result,token:req.session._csrf,alias:config.alias,inputtype:config.inputtype});
+				res.render("profile/edit",{list:result,token:req.session._csrf,alias:config.alias});
 			}else{
 				RenderMessage(res,resource.unmatch_password,req.session.items);
 			}
@@ -235,7 +235,7 @@ function registor_proc(req, res)
 		req.session.items = new security.SessionInfomation(false);
 
 	res.setHeader("X-FRAME-OPTIONS","DENY");
-	res.render("profile/registor",{token:req.session._csrf,alias:config.alias,inputtype:config.inputtype});
+	res.render("profile/registor",{token:req.session._csrf,alias:config.alias});
 }
 
 function RenderMessage(res,msg,info)
diff --git a/public/profile/detail.ejs b/public/profile/detail.ejs
index 130da58..2ad061d 100644
--- a/public/profile/detail.ejs
+++ b/public/profile/detail.ejs
@@ -18,8 +18,8 @@ $(function(){
 <div id="content">
 	<h2><%= list[0].name %></h2>
 	<% for(var key in alias) {%>
-		<% if(typeof alias[key] != "undefined" && visiblefield[key]) {%>
-			<h3><%= alias[key] %></h3>
+		<% if(typeof alias[key] != "undefined" && alias[key].visible) {%>
+			<h3><%= alias[key].name %></h3>
 			<p id="item"><%- list[0][key] %></p>
 		<% } %>
 	<% } %>
diff --git a/public/profile/edit.ejs b/public/profile/edit.ejs
index f4ef394..702612f 100644
--- a/public/profile/edit.ejs
+++ b/public/profile/edit.ejs
@@ -23,11 +23,11 @@
 			</tr>
 		<% for(var key in alias) {%>
 			<tr>
-				<td><%= alias[key] %></td>
+				<td><%= alias[key].name %></td>
 				<td>
-				<% if(inputtype[key] == "text"){ %>
+				<% if(alias[key].type == "text"){ %>
 					<input type="text" value="<%= list[0][key] %>" name="<%= key %>"/>
-				<% }else if(inputtype[key] == "textarea"){ %>
+				<% }else if(alias[key].type == "textarea"){ %>
 					<textarea name="<%= key %>" rows="4" cols="50"><%= list[0][key] %></textarea>
 				<% } %>
 				</td>
diff --git a/public/profile/registor.ejs b/public/profile/registor.ejs
index 2f447b2..d4b39fc 100644
--- a/public/profile/registor.ejs
+++ b/public/profile/registor.ejs
@@ -20,11 +20,11 @@
 			</tr>
 		<% for(var key in alias) {%>
 			<tr>
-				<td><%= alias[key] %></td>
+				<td><%= alias[key].name %></td>
 				<td>
-				<% if(inputtype[key] == "text"){ %>
+				<% if(alias[key].type == "text"){ %>
 					<input type="text" value="" name="<%= key %>"/>
-				<% }else if(inputtype[key] == "textarea"){ %>
+				<% }else if(alias[key].type == "textarea"){ %>
 					<textarea name="<%= key %>" rows="4" cols="50"></textarea>
 				<% } %>
 				</td>
-- 
2.11.0