Updating to 1.1

Author: Darren Cooney

README.md

@@ -1,11 +1,20 @@
-# wordpress-easy-query
-Create complex WordPress queries in seconds - it's that easy!
+# Easy Query
+Easy Query is the fastest and simplest way to build WordPress queries without writing a single line of code. 
 
 The Easy Query WordPress plugin is the fastest and simplest way to build complex WordPress queries without touching a single line of code.
 Simply adjust the Query Builder parameters to create a custom easy_query shortcode and custom WP_Query for use on your pages and templates.
 
-Get more information and view live examples at http://connekthq.com/plugins/easy-query/
+Get more information and view live examples at https://connekthq.com/plugins/easy-query/
 
 ##WordPress.org
 Easy Query is available as an installed plugin on [wordpress.org](https://wordpress.org/plugins/easy-query/). 
 Please download the latest stable version from your WordPress plugins dashboard by searching for Easy Query or visiting https://wordpress.org/plugins/easy-query/.
+
+##Easy Query Pro
+Upgrade to [Easy Query Pro](https://connekthq.com/plugins/easy-query/) and get these added features and more.
+
+1. Unlimited Templates - Create, modify and delete repeater templates as you need them with absolutely zero restrictions.
+2. Saved Queries - Save, edit and delete past queries using the custom query editor.
+3. Additional Query Arguments - Unlock additional query parameters such a taxonomy and custom fields.
+4. Multisite Compatibility - Install and manage Easy Query templates and queries across multiple sites in your network.
+5. Support - Get unlimited support and technical assistance for 1 year.

easy-query/README.txt

@@ -1,17 +1,20 @@
-=== Easy Query ===
+=== Easy Query - A Query Builder Plugin===
 Contributors: dcooney
 Donate link: https://connekthq.com/donate/
 Tags: query, query builder, wp_query, save query, query generator, generator, paging, paged, shortcode builder, shortcode, tags, category, post types, taxonomy, meta_query
 Requires at least: 3.7
-Tested up to: 4.3
-Stable tag: 1.0.3
+Tested up to: 4.5.3
+Stable tag: 1.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
-Easy Query is the fastest and simplest way to build WordPress queries without touching a single line of code.
+Easy Query is the fastest and simplest way to build WordPress queries without writing a single line of code.
 
 == Description ==
 
+As of October 21st, 2015 the free version **Easy Query** will no longer be supported.
+The plugin will continue to function as usual, however anyone wishing to receive updates and new features is encouraged to upgrade to [Easy Query Pro](https://connekthq.com/plugins/easy-query/).
+
 Create complex queries using our Custom Query Builder then add the generated shortcode to your pages via the content editor or directly into your template files using our WP_Query Generator.
 
 
@@ -39,16 +42,9 @@ Easy Query accepts a number of parameters that are passed to the WordPress query
 *   **category__not_in** - A comma separated list of categories to exclude by ID. Default = null
 *   **tag__in** - A comma separated list of tags to include by ID. Default = null
 *   **tag__not_in** - A comma separated list of tags to exclude by ID. Default = null
-*   **taxonomy** - Query by custom taxonomy name. Default = null
-*   **taxonomy_terms** - Comma separated list of custom taxonomy terms(slug). Default = null
-*   **taxonomy_operator** - Operator to compare Taxonomy Terms against (IN/NOT IN). Default = ‘IN’
 *   **day** - Day of the week. Default = null
 *   **month** - Month of the year. Default = null
 *   **year** - Year of post. Default = null
-*   **taxonomy_operator** - Operator to compare Taxonomy Terms against (IN/NOT IN). Default = ‘IN’
-*   **meta_key** - Custom field key(name). Default = null
-*   **meta_value** - Custom field value. Default = null
-*   **meta_compare** - Operator to compare meta_key and meta_value against (IN/NOT IN/=/!=/>/>=/</<= etc.). Default = ‘IN’
 *   **author** - Query by author id. Default = null
 *   **search** - Query search term (‘s’). Default = null
 *   **post__in** - Comma separated list of post ID’s to include in query. Default = null 
@@ -157,6 +153,9 @@ How to install Easy Query.
 
 == Changelog ==
 
+= 1.1 =
+* NEWS - As of October 21st, 2015 the free version Easy Query will no longer be supported. 
+
 = 1.0.3 =
 * Security Update - We have added an extra layer of security verification around the saving of custom templates. 
 

easy-query/admin/admin.php

@@ -145,8 +145,8 @@ function ewpq_admin_menu() {
 
    $ewpq_go_pro_page = add_submenu_page( // Go Pro
       'easy-query', 
-      'Pro', 
-      '<span style="color: #e1e0f5;font-weight: 700;">Pro<span>', 
+      'Upgrade to Pro', 
+      '<span style="font-weight: 700;">&raquo; Upgrade to Pro<span>', 
       'edit_theme_options', 
       'easy-query-go-pro', 
       'ewpq_go_pro_page'
@@ -219,7 +219,6 @@ function ewpq_enqueue_admin_scripts(){
    wp_enqueue_script( 'ewpq-drops', EWPQ_ADMIN_URL. 'js/libs/jquery.drops.js', array( 'jquery' ));
    wp_enqueue_script( 'ewpq-admin', EWPQ_ADMIN_URL. 'js/admin.js', array( 'jquery' ));
    wp_enqueue_script( 'ewpq-shortcode-builder', EWPQ_ADMIN_URL. 'shortcode-builder/js/shortcode-builder.js', array( 'jquery' ));
-   wp_enqueue_script( 'ewpq-query-genertor', EWPQ_ADMIN_URL. 'query-generator/js/query-generator.js', array( 'jquery' ), false);
 }
 
 

easy-query/admin/css/admin.css

@@ -1,6 +1,20 @@
 @import url(https://fonts.googleapis.com/css?family=Open+Sans:400,700,600);
 
-
+.eq-callout{
+	background-color: #fffde1;
+	border: 1px solid #e4e2cf;
+	padding: 15px;
+	display: block;
+	margin: 0 0 20px;
+	color: #444;
+	line-height: 1.55;
+}
+.eq-callout span{
+	display: block;
+	font-size: 18px;	
+	line-height: 1.2;
+	padding: 0 0 10px;
+}
 /* Saved Query Listing */
 ul.query-list{
    margin: 0 !important;
@@ -116,10 +130,12 @@ ul.query-list{
 
 /* Save Query */
 
-.cnkt .save-query-wrap{
+.cnkt .save-query-wrap,
+.query-builder-preview{
    position: relative;
 }
-.cnkt .save-query-wrap .cover{
+.cnkt .save-query-wrap .cover,
+.query-builder-preview .cover{
    position: absolute;
    left: 0;
    top: 0;
@@ -130,7 +146,8 @@ ul.query-list{
    padding: 0 14px;
    text-align: center;
 }
-   .cnkt .save-query-wrap .cover span{
+   .cnkt .save-query-wrap .cover span,
+   .query-builder-preview .cover span{
       font-size: 13px;
       font-weight: 600;
       text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.5);
@@ -291,7 +308,7 @@ ul.query-list{
 	margin:0 0 15px;
 }
    .cnkt p.lg{
-      font-size: 20px;
+      font-size: 22px;
       font-weight: 300;
    }
 
@@ -632,6 +649,10 @@ ul.query-list{
    font-style: italic;
 }
 
+.cnkt input[type=number]{
+	line-height: 1;
+	height: auto;
+}
 .cnkt input[type=text],
 .cnkt input[type=number],
 .cnkt textarea{
@@ -1077,11 +1098,13 @@ ul.query-list{
 	padding-top: 11px;
 	max-width: 75%;
 }
+	.cnkt .header-wrap h1,
 	.cnkt .header-wrap h2{
 		padding-top: 0;
-		font-size: 26px;
+		font-size: 24px;
 	}
-	.cnkt .header-wrap h2 + p{
+	.cnkt .header-wrap h2 + p,
+	.cnkt .header-wrap h1 + p{
 		margin-top: -3px;
 		opacity: 0.8;
 	}
@@ -1286,24 +1309,30 @@ table.highlight{
 #ewpq-add-ons .group{
    overflow: hidden;
 }
-#ewpq-add-ons .row .wrap{
-   padding-bottom: 60px;
-   width: 55%;
+.go-eq-pro ol li h3{
+	font-size: 14px;
+	font-weight: 700;
 }
-#ewpq-add-ons .section-title{
-   width: 45%;
-   padding: 0;
+.go-eq-pro ol li p{
+	font-size: 13px;
 }
+
 #ewpq-add-ons .group .section-title p{
    padding-left: 0 !important;
 }
 #ewpq-add-ons .group a.btn{
-   position: absolute;
-   bottom: 20px;
-   right: 20px;
+	float: left;
    font-size: 14px;
-   padding: 8px 14px;
+   padding: 12px 24px 12px 20px;
    display: block;
+   margin: 10px 0 15px;
+}
+
+.pro-updates{
+	display: block;
+	padding: 40px 0 0;
+	border-top: 1px solid #efefef;
+	overflow: hidden;
 }
 
 /* Add-on Callout! */
@@ -2104,7 +2133,7 @@ table.highlight{
    .cnkt .section-title,
    .cnkt .row .wrap{
       clear: both;
-      width: 100%;
+      width: 100% !important;
       display: block;
       float: none;
       padding: 10px;

easy-query/admin/img/generator-preview.jpg

@@ -1,27 +1,13 @@
 <div class="cta padding-bottom">
 	<h3>Other Projects</h3>
 	<div class="cta-wrap">
-   	<?php
-   	// Parse JSON feed on dashboard
-   	function get_about_data($url) {
-   		$ch = curl_init();
-   		$timeout = 5;
-   		curl_setopt($ch, CURLOPT_URL, $url);
-   		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-   		curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $timeout);
-   		$data = curl_exec($ch);
-   		curl_close($ch);
-   		return $data;
-   	}		     
-   	$about_url = 'http://download.connekthq.com/easy-wp-query/projects.json';
-   	$about_json = json_decode(get_about_data($about_url));
-   	print "<ul>";
-   	foreach($about_json->data->links as $item) {
-   		print '<li><strong><a target="blank" href="'. $item->url .'">'. $item->title .'</a></strong><br>'. $item->description .'</li>';
-   	}
-   	print "</ul>";
-   	?>	
+   	<ul>
+      	<li><strong><a target="blank" href="https://connekthq.com/plugins/easy-query/">Ajax Load More</a></strong><br>A powerful plugin to add infinite scroll functionality to your website.</li>
+   		<li><strong><a target="blank" href="https://connekthq.com/plugins/velocity/">Velocity</a></strong><br>Improve website performance by lazy loading and customizing your embedded media with Velocity.</li>
+   		<li><strong><a target="blank" href="https://connekthq.com/plugins/unsplash-wp/">Unsplash WP</a></strong><br>The fastest way to upload high quality stock photos from unsplash.com directly to your media library.</li>
+   		<li><strong><a target="blank" href="https://connekthq.com">Connekt Media</a></strong><br>A digital creation company.</li>
+   	</ul>
    	</div>
-	<a href="http://twitter.com/kaptonkaos" target="blank" class="visit"><i class="fa fa-twitter"></i> Follow on Twitter</a>
+	<a href="http://twitter.com/connekthq" target="blank" class="visit"><i class="fa fa-twitter"></i> Follow on Twitter</a>
 </div>
 

easy-query/admin/includes/cta/about.php

@@ -1,6 +1,9 @@
 <div class="cta">
 	<h3><?php _e('About the Plugin', EWPQ_NAME); ?></h3>
 	<div class="cta-wrap config">
+		<div class="eq-callout" style="display: none;">
+			<span>As of October 21st, 2015 the free version <strong>Easy Query</strong> will no longer be supported.</span>The plugin will continue to function as usual, however anyone wishing to receive updates and new features is encouraged to upgrade to <a href="https://connekthq.com/plugins/easy-query/" target="_blank"><strong>Easy Query Pro</strong></a>.
+		</div>
 		<p class="lg">Easy Query is the fastest and simplest way to build complex WordPress queries without touching a single line of code.</p>
 		<p>Create your queries using our <a href="?page=easy-query-custom-query-builder">Custom Query Builder</a> then place the generated Shortcode or <a href="http://codex.wordpress.org/Class_Reference/WP_Query" target="_blank">WP_Query</a> PHP output directly into your theme templates, content editor or widget area. </p>
 		<div class="spacer"></div>

easy-query/admin/includes/cta/config.php

@@ -1,27 +1,10 @@
 <div class="cta">
 	<h3><?php _e('Help/Resources', EWPQ_NAME); ?></h3>
 	<div class="cta-wrap">
-   	<?php
-   			
-   		// Parse help/resources JSON feed on dashboard     
-        	function get_resource_data($url) {
-   			$ch = curl_init();
-   			$timeout = 5;
-   			curl_setopt($ch, CURLOPT_URL, $url);
-   			curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-   			curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $timeout);
-   			$data = curl_exec($ch);
-   			curl_close($ch);
-   			return $data;
-   		}		     
-   		$resource_url = 'http://download.connekthq.com/easy-wp-query/resources.json';
-   		$resource_json = json_decode(get_resource_data($resource_url));
-   		
-   		print "<ul>";
-   		foreach($resource_json->data->resource as $resource) {
-   			print '<li><a target="blank" href="'. $resource->url .'">'. $resource->title .'</a></li>';
-   		}
-   		print "</ul>";	
-   	?>
+   	<ul>
+      	<li><a href="https://connekthq.com/plugins/easy-query/">Official Website</a></li>
+      	<li><a href="https://wordpress.org/support/plugin/easy-query/">Plugin Support</a></li>
+      	<li><a href="https://connekthq.com/plugins/easy-query/pro/"><strong>Upgrade to Easy Query Pro</strong></a></li>
+   	</ul>
 	</div>
 </div>

easy-query/admin/includes/cta/resources.php

@@ -1,7 +1,11 @@
 <div class="cnkt-main">
-   <div class="group">
-      <p><?php _e('Copy and paste the following WP_Query into a <a href="http://codex.wordpress.org/Theme_Development#Template_Files" target="_blank">PHP template</a> within your WordPress theme.', EWPQ_NAME); ?></p>
-      <textarea id="query-output"></textarea>
+   <div class="group query-builder-preview">
+      <img src="<?php echo EWPQ_ADMIN_URL; ?>img/generator-preview.jpg">
+      <div class="cover">
+         <span>
+         View your generated WP_Query() with <a target="_parent" href="https://connekthq.com/plugins/easy-query/pro/">Easy Query Pro</a>
+         </span>
+      </div>
    </div>
 </div>
 <div class="cnkt-sidebar">