WD Google Analytics - Version 1.0.20

Version Description

  • Fixed: Admin styles conflict because of bootstrap.css
Download this release

Release Info

Developer webdorado
Plugin Icon 128x128 WD Google Analytics
Version 1.0.20
Comparing to
See all releases

Code changes from version 1.0.19 to 1.0.20

Files changed (4) hide show
  1. gawd_class.php +10 -6
  2. google-analytics-wd.php +2 -2
  3. inc/css/gawd_admin.css +55 -1
  4. readme.txt +6 -3
gawd_class.php CHANGED
@@ -593,11 +593,13 @@ class GAWD
593
  wp_enqueue_style('timepicker_css', GAWD_URL . '/inc/css/jquery.timepicker.css', false, GAWD_VERSION);
594
  wp_enqueue_style('admin_css', GAWD_URL . '/inc/css/gawd_admin.css', false, GAWD_VERSION);
595
  wp_enqueue_style('gawd_licensing', GAWD_URL . '/inc/css/gawd_licensing.css', false, GAWD_VERSION);
596
- wp_enqueue_style('font_awesome', GAWD_URL . '/inc/css/font_awesome.css', false, GAWD_VERSION);
597
  wp_enqueue_style('jquery-ui.css', GAWD_URL . '/inc/css/jquery-ui.css', false, GAWD_VERSION);
598
- wp_enqueue_style('gawd_bootstrap', GAWD_URL . '/inc/css/bootstrap.css', false, GAWD_VERSION);
599
- wp_enqueue_style('gawd_bootstrap-chosen', GAWD_URL . '/inc/css/bootstrap-chosen.css', false, GAWD_VERSION);
600
- wp_enqueue_style('gawd_bootstrap-select', GAWD_URL . '/inc/css/bootstrap-select.css', false, GAWD_VERSION);
 
 
601
  wp_enqueue_style('gawd_datepicker', GAWD_URL . '/inc/css/daterangepicker.css', false, GAWD_VERSION);
602
  wp_enqueue_style('ui.jqgrid.css', GAWD_URL . '/inc/css/ui.jqgrid.css', false, GAWD_VERSION);
603
  wp_enqueue_script('gawd_moment', GAWD_URL . '/inc/js/moment.min.js', false, GAWD_VERSION);
@@ -621,8 +623,10 @@ class GAWD
621
  wp_enqueue_script('timepicker_js', GAWD_URL . '/inc/js/jquery.timepicker.min.js', array('jquery'), GAWD_VERSION);
622
  wp_enqueue_script('admin_js', GAWD_URL . '/inc/js/gawd_admin.js', array('jquery'), GAWD_VERSION);
623
  wp_enqueue_script('chosen.jquery.js', GAWD_URL . '/inc/js/chosen.jquery.js', array('jquery'), GAWD_VERSION);
624
- wp_enqueue_script('bootstrap_js', GAWD_URL . '/inc/js/bootstrap_js.js', array('jquery'), GAWD_VERSION);
625
- wp_enqueue_script('bootstrap-select', GAWD_URL . '/inc/js/bootstrap-select.js', array('jquery'), GAWD_VERSION);
 
 
626
  wp_enqueue_script('highlight_js', GAWD_URL . '/inc/js/js_highlight.js', array('jquery'), GAWD_VERSION);
627
  wp_enqueue_script('settings_js', GAWD_URL . '/inc/js/gawd_settings.js', array('jquery'), GAWD_VERSION);
628
  wp_enqueue_script('overview', GAWD_URL . '/inc/js/gawd_overview.js', array('jquery'), GAWD_VERSION);
593
  wp_enqueue_style('timepicker_css', GAWD_URL . '/inc/css/jquery.timepicker.css', false, GAWD_VERSION);
594
  wp_enqueue_style('admin_css', GAWD_URL . '/inc/css/gawd_admin.css', false, GAWD_VERSION);
595
  wp_enqueue_style('gawd_licensing', GAWD_URL . '/inc/css/gawd_licensing.css', false, GAWD_VERSION);
596
+ wp_enqueue_style('font-awesome', GAWD_URL . '/inc/css/font_awesome.css', false, GAWD_VERSION);
597
  wp_enqueue_style('jquery-ui.css', GAWD_URL . '/inc/css/jquery-ui.css', false, GAWD_VERSION);
