diff --git a/build/IWP_VERSION.txt b/build/IWP_VERSION.txt index 435ec7f7..f01c12bc 100644 --- a/build/IWP_VERSION.txt +++ b/build/IWP_VERSION.txt @@ -1 +1 @@ -v5.1.2-rc7 \ No newline at end of file +v5.2.0 \ No newline at end of file diff --git a/core/config/iwp-osx.ini b/core/config/iwp-osx.ini index a01b4d49..e47e5e1e 100644 --- a/core/config/iwp-osx.ini +++ b/core/config/iwp-osx.ini @@ -69,7 +69,7 @@ IWPHostServPassword=iwp [UI] buttonSleepAfterClick=1 -showWPResourcesTab=no +showWPResourcesTab=yes HideReadMeFile=osx/noreadme WebServerWarnMessage=osx/webserverwarn readMeLimit=6 diff --git a/core/config/iwp-win.ini b/core/config/iwp-win.ini index 4000c7a2..3250b34e 100644 --- a/core/config/iwp-win.ini +++ b/core/config/iwp-win.ini @@ -70,7 +70,7 @@ IWPHostServPassword=iwp [UI] buttonSleepAfterClick=1 -showWPResourcesTab=no +showWPResourcesTab=yes HideReadMeFile=win/noreadme WebServerWarnMessage=win/webserverwarn readMeLimit=6 diff --git a/core/controlpanel/iwp-actions.rkt b/core/controlpanel/iwp-actions.rkt index 7f46bde8..ece8a23d 100644 --- a/core/controlpanel/iwp-actions.rkt +++ b/core/controlpanel/iwp-actions.rkt @@ -33,6 +33,8 @@ do-phpinfo-action ;; start edit config do-start-edit-config + ;; open wp resource +do-wp-resources-action ;; should quit? should-quit-iwp? ;; test @@ -114,6 +116,9 @@ (define (do-phpinfo-action) (do-open-url (get-phpinfo-url))) +(define (do-wp-resources-action) + (do-open-url (get-wp-resources-url))) + ;; process system event functions ;; build a command string diff --git a/core/controlpanel/iwp-config.rkt b/core/controlpanel/iwp-config.rkt index c5fe4ac4..8fc8a17b 100644 --- a/core/controlpanel/iwp-config.rkt +++ b/core/controlpanel/iwp-config.rkt @@ -19,6 +19,8 @@ get-phpinfo-url ;; web filemanager url get-filemanager-url + ;; wp resources url + get-wp-resources-url ;; ssh path get-ssh-script-path ;; sftp path @@ -139,6 +141,9 @@ (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") ;; startSSHScript (define (get-ssh-script-path) diff --git a/core/controlpanel/iwp-main-dialog.rkt b/core/controlpanel/iwp-main-dialog.rkt index 519ca5ce..86495751 100755 --- a/core/controlpanel/iwp-main-dialog.rkt +++ b/core/controlpanel/iwp-main-dialog.rkt @@ -293,5 +293,27 @@ (define phpinfo-label (create-new-label PHP_INFO_INFO ADV_LBL_WIDTH ADV_LBL_HEIGHT advanced-panel-h5)) +;; -------------------------------------- +;; wp resources panel control definitions +;; -------------------------------------- + +;; wp-resources panel vertical panel for holding horizontal panels +(define wp-resources-panel-v0 (new vertical-pane% (parent wp-resources-panel) [alignment '(center center)] [border 10])) +;; 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)])) + +;; WP Resources image +(define wp-resources-logo (new message% (parent wp-resources-h0) (label (wp-resources)))) + +;; WP Resources button +(define wp-resources-button + (new button% [parent wp-resources-h1] + [label (list (info-sign) (lpad "Click here to learn more about InstantWP Unleashed") 'left)] + [min-width 350] + [min-height 20] + [stretchable-height 50 ] + [callback (lambda (button event) + (do-wp-resources-action))])) diff --git a/core/controlpanel/iwp-resources.rkt b/core/controlpanel/iwp-resources.rkt index d9e8c545..00ad2c3e 100644 --- a/core/controlpanel/iwp-resources.rkt +++ b/core/controlpanel/iwp-resources.rkt @@ -61,6 +61,12 @@ (define (iwp-logo) (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"))) + +(define (info-sign) + (read-bitmap (build-path (iwp-images-dir-path) "info.png"))) + ;; start up wizard bitmap (define (readme-bitmap) (read-bitmap (build-path (iwp-images-dir-path) "readme1.png"))) diff --git a/core/docs/images/unleashed-logo-with-shadow.png b/core/docs/images/unleashed-logo-with-shadow.png new file mode 100644 index 00000000..9b190d33 Binary files /dev/null and b/core/docs/images/unleashed-logo-with-shadow.png differ diff --git a/core/images/info.png b/core/images/info.png new file mode 100644 index 00000000..03c496d8 Binary files /dev/null and b/core/images/info.png differ diff --git a/core/images/wp-resources.png b/core/images/wp-resources.png new file mode 100644 index 00000000..b555338c Binary files /dev/null and b/core/images/wp-resources.png differ