Changeset 1354813

Timestamp:

02/20/2016 05:17:09 PM (10 years ago)

Author:

derekheld

Message:

Fixed bugs in calculating percentage. Moved some CSS to style sheet.

File:

• blue-storage/trunk/blue-storage-settings.php (modified) (2 diffs)

blue-storage/trunk/blue-storage-settings.php

@@ -80 +80 @@
                 $query = "SELECT * FROM $wpdb->posts WHERE post_type='attachment' AND guid NOT LIKE '%%blob.core.windows.net%%' LIMIT %d";
                 $query_results = $wpdb->get_results( $wpdb->prepare($query,$limit) );
+                $total_images = $wpdb->num_rows;
 
                 if( !empty($query_results) )
                 {
-                    echo '<br/><br/><div id="blue-storage-upload-progress"></div>';
-                    echo '<div id="blue-storage-upload-information"></div>';
+                    echo '<br/><br/><div id="blue-storage-progress-container"></div>';
+                    echo '<div id="blue-storage-progress-information"></div>';
                     $count = 0;
                     foreach ($query_results as $attachment) {
@@ -106 +107 @@
                         //Update progress of uploads
                         $count += 1;
-                        $percent = intval(($count/$limit) * 100).'%';
+                        $percent = intval(($count/$total_images) * 100).'%';
                         echo '<script language="javascript">
-                            document.getElementById("progress").innerHTML="<div style=\"width:'.$percent.';background-color:#ddd;\">&nbsp;</div>";
-                            document.getElementById("information").innerHTML="'.$count.' images uploaded.";
+                            document.getElementById("blue-storage-progress-container").innerHTML="<div style=\"width:'.$percent.';background-color:#ddd;\">&nbsp;</div>";
+                            document.getElementById("blue-storage-progress-information").innerHTML="'.$count.' images uploaded.";
                             </script>';
                         echo str_repeat(' ',1024*64);