598
+ if(strpos( $screen->post_type, 'page' ) === false && strpos( $screen->post_type, 'post' ) === false && strpos( $screen->base, 'edit' ) === false ){
599
+ wp_enqueue_style( 'gawd_bootstrap', GAWD_URL . '/inc/css/bootstrap.css', false, GAWD_VERSION );
600
+ wp_enqueue_style( 'gawd_bootstrap-chosen', GAWD_URL . '/inc/css/bootstrap-chosen.css', false, GAWD_VERSION );
601
+ wp_enqueue_style( 'gawd_bootstrap-select', GAWD_URL . '/inc/css/bootstrap-select.css', false, GAWD_VERSION );
602
+ }
603
  wp_enqueue_style('gawd_datepicker', GAWD_URL . '/inc/css/daterangepicker.css', false, GAWD_VERSION);
604
  wp_enqueue_style('ui.jqgrid.css', GAWD_URL . '/inc/css/ui.jqgrid.css', false, GAWD_VERSION);
605
  wp_enqueue_script('gawd_moment', GAWD_URL . '/inc/js/moment.min.js', false, GAWD_VERSION);
623
  wp_enqueue_script('timepicker_js', GAWD_URL . '/inc/js/jquery.timepicker.min.js', array('jquery'), GAWD_VERSION);
624
  wp_enqueue_script('admin_js', GAWD_URL . '/inc/js/gawd_admin.js', array('jquery'), GAWD_VERSION);
625
  wp_enqueue_script('chosen.jquery.js', GAWD_URL . '/inc/js/chosen.jquery.js', array('jquery'), GAWD_VERSION);
626
+ if(strpos( $screen->post_type, 'page' ) === false && strpos( $screen->post_type, 'post' ) === false && strpos( $screen->base, 'edit' ) === false ){
627
+ wp_enqueue_script('bootstrap_js', GAWD_URL . '/inc/js/bootstrap_js.js', array('jquery'), GAWD_VERSION);
628
+ wp_enqueue_script('bootstrap-select', GAWD_URL . '/inc/js/bootstrap-select.js', array('jquery'), GAWD_VERSION);
629
+ }
630
  wp_enqueue_script('highlight_js', GAWD_URL . '/inc/js/js_highlight.js', array('jquery'), GAWD_VERSION);
631
  wp_enqueue_script('settings_js', GAWD_URL . '/inc/js/gawd_settings.js', array('jquery'), GAWD_VERSION);
632
  wp_enqueue_script('overview', GAWD_URL . '/inc/js/gawd_overview.js', array('jquery'), GAWD_VERSION);
google-analytics-wd.php CHANGED
@@ -4,7 +4,7 @@
4
  * Plugin Name: Google Analytics
5
  * Plugin URI: https://web-dorado.com/products/wordpress-google-analytics-plugin.html
6
  * Description: Google Analytics WD is a user-friendly all in one plugin, which allows to manage and monitor your website analytics from WordPress dashboard.
7
- * Version: 1.0.19
8
  * Author: WebDorado
9
  * Author URI: https://web-dorado.com
10
  * License: GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
@@ -26,7 +26,7 @@ if (!defined('GAWD_INC')) {
26
  }
27
 
28
  if (!defined('GAWD_VERSION')) {
29
- define('GAWD_VERSION', '1.0.19');
30
  }
31
 
32
 
4
  * Plugin Name: Google Analytics
5
  * Plugin URI: https://web-dorado.com/products/wordpress-google-analytics-plugin.html
6
  * Description: Google Analytics WD is a user-friendly all in one plugin, which allows to manage and monitor your website analytics from WordPress dashboard.
7
+ * Version: 1.0.20
8
  * Author: WebDorado
9
  * Author URI: https://web-dorado.com
10
  * License: GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
26
  }
27
 
28
  if (!defined('GAWD_VERSION')) {
29
+ define('GAWD_VERSION', '1.0.20');
30
  }
31
 
32
 
inc/css/gawd_admin.css CHANGED
@@ -1898,7 +1898,7 @@ Original highlight.js style (c) Ivan Sagalaev <maniac@softwaremaniacs.org>
1898
  float:left
1899
  }
