WordPress.org
Get WordPress

Plugin Directory

Changeset 572987


Ignore:
Timestamp:
07/16/2012 10:07:14 AM (14 years ago)
Author:
oshingler
Message:
 
Location:
olimometer
Files:
64 added
4 edited

Legend:

Unmodified
Added
Removed

  • olimometer/trunk/olimometer-class.php

    r571748 r572987  
    174174
    175175        $image_location = plugins_url('olimometer/thermometer.php', dirname(__FILE__) );
    176         /*$the_olimometer_text = "<img src='".$image_location."?total=".$this->olimometer_total_value."&progress=".$this->olimometer_progress_value."&currency=".$this->olimometer_currency."&bg=".$this->olimometer_thermometer_bg_colour."&text_colour=".$this->olimometer_text_colour."&height=".$this->olimometer_thermometer_height."&transparent=".$this->olimometer_transparent."&show_progress=".$this->olimometer_show_progress."&show_target=".$this->olimometer_show_target."&progress_label=".$this->olimometer_progress_label."&font_height=".$this->olimometer_font_height."&suffix=".$this->olimometer_suffix."&skin=".$this->olimometer_skin_slug."&font=".$olimometer_font."'";
    177         if(strlen($css_class) > 0) {
    178             $the_olimometer_text = $the_olimometer_text." class='".$css_class."'";
    179         }
    180         $the_olimometer_text = $the_olimometer_text." alt='Olimometer 2.20'>";*/
    181176       
    182177       
    … …  
    185180            $the_olimometer_text = $the_olimometer_text." class='".$css_class."'";
    186181        }
    187         $the_olimometer_text = $the_olimometer_text." alt='Olimometer 2.32'>";
     182        $the_olimometer_text = $the_olimometer_text." alt='Olimometer 2.33'>";
    188183       
    189184        return $the_olimometer_text;

  • olimometer/trunk/olimometer.php

    r571748 r572987  
    66Author: Oliver Shingler
    77Author URI: http://www.olivershingler.co.uk
    8 Version: 2.32
     8Version: 2.33
    99*/
    1010
    … …  
    432432            <option value="2" <?php if($current_olimometer->olimometer_number_format==2) { echo "SELECTED"; } ?>>1000.00</option>
    433433            <option value="3" <?php if($current_olimometer->olimometer_number_format==3) { echo "SELECTED"; } ?>>1,000.00</option>
    434             </select>
     434            <option value="4" <?php if($current_olimometer->olimometer_number_format==4) { echo "SELECTED"; } ?>>1.000</option>
     435            <option value="5" <?php if($current_olimometer->olimometer_number_format==5) { echo "SELECTED"; } ?>>1.000,00</option>         
     436            <option value="6" <?php if($current_olimometer->olimometer_number_format==6) { echo "SELECTED"; } ?>>1 000</option>
     437            <option value="7" <?php if($current_olimometer->olimometer_number_format==7) { echo "SELECTED"; } ?>>1 000,00</option>
     438            <option value="8" <?php if($current_olimometer->olimometer_number_format==8) { echo "SELECTED"; } ?>>1 000.00</option>                   
     439            </select>
    435440            <p><span class="description">Please choose a display format for your values.</span></p></td>
    436441        </tr>

  • olimometer/trunk/readme.txt

    r571748 r572987  
    105105== Changelog ==
    106106
     107= 2.33 =
     108* Added some more number format options.
     109
    107110= 2.32 =
    108111* Values can be formatted, for example with decimal places and a comma to delimit thousands. See the Number Format option on the settings page.
    … …  
    208211== Upgrade Notice ==
    209212
     213= 2.33 =
     214* Added some more number format options.
     215
    210216= 2.32 =
    211217* Values can be formatted, for example with decimal places and a comma to delimit thousands. See the Number Format option on the settings page.

  • olimometer/trunk/thermometer.php

    r571748 r572987  
    7171        $olimometer_display_array[0][0] = 0;
    7272        $olimometer_display_array[0][1] = '';
     73        $olimometer_display_array[0][2] = '.';
    7374        // no dp, thousands marker
    7475        $olimometer_display_array[1][0] = 0;
    7576        $olimometer_display_array[1][1] = ',';
     77        $olimometer_display_array[1][2] = '.';
    7678        // 2dp, no thousands
    7779        $olimometer_display_array[2][0] = 2;
    7880        $olimometer_display_array[2][1] = '';
     81        $olimometer_display_array[2][2] = '.';
    7982        // 2dp, thousands marker
    8083        $olimometer_display_array[3][0] = 2;
    8184        $olimometer_display_array[3][1] = ',';
     85        $olimometer_display_array[3][2] = '.';
     86        // no dp, period thousands marker
     87        $olimometer_display_array[4][0] = 0;
     88        $olimometer_display_array[4][1] = '.';
     89        $olimometer_display_array[4][2] = ',';
     90        // 2dp (comma), period thousands marker
     91        $olimometer_display_array[5][0] = 2;
     92        $olimometer_display_array[5][1] = '.';
     93        $olimometer_display_array[5][2] = ',';
     94        // no dp, space thousands marker
     95        $olimometer_display_array[6][0] = 0;
     96        $olimometer_display_array[6][1] = ' ';
     97        $olimometer_display_array[6][2] = '.';
     98        // 2dp (comma), space thousands marker
     99        $olimometer_display_array[7][0] = 2;
     100        $olimometer_display_array[7][1] = ' ';
     101        $olimometer_display_array[7][2] = ',';
     102        // 2dp (period), space thousands marker
     103        $olimometer_display_array[8][0] = 2;
     104        $olimometer_display_array[8][1] = '.';
     105        $olimometer_display_array[8][2] = ' ';
     106       
    82107       
    83108    // Display converted values:
    84109    $olimometer_display_dp = $olimometer_display_array[$olimometer_to_display->olimometer_number_format][0];
    85110    $olimometer_display_thousands = $olimometer_display_array[$olimometer_to_display->olimometer_number_format][1];
     111    $olimometer_display_decimal = $olimometer_display_array[$olimometer_to_display->olimometer_number_format][2];
    86112    //$olimometer_display_dp = 2;
    87113    //$olimometer_display_thousands = ',';
    88     $display_total_value = number_format($total_value,$olimometer_display_dp,'.',$olimometer_display_thousands);
    89     $display_progress_value = number_format($progress_value,$olimometer_display_dp,'.',$olimometer_display_thousands);
    90     $display_zero = number_format(0,$olimometer_display_dp,'.',$olimometer_display_thousands);
     114    $display_total_value = number_format($total_value,$olimometer_display_dp,$olimometer_display_decimal,$olimometer_display_thousands);
     115    $display_progress_value = number_format($progress_value,$olimometer_display_dp,$olimometer_display_decimal,$olimometer_display_thousands);
     116    $display_zero = number_format(0,$olimometer_display_dp,$olimometer_display_decimal,$olimometer_display_thousands);
    91117   
    92118
Note: See TracChangeset for help on using the changeset viewer.