Changeset 949

Timestamp:

03/14/08 21:42:52 (9 months ago)

Author:

_ck_

Message:

0.5.4 javascript payload is now kept as small as possible,
also more "ajax-like" actions for new/edit polls,
CSS will be need to be reset in admin panel because of xhtml changes

Files:

• bbpress-polls/trunk/bb-polls.php (modified) (16 diffs)
• bbpress-polls/trunk/readme.txt (modified) (1 diff)

bbpress-polls/trunk/bb-polls.php

@@ -6 +6 @@
-Author: _ck_
-Author URI: http://bbShowcase.org
-2
+4
-
-License: CC-GNU-GPL http://creativecommons.org/licenses/GPL/2.0/
@@ -58 +58 @@
-
-        $bb_polls['style']=
-350px; line-height:120%; margin:5px 0; padding:5px; border:1px solid #ADADAD;  font-size:85
+400px; line-height:120%; margin:5px 0; padding:5px; border:1px solid #ADADAD;  font-size:90
-        #bb_polls .submit {cursor: pointer; cursor: hand; text-align:center; padding:2px 5px;}
-        #bb_polls .nowrap {white-space:nowrap;}
-        #bb_polls p {margin:15px 0;padding:0;}
-        #bb_polls .poll_question, #bb_polls .poll_footer {font-weight:bold; text-align:center; color:#2E6E15;}
-
--12px 0 -5
+ margin:1em 0 1em 1em;
+2px 0 -2
-        #bb_polls .poll_option1 {background:red;}
-        #bb_polls .poll_option2 {background:green;}
@@ -77 +77 @@
-                                        
-        $bb_polls['poll_question']=__("Would you like to add a poll to this topic for members to vote on?");
-submit a poll question with several options for othe
+add a poll question with options fo
-        $bb_polls['label_single']=__("you can vote on <u>ONE</u> choice");
-        $bb_polls['label_multiple']=__("you can vote on <u>MULTIPLE</u> choices");
@@ -297 +297 @@
-if ($bb_polls['minimum_view_level']=="read" || bb_current_user_can($bb_polls['minimum_view_level']) ) {
-$topic_id=bb_polls_check_cache($topic_id);
-p class="poll_question">'.$bb_polls['label_poll_text'].': '.$poll_options['poll_question'].'</p
+div class="poll_question">'.$bb_polls['label_poll_text'].': '.$poll_options['poll_question'].'</div
-
-if (!$poll_options['poll_multiple_choice'] && isset($poll_options['poll_count_0'])) {$real_vote_count=intval($poll_options['poll_count_0']);}
@@ -304 +304 @@
-for ($i=1; $i<=$bb_polls['max_options']; $i++) {
-        if (isset($poll_options[$i])) {                 
-p
+div
-                $test=(isset($poll_options['poll_count_'.$i]) ? intval($poll_options['poll_count_'.$i]) : 0);
-
+ <br />
-                if ($test) {
-                        $vote_percent=(round($test/$real_vote_count,2)*100);
@@ -312 +312 @@
-                        $output.= ' <div style="width:'.$vote_width.'%" class="poll_option poll_option'.$i.'"> '.$vote_percent.' % </div> ';
-                }
-p
+div
-        }
-}
@@ -318 +318 @@
-$output.= '<p class="poll_footer">'.intval($test).' '.$bb_polls['label_votes_text'].'</p>';
-if (isset($_GET['show_poll_results']) || (bb_get_current_user_info( 'id' ) && !bb_polls_has_voted(bb_get_current_user_info( 'id' ),$topic_id) )) {
- 'show_poll_results'
+array('start_new_poll','edit_poll','delete_poll','show_poll_vote_form_ajax','show_poll_setup_form_ajax','bb_polls_cache')
-}
-$output.=bb_polls_edit_link();
@@ -331 +331 @@
-$topic_id=bb_polls_check_cache($topic_id);
-if ($poll_options['poll_multiple_choice']==1) {$poll_type="checkbox";} else {$poll_type="radio";}
- 'show_poll_results'
-p class="poll_question">'.$bb_polls['label_poll_text'].': '.$poll_options['poll_question'].'</p
+array('start_new_poll','edit_poll','delete_poll','show_poll_vote_form_ajax','show_poll_setup_form_ajax','bb_polls_cache')
+div class="poll_question">'.$bb_polls['label_poll_text'].': '.$poll_options['poll_question'].'</div
-for ($i=1; $i<=$bb_polls['max_options']; $i++) {
-        if (isset($poll_options[$i])) {
@@ -389 +389 @@
-$topic_id=bb_polls_check_cache($topic_id);
-
-
+,'delete_poll','show_poll_vote_form_ajax','show_poll_setup_form_ajax','bb_polls_cache'
-                        
-p class="poll_label">'.$bb_polls['label_question_text'].' : <input name="poll_question" type="text" style="width:98%" maxlength="'.$bb_polls['max_length'].'" value="'.$poll_options['poll_question'].'" /></p
+div class="poll_label">'.$bb_polls['label_question_text'].' : <br /><input name="poll_question" type="text" style="width:98%" maxlength="'.$bb_polls['max_length'].'" value="'.$poll_options['poll_question'].'" /></div
-                        
-p
+div
-$output.=($poll_options['poll_multiple_choice']) ? ' ' : ' checked="checked" ';
-$output.=' />'.$bb_polls['label_single'].'</span> <span class="nowrap"><input name="poll_multiple_choice" type="radio" value="1" ';
-$output.=($poll_options['poll_multiple_choice']) ? ' checked="checked" ' : ' ';
-p
+div
-                        
-for ($i=1; $i<=$bb_polls['max_options']; $i++) {                        
@@ -403 +403 @@
-                $output.='<a href="javascript:void(0)" onClick="this.style.display='."'none'".'; document.getElementById('."'poll_more_options'".').style.display='."'block'".'">[+] '.$bb_polls['label_option_text'].'</a><div id="poll_more_options" style="display:none;">';
-        }
-p class="poll_label">'.$bb_polls['label_option_text'].' #'.$i.' : <input name="poll_option_'.$i.'" type="text" style="width:98%" maxlength="'.$bb_polls['max_length'].'" value="'.$poll_options[$i].'" /></p
+div class="poll_label">'.$bb_polls['label_option_text'].' #'.$i.' : <br /><input name="poll_option_'.$i.'" type="text" style="width:98%" maxlength="'.$bb_polls['max_length'].'" value="'.$poll_options[$i].'" /></div
-} // loop 
-if ($bb_polls['max_options']>4 && !$poll_options[5]) {$output.='</div>';}
-                
-$output.='<p class="poll_footer">
- 'start_new_poll'
+array('start_new_poll','edit_poll','delete_poll','show_poll_vote_form_ajax','show_poll_setup_form_ajax','bb_polls_cache')
-<input class="submit" type="submit"  value="'.$bb_polls['label_save_text'].'" /></p></form>';
-$output=stripslashes($output);if ($display) {echo '<li id="bb_polls" class="extra-caps-row">'.$output.'</li>';} else {return $output;}
@@ -435 +435 @@
-        if (isset($_GET['delete_poll']) && intval($_GET['delete_poll'])) {      
-                bb_polls_delete_poll();
-delete_poll
+edit_poll','delete_poll','show_poll_vote_form_ajax','show_poll_setup_form_ajax','bb_polls_cache
-        }                               
-        if (isset($_GET['show_poll_results_ajax'])) {
@@ -448 +448 @@
-                echo 'bb_polls_insert_ajax("'.mysql_escape_string(bb_polls_show_poll_vote_form($topic_id,0)).'")';
-                exit();
+        }       
+        if (isset($_GET['show_poll_setup_form_ajax'])) {
+                $topic_id=intval($_GET['show_poll_setup_form_ajax']);
+                header("Content-Type: application/x-javascript");
+                echo 'bb_polls_insert_ajax("'.mysql_escape_string(bb_polls_show_poll_setup_form($topic_id,0,1)).'")';
+                exit();
-        }
-        if (isset($_GET['add_vote_ajax'])) {
@@ -459 +465 @@
-
-function bb_polls_add_javascript($topic_id=0) {
-
-
+
+
+
-echo '<scr'.'ipt type="text/javascript" defer="defer">
-<!--
@@ -469 +476 @@
-function append_dhead(bb_polls_src) {
-if (bb_polls_script) {dhead.removeChild(bb_polls_script);}
-
+bb_polls_cache=
-bb_polls_script = document.createElement("script");
-bb_polls_script.src = bb_polls_src;
@@ -483 +490 @@
-}
-function bb_polls_insert_ajax_delayed() {document.getElementById("bb_polls").innerHTML=bb_polls_htmldata;}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-function bb_polls_show_poll_results_ajax() {
-
-
-
+
+
-function bb_polls_show_poll_vote_form_ajax() {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-function bb_polls_add_vote_ajax() {
-vote="";
@@ -516 +527 @@
-        if (test && test.checked) {vote=vote+"&poll_vote_"+i+"="+i;}
-}
-get_topic_id( $topic_id )
+$topic_id
-else {alert("'.$bb_polls['label_nocheck_text'].'"); return false;}
-}
+';}
+
+echo '
-//-->
-</scr'.'ipt>';

bbpress-polls/trunk/readme.txt

@@ -54 +54 @@
-* 0.50  2008-March-1 basic admin menu  added
-* 0.5.2 2008-March-14 xhtml and non-ajax-edit bug fixes, props zmaroti
+* 0.5.3 2008-March-14 javascript payload is now kept as small as possible 
+* 0.5.4 2008-March-14 new poll form (and edit form) remotely loaded when in "ajax" mode
-        
-== To Do ==