1900
  #gawd_page_post_meta .gawd_content{
1901
- width:21%
1902
  }
1903
  .gawd_menu_coteiner_collapse{
1904
  width: 3.8%;
@@ -2664,4 +2664,58 @@ th.ui-th-column div{
2664
  font-size: 14px;
2665
  display: inline-block;
2666
  vertical-align: middle;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
2667
  }
1898
  float:left
1899
  }
1900
  #gawd_page_post_meta .gawd_content{
1901
+ width:25%
1902
  }
1903
  .gawd_menu_coteiner_collapse{
1904
  width: 3.8%;
2664
  font-size: 14px;
2665
  display: inline-block;
2666
  vertical-align: middle;
2667
+ }
2668
+ #gawd_page_post_meta .caret {
2669
+ display: inline-block;
2670
+ width: 0;
2671
+ height: 0;
2672
+ margin-left: 6px;
2673
+ vertical-align: middle;
2674
+ border-top: 4px dashed;
2675
+ border-top: 4px solid \9;
2676
+ border-right: 4px solid transparent;
2677
+ border-left: 4px solid transparent;
2678
+ }
2679
+ #gawd_page_post_meta select{
2680
+ margin: 0;
2681
+ font: inherit;
2682
+ color: inherit;
2683
+ }
2684
+ .daterangepicker .btn {
2685
+ display: inline-block;
2686
+ padding: 5px 10px;
2687
+ line-height: 30px;
2688
+ height: 30px !important;
2689
+ width: 100%;
2690
+ margin-bottom: 0;
2691
+ font-size: 12px;
2692
+ font-weight: normal;
2693
+ line-height: 1.5;
2694
+ text-align: center;
2695
+ white-space: nowrap;
2696
+ vertical-align: middle;
2697
+ -ms-touch-action: manipulation;
2698
+ touch-action: manipulation;
2699
+ cursor: pointer;
2700
+ -webkit-user-select: none;
2701
+ -moz-user-select: none;
2702
+ -ms-user-select: none;
2703
+ user-select: none;
2704
+ background-image: none;
2705
+ border: 1px solid transparent;
2706
+ border-radius: 3px;
2707
+ }
2708
+ .daterangepicker .btn:active, .daterangepicker .btn.active {
2709
+ background-image: none;
2710
+ outline: 0;
2711
+ -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
2712
+ box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
2713
+ }
2714
+ .daterangepicker .btn-default {
2715
+ color: #333;
2716
+ background-color: #fff;
2717
+ border-color: #ccc;
2718
+ }
2719
+ .daterangepicker{
2720
+ display:none;
2721
  }
readme.txt CHANGED
@@ -4,7 +4,7 @@ Donate link: https://web-dorado.com/products/wordpress-google-analytics-plugin.h
4
  Tags: google analytics, statistics, tracking, analytics dashboard, ga, google analytics dashboard, analytics, stats, googleanalytics, ecommerce tracking, custom reports, custom dimensions
5
  Requires at least: 3.9
6
  Tested up to: 4.8
7
- Stable tag: 1.0.19
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -104,10 +104,13 @@ Upgrade to Google Analytics WD Pro for premium features:
104
 
105
  == Changelog ==
106
 
 
 
 
107
  = 1.0.19 =
108
- * Fixed: Error on PHP4
109
  * Fixed: Style conflict with jquery-ui.css
110
- * Changed: Show web-property related message only in analytics page
111
 
112
  = 1.0.18 =
113
  * Fixed: Bug on city/pageview report
4
  Tags: google analytics, statistics, tracking, analytics dashboard, ga, google analytics dashboard, analytics, stats, googleanalytics, ecommerce tracking, custom reports, custom dimensions
5
  Requires at least: 3.9
6
  Tested up to: 4.8
7
+ Stable tag: 1.0.20
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
104
 
105
  == Changelog ==
106
 
107
+ = 1.0.20 =
108
+ * Fixed: Admin styles conflict because of bootstrap.css
109
+
110
  = 1.0.19 =
111
+ * Changed: Show web-property-related message only in analytics page
112
  * Fixed: Style conflict with jquery-ui.css
113
+ * Fixed: Error on PHP4
114
 
115
  = 1.0.18 =
116
  * Fixed: Bug on city/pageview report