Changeset 996791

Timestamp:

09/25/2014 06:02:37 PM (11 years ago)

Author:

tjsantilo

Message:

Updated voting buttons (again)

Minor tweaks to CSS

Changes in public.js to fix redirect function, add message for those who have already voted.

Changed voting results to display percentages

Location:

because/trunk

Files:

• README.txt (modified) (2 diffs)
• assets/downvote.png (modified) (previous)
• assets/upvote.png (modified) (previous)
• public/assets/css/public.css (modified) (5 diffs)
• public/assets/js/public.js (modified) (6 diffs)
• public/class-social-polling.php (modified) (1 diff)
• social-polling.php (modified) (1 diff)

because/trunk/README.txt

@@ -1 @@
-=== BECAUSE Commenting System===
+=== BECAUSE Comment System===
 Contributors: (tjsantilo)
 Donate link: www.teambecause.com
@@ -7 +7 @@
 Tested up to: 4.0
 <<<<<<< .mine
-Stable tag: 1.3.1
+Stable tag: 1.3.2
 =======
-Stable tag: 1.3.1
+Stable tag: 1.3.2
 >>>>>>> .r969865
 License: GPLv2 or later

because/trunk/public/assets/css/public.css

@@ -55 +55 @@
     line-height:1em;
     margin-bottom:0px;
+    color:#fff!important;
     
 }
@@ -91 +92 @@
     display:block;
     text-align:center;
-    font-size:2em;
+    font-size:1.25em;
     width:100%;
     border:none;
@@ -261 +262 @@
 padding: 0px 0px;
 border-radius:60px;
-width:25px;
+width:20px;
 height:auto;
 text-align:center;
@@ -400 +401 @@
     padding:0;
     height:auto;
-    width:25px;
+    width:20px;
 }
 
