Changeset 1031076

Timestamp:

11/23/2014 07:53:55 AM (11 years ago)

Author:

nicolasfox

Message:

fixed gomajo namepspace clash. changed to bootstrap container-fluid. fixed buttons

Location:

gps-tracker/trunk

Files:

• gpstracker.php (modified) (2 diffs)
• includes/class-gpstracker-template-loader.php (modified) (2 diffs)
• public/assets/css/light.css (modified) (5 diffs)
• public/assets/js/gpstracker-map.js (modified) (3 diffs)
• public/class-gpstracker.php (modified) (3 diffs)
• readme.txt (modified) (3 diffs)
• templates/shortcode-gpstracker-map.php (modified) (2 diffs)

gps-tracker/trunk/gpstracker.php

@@ -13 +13 @@
  * Plugin URI:        https://www.websmithing.com/gps-tracker
  * Description:       Track your Android cell phone in real time and store routes for later viewing.
- * Version:           1.0.1
+ * Version:           1.0.2
  * Author:            Nick Fox
  * Author URI:        https://www.websmithing.com/hire-me
@@ -28 +28 @@
 // Plugin version
 if ( ! defined( 'GPSTRACKER_VERSION' ) ) {
-    define( 'GPSTRACKER_VERSION', '1.0.1' );
+    define( 'GPSTRACKER_VERSION', '1.0.2' );
 }
 

gps-tracker/trunk/includes/class-gpstracker-template-loader.php

@@ -1 +1 @@
 <?php
 /**
- * Handles loading locating and loading template files, extends Gamajo_Template_Loader class
+ * Handles loading locating and loading template files, extends GpsTracker_Gamajo_Template_Loader class
  *
  * @package   Gps_Tracker
@@ -19 +19 @@
  * @since 1.0.0
  */
-class GpsTracker_Template_Loader extends Gamajo_Template_Loader {
+class GpsTracker_Template_Loader extends GpsTracker_Gamajo_Template_Loader {
 
     /**

gps-tracker/trunk/public/assets/css/light.css

@@ -1 +1 @@
 
-.container {
+.container-fluid {
     background-color: #66ff99;
     border: 1px solid #000;
@@ -72 +72 @@
     margin-top:5px;
     width: 100%;
+    height: 37px;
     color: #000;  
     border: 1px solid #000;
@@ -81 +82 @@
     margin-top:5px;       
     width: 100%;
+    height: 37px;
     color: #000;
     border: 1px solid #000;                         
@@ -89 +91 @@
     margin-top:5px;      
     width: 100%;
+    height: 37px;    
     color: #000;   
     border: 1px solid #000;
@@ -97 +100 @@
     margin-top:5px;      
     width: 100%;
+    height: 37px;    
     color: #000;   
     border: 1px solid #000;

gps-tracker/trunk/public/assets/js/gpstracker-map.js

@@ -2 +2 @@
     var pluginUrl = map_js_vars.plugin_url;
     var selectRoute = document.getElementById('selectRoute');
-    var map = document.getElementById('map-canvas');
-    //var gpstrackerMap;    
+    var map = document.getElementById('map-canvas');  
     var intervalID = 0;
     var zoom = 12; 
@@ -399 +398 @@
     function turnOffAutoRefresh() {
         showMessage('Auto Refresh Off');
-        $('#autorefresh').val('Auto Refresh - Off');
+        $('#autorefresh').val('Auto Refresh Off');
     
         autoRefresh = false;
@@ -407 +406 @@
     function turnOnAutoRefresh() {    
         showMessage('Auto Refresh On (1 min)'); 
-        $('#autorefresh').val('Auto Refresh - On');
+        $('#autorefresh').val('Auto Refresh On');
         autoRefresh = true;
 

gps-tracker/trunk/public/class-gpstracker.php

@@ -29 +29 @@
      * @var string
      */
-    const VERSION = '1.0.0';
+    const VERSION = '1.0.2';
 
     /**
@@ -149 +149 @@
      */
     private function includes() {
-        require_once GPSTRACKER_PLUGIN_DIR . 'includes/class-gamajo-template-loader.php';
+        require_once GPSTRACKER_PLUGIN_DIR . 'includes/class-gpstracker-gamajo-template-loader.php';
         require_once GPSTRACKER_PLUGIN_DIR . 'includes/class-gpstracker-template-loader.php';
         require_once GPSTRACKER_PLUGIN_DIR . 'public/includes/class-gpstracker-ajax.php';
@@ -198 +198 @@
    
         wp_enqueue_style( $this->plugin_slug . '-leaflet-styles', plugins_url( 'assets/js/leaflet-0.7.3/leaflet.css', __FILE__ ), array(), self::VERSION );              
-        wp_enqueue_style('gpstracker-bootstrap', '//maxcdn.bootstrapcdn.com/bootswatch/3.2.0/superhero/bootstrap.min.css', false, '3.2.0', 'all');
+        wp_enqueue_style('gpstracker-bootstrap', '//maxcdn.bootstrapcdn.com/bootswatch/3.3.0/superhero/bootstrap.min.css', false, '3.3.0', 'all');
         wp_enqueue_style( $this->plugin_slug . '-light-styles', plugins_url( 'assets/css/light.css', __FILE__ ), array(), self::VERSION ); 
     }

gps-tracker/trunk/readme.txt

@@ -7 +7 @@
 Requires at least: 4.0
 Tested up to: 4.0
-Stable tag: 1.0.1
+Stable tag: 1.0.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -67 +67 @@
 == Changelog ==
 
+= 1.0.2, November 22, 2014 =
+
+* renamed Gamajo_Template_Loader to GpsTracker_Gamajo_Template_Loader to avoid namespace clashes with other plugins
+* changed from bootstrap container to container-fluid
+* added height to buttons
+
 = 1.0.1, November 10, 2014 =
 
@@ -78 +84 @@
 == Upgrade Notice ==
 
+= 1.0.2, November 22, 2014 =
+
+* renamed Gamajo_Template_Loader to GpsTracker_Gamajo_Template_Loader to avoid namespace clashes with other plugins
+* changed from bootstrap container to container-fluid
+* added height to buttons
+
 = 1.0.1, November 10, 2014 =
 

gps-tracker/trunk/templates/shortcode-gpstracker-map.php

@@ -1 @@
-<div class="container">
+<div class="container-fluid">
     <div class="row">
         <div class="col-sm-4" id="toplogo">
@@ -21 +21 @@
         </div>
         <div class="col-sm-3 autorefreshdiv">
-            <input type="button" id="autorefresh" value="Auto Refresh - Off" class=" btn-custom" tabindex="3">
+            <input type="button" id="autorefresh" value="Auto Refresh Off" class=" btn-custom" tabindex="3">
         </div>
         <div class="col-sm-3 refreshdiv">