Changeset 601490
- Timestamp:
- 09/20/2012 08:26:03 AM (14 years ago)
- Location:
- olimometer
- Files:
-
- 64 added
- 3 edited
-
tags/2.35 (added)
-
tags/2.35/LiberationSans-Regular.ttf (added)
-
tags/2.35/jscolor (added)
-
tags/2.35/jscolor/arrow.gif (added)
-
tags/2.35/jscolor/cross.gif (added)
-
tags/2.35/jscolor/demo.html (added)
-
tags/2.35/jscolor/hs.png (added)
-
tags/2.35/jscolor/hv.png (added)
-
tags/2.35/jscolor/jscolor.js (added)
-
tags/2.35/olimometer-class.php (added)
-
tags/2.35/olimometer.php (added)
-
tags/2.35/readme.txt (added)
-
tags/2.35/screenshot-1.jpg (added)
-
tags/2.35/screenshot-2.jpg (added)
-
tags/2.35/screenshot-3.jpg (added)
-
tags/2.35/screenshot-4.jpg (added)
-
tags/2.35/skins (added)
-
tags/2.35/skins.php (added)
-
tags/2.35/skins.xml (added)
-
tags/2.35/skins/oli-bold-chunky (added)
-
tags/2.35/skins/oli-bold-chunky/bold-chunky-bar.png (added)
-
tags/2.35/skins/oli-bold-chunky/bold-chunky-bottom.png (added)
-
tags/2.35/skins/oli-bold-chunky/bold-chunky-top.png (added)
-
tags/2.35/skins/oli-default (added)
-
tags/2.35/skins/oli-default/therm_bar_empty.png (added)
-
tags/2.35/skins/oli-default/therm_bulb.png (added)
-
tags/2.35/skins/oli-default/therm_top.png (added)
-
tags/2.35/skins/oli-ourprogress-blue (added)
-
tags/2.35/skins/oli-ourprogress-blue/therm_bar_empty.png (added)
-
tags/2.35/skins/oli-ourprogress-blue/therm_bulb.png (added)
-
tags/2.35/skins/oli-ourprogress-blue/therm_top.png (added)
-
tags/2.35/skins/oli-ourprogress-green (added)
-
tags/2.35/skins/oli-ourprogress-green/therm_bar_empty.png (added)
-
tags/2.35/skins/oli-ourprogress-green/therm_bulb.png (added)
-
tags/2.35/skins/oli-ourprogress-green/therm_top.png (added)
-
tags/2.35/skins/oli-ourprogress-red (added)
-
tags/2.35/skins/oli-ourprogress-red/therm_bar_empty.png (added)
-
tags/2.35/skins/oli-ourprogress-red/therm_bulb.png (added)
-
tags/2.35/skins/oli-ourprogress-red/therm_top.png (added)
-
tags/2.35/skins/oli-progpress-black (added)
-
tags/2.35/skins/oli-progpress-black/left.png (added)
-
tags/2.35/skins/oli-progpress-black/middle.png (added)
-
tags/2.35/skins/oli-progpress-black/right.png (added)
-
tags/2.35/skins/oli-rounded (added)
-
tags/2.35/skins/oli-rounded/rounded_bar.png (added)
-
tags/2.35/skins/oli-rounded/rounded_bottom.png (added)
-
tags/2.35/skins/oli-rounded/rounded_top.png (added)
-
tags/2.35/skins/oli-thinblackhorizontal (added)
-
tags/2.35/skins/oli-thinblackhorizontal/left.png (added)
-
tags/2.35/skins/oli-thinblackhorizontal/middle.png (added)
-
tags/2.35/skins/oli-thinblackhorizontal/right.png (added)
-
tags/2.35/skins/oli-thinbluehorizontal (added)
-
tags/2.35/skins/oli-thinbluehorizontal/left.png (added)
-
tags/2.35/skins/oli-thinbluehorizontal/middle.png (added)
-
tags/2.35/skins/oli-thinbluehorizontal/right.png (added)
-
tags/2.35/skins/oli-thinredhorizontal (added)
-
tags/2.35/skins/oli-thinredhorizontal/left.png (added)
-
tags/2.35/skins/oli-thinredhorizontal/middle.png (added)
-
tags/2.35/skins/oli-thinredhorizontal/right.png (added)
-
tags/2.35/skins/oli-watermaster (added)
-
tags/2.35/skins/oli-watermaster/watermaster-bar.png (added)
-
tags/2.35/skins/oli-watermaster/watermaster-bottom.png (added)
-
tags/2.35/skins/oli-watermaster/watermaster-top.png (added)
-
tags/2.35/thermometer.php (added)
-
trunk/olimometer-class.php (modified) (2 diffs)
-
trunk/olimometer.php (modified) (16 diffs)
-
trunk/readme.txt (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
olimometer/trunk/olimometer-class.php
r575927 r601490 25 25 public $olimometer_font_height = 8; 26 26 public $olimometer_suffix = ""; 27 //public $olimometer_skin = 0;28 27 public $olimometer_skin_slug = "oli-default"; 29 28 public $olimometer_use_paypal = 0; … … 62 61 $this->olimometer_font_height = $query_results['olimometer_font_height']; 63 62 $this->olimometer_suffix = $query_results['olimometer_suffix']; 64 //$this->olimometer_skin = $query_results['olimometer_skin'];65 63 $this->olimometer_skin_slug = $query_results['olimometer_skin_slug']; 66 64 $this->olimometer_use_paypal = $query_results['olimometer_use_paypal']; -
olimometer/trunk/olimometer.php
r575927 r601490 6 6 Author: Oliver Shingler 7 7 Author URI: http://www.olivershingler.co.uk 8 Version: 2.3 58 Version: 2.36 9 9 */ 10 10 … … 54 54 $new_olimometer->olimometer_description = $_REQUEST['olimometer_description']; 55 55 $new_olimometer->save(); 56 //update_option("olimometer_last", $new_olimometer->olimometer_id);57 56 update_olimometer_last($new_olimometer->olimometer_id); 58 57 } … … 70 69 $dead_olimometer->load($_REQUEST['olimometer_id']); 71 70 $dead_olimometer->delete(); 72 //update_option("olimometer_last", 1);73 71 update_olimometer_last(1); 74 72 } … … 78 76 if (isset($_REQUEST['olimometer_load'])) { 79 77 // Which one? 80 //update_option("olimometer_last", $_REQUEST['olimometer_id']);81 78 update_olimometer_last($_REQUEST['olimometer_id']); 82 79 } … … 124 121 $an_olimometer = new Olimometer(); 125 122 $an_olimometer->olimometer_id = $current_olimometer_id; 126 127 128 129 130 123 131 124 // Get values from form and dump in to the object 132 125 $an_olimometer->olimometer_description = $_REQUEST['olimometer_description']; … … 221 214 <?php 222 215 // Load the olimometer values: 223 //$current_olimometer_id = 1; // Hard coded for the moment224 216 // If we are being asked to load a particular Olimometer's settings 225 217 if (isset($_REQUEST['olimometer_load'])) { 226 218 // Which one? 227 //update_option("olimometer_last", $_REQUEST['olimometer_id']);228 219 update_olimometer_last($_REQUEST['olimometer_id']); 229 220 $current_olimometer_id = $_REQUEST['olimometer_id']; … … 231 222 } 232 223 else { 233 //if(get_option("olimometer_last") == 0)234 224 if(get_olimometer_last() == 0) 235 225 { … … 237 227 } 238 228 else { 239 //$current_olimometer_id = get_option("olimometer_last");240 229 $current_olimometer_id = get_olimometer_last(); 241 230 } … … 249 238 250 239 echo '<div class="icon32" id="icon-options-general"><br></div><h2>Olimometer - '.$current_olimometer->olimometer_description.'</h2>'; 251 252 253 254 255 256 240 257 241 ?> … … 304 288 echo '<a href="#OtherInformation">Other Information</a></p>'; 305 289 306 307 308 // global $wpdb;309 //$table_name = $wpdb->prefix . "olimometer_olimometers";310 //echo $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $table_name;" ) );311 290 ?> 312 291 </div> … … 544 523 <?php 545 524 // Import list of Olimometer skins from XML file 546 //$olimometer_skin_xml_file = WP_PLUGIN_DIR."/".plugin_basename(dirname(__FILE__).'/skins.xml');547 //$olimometer_skin_xml_file = get_option("olimometer_skins_location")."skins.xml";548 //echo $olimometer_skin_xml_file;549 //$olimometer_skins_location = get_option("olimometer_skins_location");550 //$olimometer_skins_custom_location = get_option("olimometer_skins_custom_location");551 525 include_once('skins.php'); 552 526 … … 556 530 $olimometer_skins->load(); 557 531 558 //$olimometer_current_skin=0;559 532 $olimometer_skin_names = array(); 560 //$olimometer_skin_slugs = array();561 533 $olimometer_skin_names = $olimometer_skins->get_skin_names(); 562 //$olimometer_skin_slugs = olimometer_get_skin_slugs();563 534 564 535 // Loop around each skin name and display in a drop-down list … … 568 539 echo " selected"; 569 540 } 570 echo ">".$olimometer_skin_name["skin_name"]."</option>"; 571 //$olimometer_current_skin++; 541 echo ">".$olimometer_skin_name["skin_name"]."</option>"; 572 542 } 573 543 … … 686 656 <p class="submit"><input type="submit" class="button-primary" name="olimometer_submit" value="Save Changes" /></p> 687 657 <?php 688 //echo '<input id="old" type="hidden" value="'.get_option("olimometer_progress").'">';689 658 echo '</form>'; 690 659 … … 910 879 echo '<div class="wrap">'; 911 880 912 //if(strlen(get_option("olimometer_last")) > 0)913 881 if(strlen(get_olimometer_last()) > 0) 914 882 { 915 //$current_olimometer_id = get_option("olimometer_last");916 883 $current_olimometer_id = get_olimometer_last(); 917 884 } … … 973 940 </p> 974 941 <p><input type="submit" class="button-primary" name="olimometer_dw_submit" value="Update" /> 975 <?php 976 //echo '<input id="old" type="hidden" value="'.get_option("olimometer_progress").'">'; 977 ?> 978 979 980 942 981 943 <a href='options-general.php?page=olimometer_manage'>Settings</a> 982 944 <?php -
olimometer/trunk/readme.txt
r575927 r601490 105 105 == Changelog == 106 106 107 = 2.36 = 108 * Tidy up of code 109 107 110 = 2.35 = 108 111 * You can now customise the image's hyperlink … … 220 223 == Upgrade Notice == 221 224 225 = 2.36 = 226 * Tidy up of code 227 222 228 = 2.35 = 223 229 * You can now customise the image's hyperlink
Note: See TracChangeset
for help on using the changeset viewer.