Changeset 203516

Timestamp:

02/09/2010 03:44:11 PM (14 years ago)

Author:

ShaneF

Message:

some fixes with the flash loading. Flash is returning a error called 'Movie not loading'. Looking into this.

Location:

woopra/trunk

Files:

• inc/render.php (modified) (4 diffs)
• js/jquery.analytics.js (modified) (5 diffs)

woopra/trunk/inc/render.php

@@ -68 +68 @@
     
     /**
+
+
+
+
+
+
+
      * PHP 4 Style constructor which calls the below PHP5 Style Constructor
      * @since 1.4.1
@@ -135 +142 @@
                 wp_die($xml_process->get_error_message());
             
+
+
             // Clear up memory!
             unset($xml_data, $xml_data_append);
@@ -226 +235 @@
         arsort($entries);   // force arsort.
     ?>
+
+
+
+
+
         <table class="woopra-table" width="100%" cellpadding="0" cellspacing="0">
             <tr>
@@ -269 +283 @@
                     <td class="text-item"><?php echo $visitorsstring; ?></td>
                     <td class="text-item"><?php echo number_format($visitors); ?></td>
-                    <td class="text-item highlight"><a href="#" onclick="return expandLineChart('<?php echo $this->api_page; ?>', '<?php echo $hashid; ?>', <?php echo $counter; ?>)"><?php echo number_format($pageviews); ?></a></td>
+                    <td class="text-item highlight">
+                        <a class="woopra-chart-line-a" href="#" onclick="return expandLineChart('<?php echo $counter; ?>');"><?php echo number_format($pageviews); ?></a>
+                    </td>
                     <td class="bar"><?php echo $this->woopra_bar($percent); ?></td>
                 </tr>

woopra/trunk/js/jquery.analytics.js

@@ -159 +159 @@
         }
         
+
         selectedSubTabs[superid] = id;
         
@@ -238 +239 @@
     
     /**
-     * Expand Line Chart for Rendering the Flash Chart
-     * @param {Object} key
-     * @param {Object} hashid
-     * @param {Object} id
-     */
-    function expandLineChart(key, hashid, id) {
-        
-        if ( jQuery('#woopra-chart-line-tr-' + hashid + '-' + id).attr('class') == 'loaded' )
-        {
-            // Hide the 'tr'
-            jQuery('#woopra-chart-line-tr-' + hashid + '-' + id).attr("style", "display: none;").removeAttr("class");
-            // Clear the flash element. So it can be reloaded at a future time.
-            jQuery('#woopra-chart-line-td-' + hashid + '-' + id).html();
-            // Return False
-            return false;
-        }
-        
-        //  Show Chart Line 'tr'
-        jQuery('#woopra-chart-line-tr-' + hashid + '-' + id).attr("style", "display: table-row;").addClass("loaded");
-        
-        var phpfile = woopraL10n.siteurl + '/wp-admin/admin-ajax.php?action=woopra&datatype=flash&apikey=' + woopradefaultL10n.apikey + '&id=' + index + '&wkey=' + key + '&date_format=' + date_format + '&from=' + date_from + '&to=' + date_to;
-        
-        //  Flash jQuery Code
-        jQuery('#woopra-chart-line-td-' + hashid + '-' + id).flash({
-            src: woopraL10n.siteurl + '/flash/open-flash-chart.swf',
-            data-file: escape(phpfile),
-            width: 968,
-            height: 110,
-            quality: 'best',
-            bgcolor: '#FFFFFF',
-            allowFullScreen: 'false',
-            menu: 'false',
-            allowScriptAccess: 'sameDomain',
-            wmode: 'transparent',
-            expressInstall: true
-        }, {
-            version: 10
-        },
-        function(htmlOptions){
-            jQuery(this).html(jQuery.fn.flash.transform(htmlOptions));
-        });
-                
-        return false;
-    }
-    
-    /**
      * Debug
      * @param {Object} message
@@ -333 +288 @@
         setSubView(currentSuperView, selectedSubTabs[currentSuperView]);
     }
+
+
+
+
+
     
     //  Set the 'from' and 'to' date.
@@ -338 +298 @@
     jQuery("#woopra-to").attr('value', jQuery(this).dateprev(0) ).datepicker({ dateFormat: 'yy-mm-dd' });
     
-    //  Set the link for the date-range selector <a>
-    function refreshDateLinkText() {
-        jQuery("#woopra-daterange").html('<strong>' + woopraL10n.from + '</strong>: ' + jQuery("#woopra-from").val() + ' - <strong>' + woopraL10n.to + '</strong>: ' + jQuery("#woopra-to").val());
-    }
-    refreshDateLinkText();  //  Run!
-    
+    //  Run!    
+    refreshDateLinkText();
+        
     //  Create Super Tabs
     addSuperTab( woopraL10n.visitors,       'visitors');
@@ -391 +348 @@
     setCurrentSuperTab('visitors');
     
-    
 });
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+