From 86bb2bd93b9b96a0075d70e09243c825c63e033a Mon Sep 17 00:00:00 2001
From: haneul <syhan@cs.washington.edu>
Date: Sat, 15 Dec 2007 11:55:01 +0000
Subject: [PATCH] Change lifepod module to retrieve colors from lifepod feed

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3362 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/lifepod/lifepod.model.php           | 1 +
 modules/lifepod/skins/xe_official/list.html | 6 +-----
 modules/lifepod/skins/xe_official/skin.xml  | 8 --------
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/modules/lifepod/lifepod.model.php b/modules/lifepod/lifepod.model.php
index 5f8c82d37..05f169192 100644
--- a/modules/lifepod/lifepod.model.php
+++ b/modules/lifepod/lifepod.model.php
@@ -76,6 +76,7 @@
 		$page->data = array();
 		$page->data[] = $data;
 	    }
+	    $page->color = $xmldoc->childNodes["feed"]->childNodes["color"]->body;
 
             return $page;
         }
diff --git a/modules/lifepod/skins/xe_official/list.html b/modules/lifepod/skins/xe_official/list.html
index 63f0c663e..28501c9e8 100644
--- a/modules/lifepod/skins/xe_official/list.html
+++ b/modules/lifepod/skins/xe_official/list.html
@@ -2,15 +2,11 @@
 <script type="text/javascript" src="http://www.lifepod.co.kr/api/calendar.js<!--@if($module_info->korean_anniversary!="notuse")-->?calendar=1<!--@end-->"></script>
     <!--%import("js/lifepod.js")-->
 <script type="text/javascript" src="./modules/lifepod/skins/xe_official/js/xe_interface.js"></script>
-    <!--{count($page->data)}-->
-    <!--@if(!$module_info->calendar_color)-->
-    <!--{$module_info->calendar_color = "green"}-->
-    <!--@end-->
 <script type="text/javascript">//<![CDATA[
 xAddEventListener(window, 'load', startLifepod);
 <!--@foreach($calendars as $key => $page)-->
     <!--@foreach($page->data as $key => $val)-->
-    calAdd({$val->childNodes["identifier"]->body},'{$val->childNodes["date-start"]->body}', '{$val->childNodes["date-end"]->body}', '{$val->childNodes["title"]->body}', '{$val->childNodes["description"]->body}', '{$val->childNodes["type"]->body}', '{$page->title}', '{$module_info->calendar_color}'); 
+    calAdd({$val->childNodes["identifier"]->body},'{$val->childNodes["date-start"]->body}', '{$val->childNodes["date-end"]->body}', '{$val->childNodes["title"]->body}', '{$val->childNodes["description"]->body}', '{$val->childNodes["type"]->body}', '{$page->title}', '{$page->color}'); 
     <!--@end-->
 <!--@end-->
 <!--@if($day)-->
diff --git a/modules/lifepod/skins/xe_official/skin.xml b/modules/lifepod/skins/xe_official/skin.xml
index 66cc9f948..0c906d89d 100644
--- a/modules/lifepod/skins/xe_official/skin.xml
+++ b/modules/lifepod/skins/xe_official/skin.xml
@@ -37,13 +37,5 @@
             <default>use</default>
             <default>notuse</default>
         </var>
-	<var name="calendar_color" type="text">
-	    <title xml:lang="ko">이벤트 표시 색깔</title>
-	    <title xml:lang="en">Display color for events</title>
-	    <title xml:lang="jp">イベントの表示色</title>
-	    <description xml:lang="ko">달력에 이벤트를 표시할 색을 정합니다. css에 들어가는 색이름이나 color code를 쓸 수 있습니다. (예: blue, #575757, 기본: green)</description>
-	    <description xml:lang="en">Set color for events. You may use color name or code for CSS style. (e.g., blue, #575757, Default : green)</description>
-	    <description xml:lang="jp">カレンダー中のイベントとして表示する色を決めます。cssのための色名、又はカラーコードの記入が可能です。 (例: blue, #575757, デフォルト: green)</description>
-	</var>
     </extra_vars>
 </skin>