From 6cfd3f72743dd40870df673f84634d24a54089e3 Mon Sep 17 00:00:00 2001 From: Seamus Brady Date: Thu, 15 Feb 2018 22:01:36 +0000 Subject: [PATCH] InstantWP v5.3.5 --- build/IWP_VERSION.txt | 2 +- core/config/iwp-osx.ini | 2 +- core/config/iwp-win.ini | 2 +- core/controlpanel/iwp-actions.rkt | 18 ++++++++++++---- core/controlpanel/iwp-config.rkt | 18 +++++++++++----- core/controlpanel/iwp-constants.rkt | 10 +++------ core/controlpanel/iwp-main-dialog.rkt | 30 +++++++++++++++++++++----- core/controlpanel/iwp-resources.rkt | 2 +- core/images/IWP-small.png | Bin 0 -> 3812 bytes 9 files changed, 59 insertions(+), 25 deletions(-) create mode 100644 core/images/IWP-small.png 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 0000000000000000000000000000000000000000..3119a71ee9bbcc9975016769aacb1d7da15cf815 GIT binary patch literal 3812 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