Merge pull request #15 from GuyPrimavera/v2.4

v2.4

aquila-admin-theme.php

@@ -5,15 +5,15 @@
  * Description: The Aquila Admin Theme
  * Author: Guy Primavera
  * Author URI: https://guyprimavera.com/
- * Version: 2.3
+ * Version: 2.4
  * Text Domain: aquila-admin-theme
  * Domain Path: /lang/
  * License: GPL2
  *
  * 2018 Guy Primavera
  */ 
 
-$aquilaVer = "2.3";
+$aquilaVer = "2.4";
 
 include ('scripts.php');
 include ('login/aquila-login-screen.php');

readme.txt

@@ -4,7 +4,7 @@ Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_i
 Tags: material design wordpress, material design admin theme, material design wordpress admin, material wordpress, admin theme, admin, admin panel, admin theme style plugin, admin-theme, admin theme, aquila, backend theme, clean admin, color scheme, colour scheme, custom admin theme, flat admin theme, free admin theme, modern admin theme, new admin ui, plugin, simple admin theme, white label, white label admin, wordpress, wordPress admin, wordpress admin theme, wp-admin, wp admin page, wp admin theme
 Requires at least: 4.0
 Tested up to: 5.0-beta4
-Stable tag: 2.3
+Stable tag: 2.4
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -83,6 +83,9 @@ No. It only changes the admin area, the login page and the admin bar for logged-
 
 == Changelog ==
 
+= 2.4 - 13/11/2018 =
+* Added versioning to loaded resources.
+
 = 2.3 - 13/11/2018 =
 * New admin bar with icon and hidden top-bar.
 * Added versioning for main JS file to allow easier updating of the plugin.

scripts.php

@@ -4,12 +4,13 @@
 // Global scripts
 function aquila_global_load_style() {
 	if ( is_admin_bar_showing() ) {
+		global $aquilaVer;
 		wp_enqueue_script("jquery");
-		wp_register_style( 'aquila-admin-icons', plugins_url( 'aquila-admin-theme/icons/style.css' ) );
+		wp_register_style( 'aquila-admin-icons', plugins_url( 'aquila-admin-theme/icons/style.css' ), array(), $aquilaVer );
 		wp_enqueue_style( 'aquila-admin-icons' );
-		wp_register_style( 'aquila-adminBar-style', plugins_url( 'aquila-admin-theme/css/adminBar.css' ) );
+		wp_register_style( 'aquila-adminBar-style', plugins_url( 'aquila-admin-theme/css/adminBar.css' ), array(), $aquilaVer );
 		wp_enqueue_style( 'aquila-adminBar-style' );
-		wp_register_script( 'aquilaCalls', plugins_url( '/js/calls.js', __FILE__ ), array('jquery'), '2.3', true );
+		wp_register_script( 'aquilaCalls', plugins_url( '/js/calls.js', __FILE__ ), array('jquery'), $aquilaVer, true );
 		wp_enqueue_script( 'aquilaCalls');
 	}
 }
@@ -19,7 +20,8 @@ function aquila_global_load_style() {
 
 // Admin scripts
 function aquila_admin_load_style() {
-	wp_register_style( 'aquila-admin-style', plugins_url( 'aquila-admin-theme/css/aquila.css' ) );
+	global $aquilaVer;
+	wp_register_style( 'aquila-admin-style', plugins_url( 'aquila-admin-theme/css/aquila.css' ), array(), $aquilaVer );
 	wp_enqueue_style( 'aquila-admin-style' );
 	wp_enqueue_style( 'wp-color-picker');
 	wp_enqueue_script( 'wp-color-picker');
@@ -35,9 +37,10 @@ function aquila_admin_load_style() {
 
 // Login scripts
 function aquila_login_load_style() {
-	wp_register_style( 'aquila-admin-icons', plugins_url( 'aquila-admin-theme/icons/style.css' ) );
+	global $aquilaVer;
+	wp_register_style( 'aquila-admin-icons', plugins_url( 'aquila-admin-theme/icons/style.css' ), array(), $aquilaVer );
 	wp_enqueue_style( 'aquila-admin-icons' );
-	wp_register_style( 'aquila-login-style', plugins_url( 'aquila-admin-theme/css/login.css' ) );
+	wp_register_style( 'aquila-login-style', plugins_url( 'aquila-admin-theme/css/login.css' ), array(), $aquilaVer );
 	wp_enqueue_style( 'aquila-login-style' );
 }
 add_action( 'login_enqueue_scripts', 'aquila_login_load_style' );