From 779f84e82e77609d2c93e15356cd5ed280642305 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Fri, 6 Apr 2007 06:42:14 +0000
Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@1006
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 .../poll_maker/poll_maker.class.php           |  3 ++-
 modules/poll/poll.model.php                   |  3 ++-
 modules/poll/tpl/css/poll.css                 | 25 ++++++++++++-------
 modules/poll/tpl/form.html                    | 23 ++++++++---------
 4 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/modules/editor/components/poll_maker/poll_maker.class.php b/modules/editor/components/poll_maker/poll_maker.class.php
index 103ebbb2a..fe36a631a 100644
--- a/modules/editor/components/poll_maker/poll_maker.class.php
+++ b/modules/editor/components/poll_maker/poll_maker.class.php
@@ -40,10 +40,11 @@
          **/
         function transHTML($xml_obj) {
             $poll_srl = $xml_obj->attrs->poll_srl;
+            $style = preg_replace("/height([^;]*)/i", "", $xml_obj->attrs->style);
 
             // poll model 객체 생성해서 html 얻어와서 return
             $oPollModel = &getModel('poll');
-            return $oPollModel->getPollHtml($poll_srl);
+            return $oPollModel->getPollHtml($poll_srl, $style);
         }
     }
 ?>
diff --git a/modules/poll/poll.model.php b/modules/poll/poll.model.php
index dfb8ea24d..fc2449b82 100644
--- a/modules/poll/poll.model.php
+++ b/modules/poll/poll.model.php
@@ -17,7 +17,7 @@
          * @brief 설문조사의 html데이터를 return
          * 설문조사에 응하였는지에 대한 체크를 한 후 결과를 return
          **/
-        function getPollHtml($poll_srl) {
+        function getPollHtml($poll_srl, $style = '') {
 
             $args->poll_srl = $poll_srl;
 
@@ -25,6 +25,7 @@
             $output = executeQuery('poll.getPoll', $args);
             if(!$output->data) return '';
 
+            $poll->style = $style;
             $poll->poll_count = (int)$output->data->poll_count;
             $poll->stop_date = $output->data->stop_date;
 
diff --git a/modules/poll/tpl/css/poll.css b/modules/poll/tpl/css/poll.css
index 57686aefc..10af0175b 100644
--- a/modules/poll/tpl/css/poll.css
+++ b/modules/poll/tpl/css/poll.css
@@ -1,16 +1,18 @@
 .poll_box {
-    border:1px solid #EFEFEF;
+    border:3px solid #555555;
+    background-color:#EEEEEE;
     margin:5px;
-    padding:5px;
+    padding:8px 5px 8px 5px;
 }
 
 .poll_title_box {
-    border:2px solid #EFEFEF;
+    border:2px solid #444444;
+    background-color:#888888;
+    color:#FFFFFF;
+    font-weight:bold;
     margin:5px;
     padding:5px;
     height:13px;
-    font-weight:bold;
-    color:#AAAAAA;
     clear:both;
 }
 
@@ -23,22 +25,27 @@
 }
 
 .poll_detail_box {
-    border:1px solid #AAAAAA;
+    border:1px solid #444444;
+    background-color:#FFFFFF;
     margin:5px;
 }
 
 .poll_detail_box .title {
-    background-color:#EEEEEE;
+    background-color:#555555;
+    color:#FFFFFF;
     padding:5px;
     font-weight:bold;
 }
 
 .poll_detail_box .item {
     padding:5px;
+    border-bottom:1px solid #EEEEEE;
 }
 
 .poll_detail_box .checkcount {
-    color:#555555;
+    background-color:#AAAAAA;
+    text-align:right;
+    color:#EEEEEE;
     padding:5px;
 }
 
@@ -50,5 +57,5 @@
     border:1px solid #555555;
     background-color:#FFFFFF;
     font-weight:bold;
-    height:17px;
+    height:20px;
 }
diff --git a/modules/poll/tpl/form.html b/modules/poll/tpl/form.html
index bcd01883d..c8b4c750c 100644
--- a/modules/poll/tpl/form.html
+++ b/modules/poll/tpl/form.html
@@ -1,7 +1,7 @@
 <!--%import("filter/poll.xml")-->
 <!--%import("css/poll.css")-->
 
-<div class="poll_box">
+<div class="poll_box" style="{$poll->style}">
 
     <div class="poll_title_box">
         <div class="poll_total_count">
@@ -18,21 +18,22 @@
         <div class="title">{$poll_srl_index}. {$val->title} ({$val->poll_count})</div>
         <!--@foreach($val->item as $item_srl => $item)-->
         {@$_idx = $poll->poll_srl.'_'.$poll_srl_index.'_'.$item_srl}
-        <!--@if($val->checkcount>1)-->
-            {@$_type = "checkbox"}
-        <!--@else-->
-            {@$_type = "radio"}
-        <!--@end-->
-
 
         <div class="item">
-            <input type="{$_type}" id="poll_item_{$_idx}" /> <label for="poll_item_{$_idx}">{$item->title} ({$item->poll_count})</label>
+            <!--@if($val->checkcount>1)-->
+                <input type="checkbox" name="item_{$poll->poll_srl}_{$poll_srl_index}" value="{$item_srl}" id="poll_item_{$_idx}" /> 
+            <!--@else-->
+                <input type="radio" name="item_{$poll->poll_srl}_{$poll_srl_index}" value="{$item_srl}" id="poll_item_{$_idx}" /> 
+            <!--@end-->
+                <label for="poll_item_{$_idx}">{$item->title} ({$item->poll_count})</label>
         </div>
         <!--@end-->
 
+        <!--@if($val->checkcount>1)-->
         <div class="checkcount">
             {$lang->poll_check_count} : {$val->checkcount}
         </div>
+        <!--@end-->
     </div>
 
     <!--@end-->
@@ -40,9 +41,5 @@
     <div class="poll_button_area">
         <input type="submit" value="{$lang->cmd_apply_poll}" class="poll_button" />
     </div>
+
 </div>
-
-<pre>
-{@print_r($poll)}
-</pre>
-