From 1878ebb98be27b49e91060a641fa449273b9e028 Mon Sep 17 00:00:00 2001
From: Marcus Quinn <marcus@agentdesign.co.uk>
Date: Mon, 17 Mar 2025 01:05:48 +0000
Subject: [PATCH] Fix theme buttons to use standard WordPress URLs and behavior

---
 admin/js/wp-allstars-admin.js  | 81 +++++-----------------------------
 admin/partials/theme-panel.php |  9 +++-
 2 files changed, 18 insertions(+), 72 deletions(-)

diff --git a/admin/js/wp-allstars-admin.js b/admin/js/wp-allstars-admin.js
index 0620dc2..a9ef4fc 100644
--- a/admin/js/wp-allstars-admin.js
+++ b/admin/js/wp-allstars-admin.js
@@ -301,87 +301,26 @@ jQuery(document).ready(function($) {
         $('.theme-actions .install-now').off('click');
         $('.theme-actions .activate-now').off('click');
         
-        // Install theme
+        // Install theme - use standard WordPress behavior
         $('.theme-actions .install-now').on('click', function(e) {
-            e.preventDefault();
+            // We're not preventing default here - let the standard WordPress installer handle it
+            // Just add the updating message
             var $button = $(this);
             var slug = $button.data('slug');
-            var themeName = $button.data('name') || slug;
-            
-            console.log('Installing theme:', slug);
             $button.addClass('updating-message').text('Installing...');
-            
-            // Use the WordPress core update API
-            wp.updates.installTheme({
-                slug: slug,
-                success: function(response) {
-                    console.log('Theme installed successfully:', response);
-                    $button.removeClass('updating-message').addClass('updated-message').text('Installed!');
-                    
-                    setTimeout(function() {
-                        // Replace the button with an activate button
-                        var $parent = $button.closest('.theme-actions');
-                        $button.remove();
-                        
-                        // Create a proper activation link
-                        var activateUrl = response.activateUrl || 
-                                         wp.updates.adminUrl + 'themes.php?action=activate&stylesheet=' + slug + 
-                                         '&_wpnonce=' + wp.updates.data.nonce;
-                        
-                        var $activateButton = $('<a class="button button-primary activate-now" href="' + activateUrl + '">Activate</a>');
-                        $activateButton.attr('data-slug', slug);
-                        $activateButton.attr('data-name', themeName);
-                        $activateButton.attr('data-nonce', wpAllstars.nonce);
-                        
-                        $parent.prepend($activateButton);
-                        
-                        // Re-initialize the event handlers
-                        initThemeHandlers();
-                    }, 1000);
-                },
-                error: function(response) {
-                    console.error('Theme installation failed:', response);
-                    $button.removeClass('updating-message').text('Install');
-                    alert(response.errorMessage || 'Failed to install theme. Please try again.');
-                }
-            });
+            console.log('Installing theme using standard WordPress URL:', $button.attr('href'));
+            // The rest will be handled by WordPress core
         });
 
-        // Activate theme
+        // Activate theme - use standard WordPress behavior
         $('.theme-actions .activate-now').on('click', function(e) {
-            e.preventDefault();
+            // We're not preventing default here - let the standard WordPress activation handle it
+            // Just add the updating message
             var $button = $(this);
-            var url = $button.attr('href');
             var slug = $button.data('slug');
-            
-            console.log('Activating theme:', slug, 'with URL:', url);
             $button.addClass('updating-message').text('Activating...');
-            
-            // Use standard link-based activation like plugins
-            $.ajax({
-                url: url,
-                type: 'GET',
-                dataType: 'html',
-                success: function(response) {
-                    console.log('Theme activation successful');
-                    $button.removeClass('updating-message').addClass('updated-message').text('Activated!');
-                    
-                    setTimeout(function() {
-                        // Replace the button with an active button
-                        var $parent = $button.closest('.theme-actions');
-                        $button.remove();
-                        $parent.prepend('<button type="button" class="button button-disabled" disabled="disabled">Active</button>');
-                        
-                        // Optionally reload the page to show the active theme
-                        // window.location.reload();
-                    }, 1000);
-                },
-                error: function(jqXHR, textStatus, errorThrown) {
-                    console.error('Theme activation error:', textStatus, errorThrown);
-                    $button.removeClass('updating-message').text('Activate');
-                    alert('Failed to activate theme. Please try again or activate from the Themes page.');
-                }
-            });
+            console.log('Activating theme using standard WordPress URL:', $button.attr('href'));
+            // The rest will be handled by WordPress core
         });
     }
 });
\ No newline at end of file
diff --git a/admin/partials/theme-panel.php b/admin/partials/theme-panel.php
index 78966a8..b4d03f3 100644
--- a/admin/partials/theme-panel.php
+++ b/admin/partials/theme-panel.php
@@ -39,7 +39,14 @@ if (!defined('ABSPATH')) {
                     <?php esc_html_e('Activate'); ?>
                 </a>
             <?php else: ?>
-                <a href="#" 
+                <?php 
+                // Use the standard WordPress theme installation URL format
+                $install_url = wp_nonce_url(
+                    admin_url('update.php?action=install-theme&theme=kadence'),
+                    'install-theme_kadence'
+                );
+                ?>
+                <a href="<?php echo esc_url($install_url); ?>" 
                    class="button button-primary install-now" 
                    data-slug="kadence" 
                    data-name="Kadence">