Changeset 574116
- Timestamp:
- 07/18/2012 02:12:34 PM (14 years ago)
- Location:
- olimometer
- Files:
-
- 64 added
- 4 edited
-
tags/2.33 (added)
-
tags/2.33/LiberationSans-Regular.ttf (added)
-
tags/2.33/jscolor (added)
-
tags/2.33/jscolor/arrow.gif (added)
-
tags/2.33/jscolor/cross.gif (added)
-
tags/2.33/jscolor/demo.html (added)
-
tags/2.33/jscolor/hs.png (added)
-
tags/2.33/jscolor/hv.png (added)
-
tags/2.33/jscolor/jscolor.js (added)
-
tags/2.33/olimometer-class.php (added)
-
tags/2.33/olimometer.php (added)
-
tags/2.33/readme.txt (added)
-
tags/2.33/screenshot-1.jpg (added)
-
tags/2.33/screenshot-2.jpg (added)
-
tags/2.33/screenshot-3.jpg (added)
-
tags/2.33/screenshot-4.jpg (added)
-
tags/2.33/skins (added)
-
tags/2.33/skins.php (added)
-
tags/2.33/skins.xml (added)
-
tags/2.33/skins/oli-bold-chunky (added)
-
tags/2.33/skins/oli-bold-chunky/bold-chunky-bar.png (added)
-
tags/2.33/skins/oli-bold-chunky/bold-chunky-bottom.png (added)
-
tags/2.33/skins/oli-bold-chunky/bold-chunky-top.png (added)
-
tags/2.33/skins/oli-default (added)
-
tags/2.33/skins/oli-default/therm_bar_empty.png (added)
-
tags/2.33/skins/oli-default/therm_bulb.png (added)
-
tags/2.33/skins/oli-default/therm_top.png (added)
-
tags/2.33/skins/oli-ourprogress-blue (added)
-
tags/2.33/skins/oli-ourprogress-blue/therm_bar_empty.png (added)
-
tags/2.33/skins/oli-ourprogress-blue/therm_bulb.png (added)
-
tags/2.33/skins/oli-ourprogress-blue/therm_top.png (added)
-
tags/2.33/skins/oli-ourprogress-green (added)
-
tags/2.33/skins/oli-ourprogress-green/therm_bar_empty.png (added)
-
tags/2.33/skins/oli-ourprogress-green/therm_bulb.png (added)
-
tags/2.33/skins/oli-ourprogress-green/therm_top.png (added)
-
tags/2.33/skins/oli-ourprogress-red (added)
-
tags/2.33/skins/oli-ourprogress-red/therm_bar_empty.png (added)
-
tags/2.33/skins/oli-ourprogress-red/therm_bulb.png (added)
-
tags/2.33/skins/oli-ourprogress-red/therm_top.png (added)
-
tags/2.33/skins/oli-progpress-black (added)
-
tags/2.33/skins/oli-progpress-black/left.png (added)
-
tags/2.33/skins/oli-progpress-black/middle.png (added)
-
tags/2.33/skins/oli-progpress-black/right.png (added)
-
tags/2.33/skins/oli-rounded (added)
-
tags/2.33/skins/oli-rounded/rounded_bar.png (added)
-
tags/2.33/skins/oli-rounded/rounded_bottom.png (added)
-
tags/2.33/skins/oli-rounded/rounded_top.png (added)
-
tags/2.33/skins/oli-thinblackhorizontal (added)
-
tags/2.33/skins/oli-thinblackhorizontal/left.png (added)
-
tags/2.33/skins/oli-thinblackhorizontal/middle.png (added)
-
tags/2.33/skins/oli-thinblackhorizontal/right.png (added)
-
tags/2.33/skins/oli-thinbluehorizontal (added)
-
tags/2.33/skins/oli-thinbluehorizontal/left.png (added)
-
tags/2.33/skins/oli-thinbluehorizontal/middle.png (added)
-
tags/2.33/skins/oli-thinbluehorizontal/right.png (added)
-
tags/2.33/skins/oli-thinredhorizontal (added)
-
tags/2.33/skins/oli-thinredhorizontal/left.png (added)
-
tags/2.33/skins/oli-thinredhorizontal/middle.png (added)
-
tags/2.33/skins/oli-thinredhorizontal/right.png (added)
-
tags/2.33/skins/oli-watermaster (added)
-
tags/2.33/skins/oli-watermaster/watermaster-bar.png (added)
-
tags/2.33/skins/oli-watermaster/watermaster-bottom.png (added)
-
tags/2.33/skins/oli-watermaster/watermaster-top.png (added)
-
tags/2.33/thermometer.php (added)
-
trunk/olimometer-class.php (modified) (1 diff)
-
trunk/olimometer.php (modified) (3 diffs)
-
trunk/readme.txt (modified) (2 diffs)
-
trunk/thermometer.php (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
olimometer/trunk/olimometer-class.php
r572987 r574116 176 176 177 177 178 $the_olimometer_text = "< img src='".$image_location."?olimometer_id=".$this->olimometer_id."'";178 $the_olimometer_text = "<a href='http://www.olivershingler.co.uk/oliblog/olimometer/' target=_blank><img src='".$image_location."?olimometer_id=".$this->olimometer_id."' border=0"; 179 179 if(strlen($css_class) > 0) { 180 180 $the_olimometer_text = $the_olimometer_text." class='".$css_class."'"; 181 181 } 182 $the_olimometer_text = $the_olimometer_text." alt='Olimometer 2.3 3'>";182 $the_olimometer_text = $the_olimometer_text." alt='Olimometer 2.34'></a>"; 183 183 184 184 return $the_olimometer_text; -
olimometer/trunk/olimometer.php
r572987 r574116 6 6 Author: Oliver Shingler 7 7 Author URI: http://www.olivershingler.co.uk 8 Version: 2.3 38 Version: 2.34 9 9 */ 10 10 … … 511 511 <option value="8356" <?php if($current_olimometer->olimometer_currency=="8356") { echo "SELECTED"; } ?>>₤</option> 512 512 <option value="176" <?php if($current_olimometer->olimometer_currency=="176") { echo "SELECTED"; } ?>>°</option> 513 <option value="10000" <?php if($current_olimometer->olimometer_currency=="10000") { echo "SELECTED"; } ?>>kr</option> 513 514 <option value="" <?php if($current_olimometer->olimometer_currency=="") { echo "SELECTED"; } ?>>No Prefix</option> 514 515 </select> … … 530 531 <option value="8356" <?php if($current_olimometer->olimometer_suffix=="8356") { echo "SELECTED"; } ?>>₤</option> 531 532 <option value="176" <?php if($current_olimometer->olimometer_suffix=="176") { echo "SELECTED"; } ?>>°</option> 533 <option value="10000" <?php if($current_olimometer->olimometer_suffix=="10000") { echo "SELECTED"; } ?>>kr</option> 532 534 <option value="" <?php if($current_olimometer->olimometer_suffix=="") { echo "SELECTED"; } ?>>No Suffix</option> 533 535 </select> -
olimometer/trunk/readme.txt
r572987 r574116 105 105 == Changelog == 106 106 107 = 2.34 = 108 * Fixed GD image output issue on some web servers (header and flush requirements) 109 * Added kr as prefix/suffix option 110 107 111 = 2.33 = 108 112 * Added some more number format options. … … 211 215 == Upgrade Notice == 212 216 217 = 2.34 = 218 * Fixed GD image output issue on some web servers (header and flush requirements) 219 * Added kr as prefix/suffix option 220 213 221 = 2.33 = 214 222 * Added some more number format options. -
olimometer/trunk/thermometer.php
r572987 r574116 116 116 $display_zero = number_format(0,$olimometer_display_dp,$olimometer_display_decimal,$olimometer_display_thousands); 117 117 118 // Figure out prefix and suffix values 119 switch($currency) { 120 case 128: 121 $currency_symbol = "€"; 122 break; 123 case '': 124 $currency_symbol = ""; 125 break; 126 case 'x': 127 $currency_symbol = ""; 128 break; 129 case '10000': 130 $currency_symbol = "kr "; 131 break; 132 default: 133 $currency_symbol = "&#$currency;"; 134 } 135 136 switch($suffix) { 137 case 128: 138 $suffix_symbol = "€"; 139 break; 140 case '': 141 $suffix_symbol = ""; 142 break; 143 case 'x': 144 $suffix_symbol = ""; 145 break; 146 case '10000': 147 $suffix_symbol = " kr"; 148 break; 149 default: 150 $suffix_symbol = "&#$suffix;"; 151 } 118 152 119 153 … … 183 217 $text_color_array = rgb2array($text_colour); 184 218 $text_colour_rgb = imagecolorallocate($temp_new_image, $text_color_array[0], $text_color_array[1], $text_color_array[2]); 185 if ($currency == 128) 219 /* 220 switch($currency) { 221 case 128: 222 $currency_symbol = "€"; 223 break; 224 case '': 225 $currency_symbol = ""; 226 break; 227 case 'x': 228 $currency_symbol = ""; 229 break; 230 case '10000': 231 $currency_symbol = ""; 232 break; 233 default: 234 $currency_symbol = "kr"; 235 }*/ 236 237 /*if ($currency == 128) { 186 238 $currency_symbol = "€"; 187 else if (($currency == '') || ($currency == 'x')) 239 } 240 elseif (($currency == '') || ($currency == 'x')) { 188 241 $currency_symbol = ""; 189 else 242 } 243 elseif($currency == 10000) { 244 // Krone 245 $currency_symbol = "kr "; 246 } 247 else { 190 248 $currency_symbol = "&#$currency;"; 191 192 if (($suffix == '') || ($suffix == 'x')) { 249 }*/ 250 251 /*if (($suffix == '') || ($suffix == 'x')) { 193 252 $suffix_symbol = ""; 194 253 } 254 elseif($suffix == 10000) { 255 // Krone 256 $suffix_symbol = " kr"; 257 } 195 258 else { 196 259 $suffix_symbol = "&#$suffix;"; 197 } 198 199 260 }*/ 261 //$currency_symbol = "YYY"; 262 //$suffix_symbol = "XXX"; 200 263 201 264 // What is the width of the top label? … … 350 413 $text_color_array = rgb2array($text_colour); 351 414 $text_colour_rgb = imagecolorallocate($temp_new_image, $text_color_array[0], $text_color_array[1], $text_color_array[2]); 352 if ($currency == 128) 415 416 /*if ($currency == 128) 353 417 $currency_symbol = "€"; 354 418 else if (($currency == '') || ($currency == 'x')) … … 362 426 else { 363 427 $suffix_symbol = "&#$suffix;"; 364 } 428 }*/ 365 429 366 430 … … 433 497 434 498 //output the image to the browser 435 499 header('Content-type: image/png'); 436 500 imagepng($new_image, NULL); 501 ob_end_flush(); 502 437 503 438 504
Note: See TracChangeset
for help on using the changeset viewer.