[xc-tokai-svnlog] SF.net SVN: xc-tokai:[370] modules_bizpoll/trunk/xoops_trust_path/modules/ bizpoll

[<ki...@us...>]

Revision: 370
          http://xc-tokai.svn.sourceforge.net/xc-tokai/?rev=370&view=rev
Author:   kilica
Date:     2008-12-13 06:25:44 +0000 (Sat, 13 Dec 2008)

Log Message:
-----------
[0.12] adjust templates/bizpoll_poll_detail.html

Modified Paths:
--------------
    modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/actions/PollDetailAction.class.php
    modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/language/ja_utf8/main.php
    modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/language/japanese/main.php
    modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/templates/bizpoll_poll_detail.html

Modified: modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/actions/PollDetailAction.class.php
===================================================================
--- modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/actions/PollDetailAction.class.php	2008-12-13 03:54:32 UTC (rev 369)
+++ modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/actions/PollDetailAction.class.php	2008-12-13 06:25:44 UTC (rev 370)
@@ -19,6 +19,7 @@
 class Bizpoll_PollDetailAction extends Bizpoll_AbstractListAction
 {
 	var $mEnq = null;
+	var $mEnqId = 0;
 	var $mChart = array();
 
     /**
@@ -29,7 +30,7 @@
     protected function _getId()
     {
     	if($this->mRoot->mContext->mRequest->getRequest('enq_id')){
-	        return $this->mRoot->mContext->mRequest->getRequest('enq_id');
+	        return intval($this->mRoot->mContext->mRequest->getRequest('enq_id'));
 	    }
 	    else{
 			$this->mRoot->mController->executeRedirect('./index.php?action=EnqList', 1, _MD_BIZPOLL_ERROR_ENQ_ID_REQUIRED);
@@ -98,7 +99,7 @@
 		//getDefaultView
 		$this->mFilter =& $this->_getFilterForm();
 		$this->mFilter->fetch();
-		$this->mEnqId = intval($this->mRoot->mContext->mRequest->getRequest('enq_id'));
+		$this->mEnqId = $this->_getId();
 	
 		$handler =& $this->_getHandler();
 		$criteria=$this->mFilter->getCriteria();
@@ -119,7 +120,7 @@
 			$choiceArr = explode(',', $this->mObjects[$key]->get('choice_id'));
 			foreach(array_keys($choiceArr) as $keyC){
 				$this->mChart['count'][$choiceArr[$keyC]]++;
-				$this->mChart['title'][$choiceArr[$keyC]] = '('. $this->mChart['count'][$choiceArr[$keyC]] .') '. $this->mObjects[$key]->mChoice[$keyC]->getShow('title');
+				$this->mChart['title'][$choiceArr[$keyC]] = $this->mObjects[$key]->mChoice[$keyC]->getShow('title');
 			}
 		}
 		$this->mChart['total'] = count($this->mChart['title']);

Modified: modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/language/ja_utf8/main.php
===================================================================
--- modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/language/ja_utf8/main.php	2008-12-13 03:54:32 UTC (rev 369)
+++ modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/language/ja_utf8/main.php	2008-12-13 06:25:44 UTC (rev 370)
@@ -45,6 +45,7 @@
 define('_MD_BIZPOLL_ERROR_CONTENT_IS_NOT_FOUND', "CONTENT_IS_NOT_FOUND");
 define('_MD_BIZPOLL_LANG_ADD_A_NEW_POLL', "投票する");
 define('_MD_BIZPOLL_LANG_POLL', "投票");
+define('_MD_BIZPOLL_LANG_VOTE', "票");
 define('_MD_BIZPOLL_LANG_POLL_ID', "POLL_ID");
 define('_MD_BIZPOLL_LANG_NAME', "ゲスト名");
 define('_MD_BIZPOLL_LANG_CHOICE', "選択肢");
@@ -68,5 +69,6 @@
 define('_MD_BIZPOLL_LANG_DISPLAY_END_DATETIME', "終了日時を設定する");
 define('_MD_BIZPOLL_LANG_REMOVE_END_DATETIME', "終了日時の設定をやめる");
 define('_MD_BIZPOLL_LANG_WEIGHT', "並び順");
+define('_MD_BIZPOLL_LANG_RETURN_POLL', "投票画面に戻る");
 
 ?>

Modified: modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/language/japanese/main.php
===================================================================
--- modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/language/japanese/main.php	2008-12-13 03:54:32 UTC (rev 369)
+++ modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/language/japanese/main.php	2008-12-13 06:25:44 UTC (rev 370)
@@ -45,6 +45,7 @@
 define('_MD_BIZPOLL_ERROR_CONTENT_IS_NOT_FOUND', "CONTENT_IS_NOT_FOUND");
 define('_MD_BIZPOLL_LANG_ADD_A_NEW_POLL', "\xC5\xEAɼ\xA4\xB9\xA4\xEB");
 define('_MD_BIZPOLL_LANG_POLL', "\xC5\xEAɼ");
+define('_MD_BIZPOLL_LANG_VOTE', "ɼ");
 define('_MD_BIZPOLL_LANG_POLL_ID', "POLL_ID");
 define('_MD_BIZPOLL_LANG_NAME', "\xA5\xB2\xA5\xB9\xA5\xC8̾");
 define('_MD_BIZPOLL_LANG_CHOICE', "\xC1\xAA\xC2\xF2\xBB\xE8");
@@ -68,5 +69,6 @@
 define('_MD_BIZPOLL_LANG_DISPLAY_END_DATETIME', "\xBD\xAAλ\xC6\xFC\xBB\xFE\xA4\xF2\xC0\xDF\xC4ꤹ\xA4\xEB");
 define('_MD_BIZPOLL_LANG_REMOVE_END_DATETIME', "\xBD\xAAλ\xC6\xFC\xBB\xFE\xA4\xCE\xC0\xDF\xC4\xEA\xA4\xF2\xA4\xE4\xA4\xE1\xA4\xEB");
 define('_MD_BIZPOLL_LANG_WEIGHT', "\xCA¤ӽ\xE7");
+define('_MD_BIZPOLL_LANG_RETURN_POLL', "\xC5\xEAɼ\xB2\xE8\xCC̤\xCB\xCC\xE1\xA4\xEB");
 
 ?>

Modified: modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/templates/bizpoll_poll_detail.html
===================================================================
--- modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/templates/bizpoll_poll_detail.html	2008-12-13 03:54:32 UTC (rev 369)
+++ modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/templates/bizpoll_poll_detail.html	2008-12-13 06:25:44 UTC (rev 370)
@@ -1,8 +1,9 @@
 <div class="bizpoll">
+<a href="./index.php?action=EnqView&amp;enq_id=<{$enq->getShow('enq_id')}>"><{$smarty.const._MD_BIZPOLL_LANG_RETURN_POLL}></a>
 <h1><{$enq->getShow('title')}></h1>
 
 <{foreach item=pCount from=$chart.count key=pKey}>
-	<div style="float:left;width:<{$pCount*10}>px;height:10px;background-color:#000000;margin:5px;"></div>"<{$chart.title[$pKey]}><br style="clear:left;" />
+	<div style="float:left;width:<{$pCount*10}>px;height:10px;background-color:#000000;margin:10px 30px 10px 5px;"></div><{$chart.title[$pKey]}> (<{$smarty.const._MD_BIZPOLL_LANG_POLL_COUNT}>: <{$pCount}>)<br style="clear:left;" />
 <{/foreach}>
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.