diff --git a/build/IWP_VERSION.txt b/build/IWP_VERSION.txt index 3c4d6f26..c75601c8 100644 --- a/build/IWP_VERSION.txt +++ b/build/IWP_VERSION.txt @@ -1 +1 @@ -v5.3.5 \ No newline at end of file +v5.3.6 \ No newline at end of file diff --git a/core/config/iwp-osx.ini b/core/config/iwp-osx.ini index 43d0ab4c..659e3641 100644 --- a/core/config/iwp-osx.ini +++ b/core/config/iwp-osx.ini @@ -73,5 +73,5 @@ showDeployInfo=yes HideReadMeFile=osx/noreadme WebServerWarnMessage=osx/webserverwarn readMeLimit=5 -showWPResourcesTab=no +showWPResourcesTab=yes diff --git a/core/config/iwp-win.ini b/core/config/iwp-win.ini index b104aef5..3c6837d9 100644 --- a/core/config/iwp-win.ini +++ b/core/config/iwp-win.ini @@ -75,5 +75,5 @@ showDeployInfo=yes HideReadMeFile=win/noreadme WebServerWarnMessage=win/webserverwarn readMeLimit=5 -showWPResourcesTab=no +showWPResourcesTab=yes diff --git a/core/controlpanel/iwp-actions.rkt b/core/controlpanel/iwp-actions.rkt index ff8d5dfe..7e6f7d73 100644 --- a/core/controlpanel/iwp-actions.rkt +++ b/core/controlpanel/iwp-actions.rkt @@ -33,8 +33,10 @@ do-phpinfo-action ;; start edit config do-start-edit-config - ;; open wp resource - do-wp-resources-action + ;; open wp resources + do-wp-resources-action-plugins + do-wp-resources-action-hosting + do-wp-resources-action-themes ;; should quit? should-quit-iwp? ;; test @@ -126,8 +128,16 @@ (define (do-phpinfo-action) (do-open-url (get-phpinfo-url))) -(define (do-wp-resources-action) - (do-open-url (get-wp-resources-url))) +;; wp resources actions + +(define (do-wp-resources-action-hosting) + (do-open-url (get-wp-resources-url-hosting))) + +(define (do-wp-resources-action-plugins) + (do-open-url (get-wp-resources-url-plugins))) + +(define (do-wp-resources-action-themes) + (do-open-url (get-wp-resources-url-themes))) ;; process system event functions diff --git a/core/controlpanel/iwp-config.rkt b/core/controlpanel/iwp-config.rkt index 383bfb9e..a2d9d13c 100644 --- a/core/controlpanel/iwp-config.rkt +++ b/core/controlpanel/iwp-config.rkt @@ -19,8 +19,10 @@ get-phpinfo-url ;; web filemanager url get-filemanager-url - ;; wp resources url - get-wp-resources-url + ;; wp resources + get-wp-resources-url-plugins + get-wp-resources-url-themes + get-wp-resources-url-hosting ;; ssh path get-ssh-script-path ;; sftp path @@ -143,9 +145,15 @@ (define local-portoffset (get-config-setting PORTOFFSET)) (string-append "http://" LOCALHOST ":" (number->string (get-vm-http-port)) "/" (get-config-setting WEB_FILEMANAGER))) -;; filemanager url -(define (get-wp-resources-url) - "https://www.instantwp.com/unleashed") +;; wp resources url +(define (get-wp-resources-url-plugins) + "https://instantwp.com/go/wordpress-plugins/") + +(define (get-wp-resources-url-themes) + "https://instantwp.com/go/wordpress-themes/") + +(define (get-wp-resources-url-hosting) + "https://instantwp.com/go/wordpress-hosting/") ;; startSSHScript (define (get-ssh-script-path) diff --git a/core/controlpanel/iwp-constants.rkt b/core/controlpanel/iwp-constants.rkt index 718c8a41..2184771c 100644 --- a/core/controlpanel/iwp-constants.rkt +++ b/core/controlpanel/iwp-constants.rkt @@ -82,16 +82,12 @@ [(is-macos-constant?) 5])) (define WP_RESOURCES_BTN_WIDTH (cond - [(is-windows-constant?) 350] - [(is-macos-constant?) 350])) + [(is-windows-constant?) 45] + [(is-macos-constant?) 40])) (define WP_RESOURCES_BTN_HEIGHT (cond [(is-windows-constant?) 20] [(is-macos-constant?) 20])) -(define WP_RESOURCES_BTN_STRETCH_HEIGHT - (cond - [(is-windows-constant?) #f] - [(is-macos-constant?) 50])) ;; --------------------------------------- ;; Button/dialog captions ;; --------------------------------------- @@ -99,7 +95,7 @@ (define IWP_DIALOG_TITLE "InstantWP Control Panel") (define CONTROL_PANEL_TAB "Control Panel") (define ADVANCED_TAB "Advanced") -(define WP_RESOURCES_TAB "Products") +(define WP_RESOURCES_TAB "WordPress Resources") (define LOADING_LABEL "Loading...") (define QUITTING_LABEL "Quitting...") (define STARTING_IWP_TITLE "Starting InstantWP - this should take less than 60 seconds...") diff --git a/core/controlpanel/iwp-main-dialog.rkt b/core/controlpanel/iwp-main-dialog.rkt index 72019584..18160d39 100755 --- a/core/controlpanel/iwp-main-dialog.rkt +++ b/core/controlpanel/iwp-main-dialog.rkt @@ -327,17 +327,37 @@ ;; wp-resources panel horizontal panel for holding horizontal panels (define wp-resources-h0 (new horizontal-pane% (parent wp-resources-panel-v0) [alignment '(center top)])) (define wp-resources-h1 (new horizontal-pane% (parent wp-resources-panel-v0) [alignment '(center top)])) +(define wp-resources-h2 (new horizontal-pane% (parent wp-resources-panel-v0) [alignment '(center top)])) +(define wp-resources-h3 (new horizontal-pane% (parent wp-resources-panel-v0) [alignment '(center top)])) ;; WP Resources image (define wp-resources-logo (new message% (parent wp-resources-h0) (label (wp-resources)))) -;; WP Resources button -(define wp-resources-button +;; WP Resources buttons +(define wp-resources-plugins-button (new button% [parent wp-resources-h1] - [label (list (info-sign) (lpad "Click here to learn more about InstantWP Unleashed") 'left)] + [label (list (wp-frontpage-bitmap) (lpad "WordPress Plugins") 'left)] [min-width WP_RESOURCES_BTN_WIDTH] [min-height WP_RESOURCES_BTN_HEIGHT] - [stretchable-height WP_RESOURCES_BTN_STRETCH_HEIGHT ] + [stretchable-height #f ] [callback (lambda (button event) - (do-wp-resources-action))])) + (do-wp-resources-action-plugins))])) + +(define wp-resources-themes-button + (new button% [parent wp-resources-h2] + [label (list (wp-frontpage-bitmap) (lpad "WordPress Themes") 'left)] + [min-width WP_RESOURCES_BTN_WIDTH] + [min-height WP_RESOURCES_BTN_HEIGHT] + [stretchable-height #f ] + [callback (lambda (button event) + (do-wp-resources-action-themes))])) + +(define wp-resources-hosting-button + (new button% [parent wp-resources-h3] + [label (list (wp-frontpage-bitmap) (lpad "WordPress Hosting") 'left)] + [min-width WP_RESOURCES_BTN_WIDTH] + [min-height WP_RESOURCES_BTN_HEIGHT] + [stretchable-height #f ] + [callback (lambda (button event) + (do-wp-resources-action-hosting))])) diff --git a/core/controlpanel/iwp-resources.rkt b/core/controlpanel/iwp-resources.rkt index 3ae95431..e9cea676 100644 --- a/core/controlpanel/iwp-resources.rkt +++ b/core/controlpanel/iwp-resources.rkt @@ -70,7 +70,7 @@ (read-bitmap (build-path (iwp-images-dir-path) "logo-top.png"))) (define (wp-resources) - (read-bitmap (build-path (iwp-images-dir-path) "wp-resources.png"))) + (read-bitmap (build-path (iwp-images-dir-path) "IWP-small.png"))) (define (info-sign) (read-bitmap (build-path (iwp-images-dir-path) "info.png"))) diff --git a/core/images/IWP-small.png b/core/images/IWP-small.png new file mode 100644 index 00000000..3119a71e Binary files /dev/null and b/core/images/IWP-small.png differ