@@ -406 +407 @@
 {
     opacity: 0.5;
+}
+
+
+label.answer_label{
+color:black;
+}
+
+#social_polling_already_voted_wrapper{
+display: none;
+font-size: 1.4em;
+text-align: center;
+width: 100%;
+padding: 1em;
 }
 /*

because/trunk/public/assets/js/public.js

@@ -52 +52 @@
 
                 
-        var $comment_box_offset = $('#respond').offset().top + 'px';
+        
+
+        
+
+                
+
+                //console.log(data+ajaxurl);
+
+    
+
+            }//success
+
+        });//$.ajax({
+
+            
+
+                
+
+    })//$(document).on('click', 'button.answer_divs', function(){
+
+    
+
+    
+
+    
+
+    
+
+    function show_results($post_id){
+
+        //Check if results are arelready on screen.
+
+        var $on_screen = $('#results_box_'+$post_id).length;
+
+        
+
+        //if we already have the results on screeen.
+
+        if( $on_screen > 0){
+
+            return false;           
+
+        }else{}
+
+        
+
+        $.ajax({
+
+            type:"POST",
+
+            dataType: "json",
+
+            url:ajaxurl,
+
+            //url: "/wp-admin/admin-ajax.php",
+
+            data: {
+
+                 wwad: 'show_results', 
+
+                 post_id: $post_id, 
+
+                },
+
+            success:function(data){
+
+    var answer_1 = data.social_poll_answer_1;
+
+var answer_2 = data.social_poll_answer_2;
+
+
+var answer_1_votes = data.social_poll_answer_1.total_votes;
+
+var answer_2_votes = data.social_poll_answer_2.total_votes;
+var answer_1_percent = (answer_1_votes/(answer_1_votes+answer_2_votes)*100).toFixed(2);
+var answer_2_percent = (answer_2_votes/(answer_1_votes+answer_2_votes)*100).toFixed(2);
+
+var answer_1_text = data.social_poll_answer_1.answer_text;
+
+var answer_2_text = data.social_poll_answer_2.answer_text;
+
+
+
+var $results_html = '<div class="one_result_box" id="results_box_'+$post_id+'"><p><span class="results_answer_text">'+answer_1_text+'</span> :<span class="results_answer_value">'+answer_1_percent+'</span></p>'
+
++'<p><span class="results_answer_text">'+answer_2_text+'</span> :<span class="results_answer_value">'+answer_2_percent+'</div></p></div>';
+
+//$('#social_polling_see_results_wrapper').html($results_html);
+
+
+
+//var $answer1_html = answer_1_text+' '+answer_1_votes;
+
+//var $answer2_html = answer_2_text+' '+answer_2_votes;
+
+
+var $answer1_html = '<h1>'+answer_1_percent+'%</h1>Votes';
+
+var $answer2_html = '<h1>'+answer_2_percent+'%</h1>Votes';  
+
+
+
+$('#answer_1_wrapper .poll_results').html($answer1_html);
+
+$('#answer_2_wrapper .poll_results').html($answer2_html);
+
 
         setTimeout(function() {
+            var $comment_box_offset = $('#respond').offset().top + 'px';
   $("html, body").animate({ scrollTop: $comment_box_offset  }, 450);
 }, 2000);
-        
+
+$('#social_polling_see_results_wrapper').html('You Already Voted');
+                
+
+                
+
+                
+
+                
+
+                
+
+                
+
+                
+
+            }//success
+
+        
+
+        });//$.ajax({
+
+        
+
+    }//show_results
+
+    
+
+    
+
+    
+
+    //----------------------------
+
+    //Clicking Join Discussion box
+
+    //----------------------------
+
+    /*
+
+
+        $(document).on('click', 'button.answer_divs', function(){
+
+        var $comment_box_offset = $('#respond').offset().top + 'px';
+
+        $("html, body").animate({ scrollTop: $comment_box_offset  }, 450);
+
+        
+
+    })
+
+    
+*/
+    
+
+    //----------------------------
+
+    //END Voting Box Javascript
+
+    //----------------------------
+
+    
+
+    
+
+    
+
+    document.getElementById('comment').placeholder = 'Why did you vote like that?';
+
+    
+ 
+    
+
+    
+
+    
+
+    //----------------------------
+
+    //Comment Javascript
+
+    //----------------------------
+
+    // Place your public-facing JavaScript here
+
+        $(document).on('click', '.comment_vote_action', function(){
+
+        var $dis = $(this);
+
+        console.log($comment_ajaxurl);
+
+        var $comment_id = $(this).attr('data-comment_id'); 
+
+        var $wwad = $(this).attr('data_action'); 
+
+        var $nonce = $(this).attr('data-nonce'); 
+
+    
+
+        $.ajax({
+
+            type:"POST",
+
+            url:$comment_ajaxurl,
+
+            //url: "/wp-admin/admin-ajax.php",
+
+            data: {
+
+                 nonce:$nonce,
+
+                 wwad: $wwad, 
+
+                 comment_id: $comment_id, 
+
+                },
+
+            success:function(data){
+
+                console.log(data);
+
+                
+
+                switch(data){
+
+                case('upvote'): 
+
+                    var $karma = $dis.parent('.comment_controls').find('.comment_karma_count');
+
+                    $karma.html(parseInt($karma.html()) + 1);
+
+                break;  
+
+                case('downvote'):   
+
+                var $karma = $dis.parent('.comment_controls').find('.comment_karma_count');
+
+                    $karma.html(parseInt($karma.html()) - 1);
+
+                break;
+
+                
+
+                case('flagged'):    
+
+                $dis.css('font-weight','bold');
+
+                break;
+
+                
+
+                
+
+                case('unflagged'):  
+
+                $dis.css('font-weight','normal');
+
+                break;
+
+                
+
+                
+
+                default:    
+
+                    
+
+                    
+
+                }
+
+                
+
+                //alert(data);
+
+                //show_results($post_id);
+
+                
 
                 
@@ -63 +346 @@
                 //console.log(data+ajaxurl);
 
-    
+                
 
             }//success
@@ -74 +357 @@
 
     })//$(document).on('click', 'button.answer_divs', function(){
-    
-
-    
-
-    
-
-    
-
-    function show_results($post_id){
-
-        //Check if results are arelready on screen.
-
-        var $on_screen = $('#results_box_'+$post_id).length;
-
-        
-
-        //if we already have the results on screeen.
-
-        if( $on_screen > 0){
-
-            return false;           
-
-        }else{}
-
-        
+
+    
+
+    
+
+    
+
+    //Comment Sorting.
+
+    $(document).on('click', '.sp_orderby_param', function(){
+
+        
+
+        jQuery(this).addClass('selected_sort');
+
+        jQuery('a').not(this).removeClass('selected_sort');
+
+        
+
+        var $sortby = jQuery(this).attr('data-sortby');
+
+        var $nonce = $(this).attr('data-nonce'); 
+
+        var $post_id = $('#sp_comments_order').attr('data-post_id');
 
         $.ajax({
@@ -104 +386 @@
             type:"POST",
 
-            dataType: "json",
-
-            url:ajaxurl,
+            url:$comment_ajaxurl,
 
             //url: "/wp-admin/admin-ajax.php",
@@ -112 +392 @@
             data: {
 
-                 wwad: 'show_results', 
+                 nonce:$nonce,
+
+                 sortby:$sortby,
+
+                 wwad: 'comment_sorting', 
 
                  post_id: $post_id, 
@@ -120 +404 @@
             success:function(data){
 
-                console.log(data);
-
-                
-
-                var answer_1 = data.social_poll_answer_1;
-
-                var answer_2 = data.social_poll_answer_2;
-
-                
-
-                var answer_1_votes = data.social_poll_answer_1.total_votes;
-
-                var answer_2_votes = data.social_poll_answer_2.total_votes;
-
-                
-
-                var answer_1_text = data.social_poll_answer_1.answer_text;
-
-                var answer_2_text = data.social_poll_answer_2.answer_text;
+                
+
+                
+
+                
+
+                $('.sp_comment-list').html(data);
+
+                
+
+                //alert(data);
+
+                //show_results($post_id);
+
+                
+
+                
+
+                //console.log(data+ajaxurl);
+
+                
+
+            }//success
+
+        });//$.ajax({
+
+        
+
+    
+
+    
+
+    
+
+    })//$(document).on('click', '.sp_orderby_param', function(){
+
+    
+
+    
+
+    jQuery(window).load(function(){
+
+             function show_popup(){
+
+                jQuery("#thecomment_field").remove();
+
+            };
+
+         window.setTimeout( show_popup, 5000 ); // 5 seconds
+
+    })
+
+    
+
+    
+
+    
+
+    //Character limit
+
+    jQuery('#commentform textarea#comment').keypress(function(e) {
 
             
 
-                
-
-                var $results_html = '<div class="one_result_box" id="results_box_'+$post_id+'"><p><span class="results_answer_text">'+answer_1_text+'</span> :<span class="results_answer_value">'+answer_1_votes+'</span></p>'
-
-                                    +'<p><span class="results_answer_text">'+answer_2_text+'</span> :<span class="results_answer_value">'+answer_2_votes+'</div></p></div>';
-
-                //$('#social_polling_see_results_wrapper').html($results_html);
-
-                
-
-                
-
-                //var $answer1_html = answer_1_text+' '+answer_1_votes;
-
-                //var $answer2_html = answer_2_text+' '+answer_2_votes;
-
-                
-
-                var $answer1_html = '<h1>'+answer_1_votes+'</h1> votes';
-
-                var $answer2_html = '<h1>'+answer_2_votes+'</h1> votes';        
-
-                                    
-
-                
-
-                $('#answer_1_wrapper .poll_results').html($answer1_html);
-
-                $('#answer_2_wrapper .poll_results').html($answer2_html);
-
-                $('#social_polling_see_results_wrapper').html('');
-
-                
-
-                
-
-                
-
-                
-
-                
-
-                
-
-                
-
-            }//success
-
-        
-
-        });//$.ajax({
-
-        
-
-    }//show_results
-
-    
-
-    
-
-    
-
-    //----------------------------
-
-    //Clicking Join Discussion box
-
-    //----------------------------
-
-    
-
-    $(document).on('click', '.joindiscussion', function(){
-
-        var $comment_box_offset = $('#respond').offset().top + 'px';
-
-        $("html, body").animate({ scrollTop: $comment_box_offset  }, 450);
-
-        
-
-    })
-
-    
-
-    
-
-    //----------------------------
-
-    //END Voting Box Javascript
-
-    //----------------------------
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    //----------------------------
-
-    //Comment Javascript
-
-    //----------------------------
-
-    // Place your public-facing JavaScript here
-
-        $(document).on('click', '.comment_vote_action', function(){
-
-        var $dis = $(this);
-
-        console.log($comment_ajaxurl);
-
-        var $comment_id = $(this).attr('data-comment_id'); 
-
-        var $wwad = $(this).attr('data_action'); 
-
-        var $nonce = $(this).attr('data-nonce'); 
-
-    
-
-        $.ajax({
-
-            type:"POST",
-
-            url:$comment_ajaxurl,
-
-            //url: "/wp-admin/admin-ajax.php",
-
-            data: {
-
-                 nonce:$nonce,
-
-                 wwad: $wwad, 
-
-                 comment_id: $comment_id, 
-
-                },
-
-            success:function(data){
-
-                console.log(data);
-
-                
-
-                switch(data){
-
-                case('upvote'): 
-
-                    var $karma = $dis.parent('.comment_controls').find('.comment_karma_count');
-
-                    $karma.html(parseInt($karma.html()) + 1);
-
-                break;  
-
-                case('downvote'):   
-
-                var $karma = $dis.parent('.comment_controls').find('.comment_karma_count');
-
-                    $karma.html(parseInt($karma.html()) - 1);
-
-                break;
-
-                
-
-                case('flagged'):    
-
-                $dis.css('font-weight','bold');
-
-                break;
-
-                
-
-                
-
-                case('unflagged'):  
-
-                $dis.css('font-weight','normal');
-
-                break;
-
-                
-
-                
-
-                default:    
-
-                    
-
-                    
-
-                }
-
-                
-
-                //alert(data);
-
-                //show_results($post_id);
-
-                
-
-                
-
-                //console.log(data+ajaxurl);
-
-                
-
-            }//success
-
-        });//$.ajax({
+        jQuery('#commentform textarea#comment').attr('maxlength', 280); 
 
             
 
-                
-
-    })//$(document).on('click', 'button.answer_divs', function(){
-
-    
-
-    
-
-    
-
-    //Comment Sorting.
-
-    $(document).on('click', '.sp_orderby_param', function(){
-
-        
-
-        jQuery(this).addClass('selected_sort');
-
-        jQuery('a').not(this).removeClass('selected_sort');
-
-        
-
-        var $sortby = jQuery(this).attr('data-sortby');
-
-        var $nonce = $(this).attr('data-nonce'); 
-
-        var $post_id = $('#sp_comments_order').attr('data-post_id');
-
-        $.ajax({
-
-            type:"POST",
-
-            url:$comment_ajaxurl,
-
-            //url: "/wp-admin/admin-ajax.php",
-
-            data: {
-
-                 nonce:$nonce,
-
-                 sortby:$sortby,
-
-                 wwad: 'comment_sorting', 
-
-                 post_id: $post_id, 
-
-                },
-
-            success:function(data){
-
-                
-
-                
-
-                
-
-                $('.sp_comment-list').html(data);
-
-                
-
-                //alert(data);
-
-                //show_results($post_id);
-
-                
-
-                
-
-                //console.log(data+ajaxurl);
-
-                
-
-            }//success
-
-        });//$.ajax({
-
-        
-
-    
-
-    
-
-    
-
-    })//$(document).on('click', '.sp_orderby_param', function(){
-
-    
-
-    
-
-    jQuery(window).load(function(){
-
-             function show_popup(){
-
-                jQuery("#thecomment_field").remove();
-
-            };
-
-         window.setTimeout( show_popup, 5000 ); // 5 seconds
-
-    })
-
-    
-
-    
-
-    
-
-    //Character limit
-
-    jQuery('#commentform textarea#comment').keypress(function(e) {
-
-            
-
-        jQuery('#commentform textarea#comment').attr('maxlength', 280); 
-
-            
-
           var tval = jQuery('#commentform textarea#comment').val(),
 

because/trunk/public/class-social-polling.php

@@ -595 +595 @@
             
             
-            
             </div>
             <?php endif;//$active.

because/trunk/social-polling.php

@@ -34 +34 @@
 
 <<<<<<< .mine
- * Version:           1.3.1
+ * Version:           1.3.2
 =======
- * Version:           1.3.1
+ * Version:           1.3.2
 >>>>>>> .r969865