diff --git a/.gitchange b/.gitchange index 45345fea..7f4f2b6e 100644 --- a/.gitchange +++ b/.gitchange @@ -1 +1 @@ -1450450975 +1450452152 diff --git a/s2member/includes/classes/menu-pages.inc.php b/s2member/includes/classes/menu-pages.inc.php index 9d7f4acf..c712f803 100644 --- a/s2member/includes/classes/menu-pages.inc.php +++ b/s2member/includes/classes/menu-pages.inc.php @@ -154,6 +154,9 @@ public static function add_admin_options() if(apply_filters('ws_plugin__s2member_during_add_admin_options_add_start_page', TRUE, get_defined_vars())) add_submenu_page($menu, 'Getting Started w/ s2Member', 'Getting Started', 'create_users', 'ws-plugin--s2member-start', 'c_ws_plugin__s2member_menu_pages::start_page'); + if(apply_filters('ws_plugin__s2member_during_add_admin_options_add_help_page', !is_multisite () || !c_ws_plugin__s2member_utils_conds::is_multisite_farm () || is_main_site (), get_defined_vars())) + add_submenu_page($menu, 'Getting Help w/ s2Member', 'Getting Help', 'create_users', 'ws-plugin--s2member-help', 'c_ws_plugin__s2member_menu_pages::help_page'); + if(apply_filters('ws_plugin__s2member_during_add_admin_options_add_divider_1', TRUE, get_defined_vars())) add_submenu_page($menu, '', '', 'create_users', '#'); @@ -510,6 +513,21 @@ public static function start_page() do_action('ws_plugin__s2member_after_start_page', get_defined_vars()); } + /** + * Builds and handles the Getting Help page. + * + * @package s2Member\Menu_Pages + * @since 151218 + */ + public static function help_page() + { + do_action('ws_plugin__s2member_before_help_page', get_defined_vars()); + + include_once dirname(dirname(__FILE__)).'/menu-pages/help.inc.php'; + + do_action('ws_plugin__s2member_after_help_page', get_defined_vars()); + } + /** * Builds and handles the Main Multisite Options page. * diff --git a/s2member/includes/menu-pages/help.inc.php b/s2member/includes/menu-pages/help.inc.php new file mode 100644 index 00000000..d8b0d865 --- /dev/null +++ b/s2member/includes/menu-pages/help.inc.php @@ -0,0 +1,135 @@ +' . "\n"; + + echo '
'."\n"; + c_ws_plugin__s2member_menu_pages_tb::display (); + echo '
'."\n"; + + echo '

Getting Help w/ s2Member®

' . "\n"; + + echo '' . "\n"; + echo '' . "\n"; + echo '' . "\n"; + echo '' . "\n"; + + echo '' . "\n"; + + echo '' . "\n"; + echo '' . "\n"; + echo '
' . "\n"; + + do_action("ws_plugin__s2member_during_help_page_before_left_sections", get_defined_vars ()); + do_action("ws_plugin__s2member_during_help_page_during_left_sections_before_help", get_defined_vars ()); + + echo '
' . "\n"; + + echo '
' . "\n"; + echo '

s2Member is pretty easy to setup and install initially. Most of the official documentation is right here in your Dashboard (i.e., there is a lot of inline documentation built into the software). That being said, it can take some time to master everything there is to know about s2Member\'s advanced features. If you need assistance with s2Member, please search the s2Member Knowledge Base, Video Tutorials, Forums and Codex. If you are planning to do something creative with s2Member, you might want to hire a freelance developer to assist you.

' . "\n"; + echo '

See also: s2Member Troubleshooting Guide (please read this first if you\'re having trouble).

'."\n"; + + echo '
' . "\n"; + + echo '

Testing Server Compatibility

'."\n"; + echo '

Please download the s2Member Server Scanner. Unzip, upload via FTP; then open in a browser for a full report.

'."\n"; + + echo '
' . "\n"; + + echo '

Troubleshooting Payment Gateway Integrations

'."\n"; + echo '

Please use s2Member\'s Log Viewer. Log files can be very helpful.

'."\n"; + + echo '
' . "\n"; + + echo '

Search s2Member KB Articles!

'."\n"; + echo '
'."\n"; + echo '

'."\n"; + echo '
'."\n"; + + do_action("ws_plugin__s2member_during_start_page_during_left_sections_during_help", get_defined_vars ()); + + echo '
' . "\n"; + + echo '
' . "\n"; + + do_action("ws_plugin__s2member_during_help_page_during_left_sections_after_help", get_defined_vars ()); + + do_action("ws_plugin__s2member_during_help_page_during_left_sections_before_support", get_defined_vars ()); + + echo '
' . "\n"; + + echo '
' . "\n"; + echo '

Support for s2Member® is provided by WebSharks, Inc. Our customer support representatives are available Monday through Friday, excluding all major holidays. Or, you can discuss problems/solutions with others in our public community forum.

'."\n"; + + echo ''."\n"; + + do_action("ws_plugin__s2member_during_start_page_during_left_sections_during_support", get_defined_vars ()); + + echo '
' . "\n"; + + echo '
' . "\n"; + + do_action("ws_plugin__s2member_during_help_page_during_left_sections_after_support", get_defined_vars ()); + + if (apply_filters("ws_plugin__s2member_during_help_page_during_left_sections_display_pro", !c_ws_plugin__s2member_utils_conds::pro_is_installed(), get_defined_vars ())) + { + do_action("ws_plugin__s2member_during_help_page_during_left_sections_before_pro", get_defined_vars ()); + + echo '
' . "\n"; + + echo '
' . "\n"; + echo '

Among many other features/enhancements, s2Member Pro comes pre-integrated with additional payment gateways that work with s2Member Pro-Forms (a powerful s2Member Pro feature). For instance, Stripe (most popular; also supports Bitcoin), PayPal Payments Pro, and Authorize.Net. Each of these payment gateways allow you to accept most major credit cards on-site; i.e., customers never leave your site! s2Member Pro-Forms also support PayPal Express Checkout (if you integrate with PayPal Pro); for customers who actually prefer to pay with PayPal.

' . "\n"; + echo '

Learn more here: s2Member Pro Features

'."\n"; + do_action("ws_plugin__s2member_during_help_page_during_left_sections_during_pro", get_defined_vars ()); + echo '
' . "\n"; + + echo '
' . "\n"; + + do_action("ws_plugin__s2member_during_start_page_during_left_sections_after_pro", get_defined_vars ()); + } + do_action("ws_plugin__s2member_during_help_page_after_left_sections", get_defined_vars ()); + + echo '		' . "\n"; + c_ws_plugin__s2member_menu_pages_rs::display (); + echo '
' . "\n"; + + echo '' . "\n"; + } + } + } + +new c_ws_plugin__s2member_menu_page_help (); diff --git a/s2member/includes/menu-pages/logs.inc.php b/s2member/includes/menu-pages/logs.inc.php index 3260d176..e309c3fc 100644 --- a/s2member/includes/menu-pages/logs.inc.php +++ b/s2member/includes/menu-pages/logs.inc.php @@ -44,40 +44,6 @@ public function __construct() do_action("ws_plugin__s2member_during_logs_page_before_left_sections", get_defined_vars()); - if(apply_filters("ws_plugin__s2member_during_logs_page_during_left_sections_display_help", TRUE, get_defined_vars())) - { - do_action("ws_plugin__s2member_during_logs_page_during_left_sections_before_help", get_defined_vars()); - - echo '
'."\n"; - - echo '
'."\n"; - echo '

Getting Help w/ s2Member (Troubleshooting)

'."\n"; - echo '

s2Member is pretty easy to setup and install initially. Most of the official documentation is right here in your Dashboard (i.e., there is a lot of inline documentation built into the software). That being said, it can take some time to master everything there is to know about s2Member\'s advanced features. If you need assistance with s2Member, please search the s2Member Knowledge Base, Video Tutorials, Forums and Codex. If you are planning to do something creative with s2Member, you might want to hire a freelance developer to assist you.

'."\n"; - echo '

See also: s2Member Troubleshooting Guide (please read this first if you\'re having trouble).

'."\n"; - - echo '
'."\n"; - - echo '

Testing Server Compatibility

'."\n"; - echo '

Please download the s2Member Server Scanner. Unzip, upload via FTP; then open in a browser for a full report.

'."\n"; - - echo '
'."\n"; - - echo '

Troubleshooting Payment Gateway Integrations

'."\n"; - echo '

Please use the s2Member Log Viewer (below). Log files can be very helpful.

'."\n"; - - echo '
'."\n"; - - echo '

Search s2Member KB Articles!

'."\n"; - echo '
'."\n"; - echo '

'."\n"; - echo '
'."\n"; - - do_action("ws_plugin__s2member_during_logs_page_during_left_sections_during_help", get_defined_vars()); - echo '
'."\n"; - echo '
'."\n"; - - do_action("ws_plugin__s2member_during_logs_page_during_left_sections_after_help", get_defined_vars()); - } if(apply_filters("ws_plugin__s2member_during_logs_page_during_left_sections_display_log_settings", TRUE, get_defined_vars())) { do_action("ws_plugin__s2member_during_logs_page_during_left_sections_before_log_settings", get_defined_vars()); diff --git a/s2member/includes/menu-pages/start.inc.php b/s2member/includes/menu-pages/start.inc.php index 220800b6..a112d378 100644 --- a/s2member/includes/menu-pages/start.inc.php +++ b/s2member/includes/menu-pages/start.inc.php @@ -246,7 +246,6 @@ public function __construct () echo '
' . "\n"; echo '
' . "\n"; - echo '

s2Member Pro—A Recommended Upgrade

' . "\n"; echo '

Among many other features/enhancements, s2Member Pro comes pre-integrated with additional payment gateways that work with s2Member Pro-Forms (a powerful s2Member Pro feature). For instance, Stripe (most popular; also supports Bitcoin), PayPal Payments Pro, and Authorize.Net. Each of these payment gateways allow you to accept most major credit cards on-site; i.e., customers never leave your site! s2Member Pro-Forms also support PayPal Express Checkout (if you integrate with PayPal Pro); for customers who actually prefer to pay with PayPal.

' . "\n"; echo '

Learn more here: s2Member Pro Features

'."\n"; do_action("ws_plugin__s2member_during_start_page_during_left_sections_during_pro", get_defined_vars ()); @@ -257,40 +256,6 @@ public function __construct () do_action("ws_plugin__s2member_during_start_page_during_left_sections_after_pro", get_defined_vars ()); } - if (apply_filters("ws_plugin__s2member_during_start_page_during_left_sections_display_help", (!is_multisite () || !c_ws_plugin__s2member_utils_conds::is_multisite_farm () || is_main_site ()), get_defined_vars ())) - { - do_action("ws_plugin__s2member_during_start_page_during_left_sections_before_help", get_defined_vars ()); - - echo '
' . "\n"; - - echo '
' . "\n"; - echo '

s2Member is pretty easy to setup and install initially. Most of the official documentation is right here in your Dashboard (i.e., there is a lot of inline documentation built into the software). That being said, it can take some time to master everything there is to know about s2Member\'s advanced features. If you need assistance with s2Member, please search the s2Member Knowledge Base, Video Tutorials, Forums and Codex. If you are planning to do something creative with s2Member, you might want to hire a freelance developer to assist you.

' . "\n"; - echo '

See also: s2Member Troubleshooting Guide (please read this first if you\'re having trouble).

'."\n"; - - echo '
' . "\n"; - - echo '

Testing Server Compatibility

'."\n"; - echo '

Please download the s2Member Server Scanner. Unzip, upload via FTP; then open in a browser for a full report.

'."\n"; - - echo '
' . "\n"; - - echo '

Troubleshooting Payment Gateway Integrations

'."\n"; - echo '

Please use s2Member\'s Log Viewer. Log files can be very helpful.

'."\n"; - - echo '
' . "\n"; - - echo '

Search s2Member KB Articles!

'."\n"; - echo '
'."\n"; - echo '

'."\n"; - echo '
'."\n"; - - do_action("ws_plugin__s2member_during_start_page_during_left_sections_during_help", get_defined_vars ()); - echo '
' . "\n"; - echo '
' . "\n"; - - do_action("ws_plugin__s2member_during_start_page_during_left_sections_after_help", get_defined_vars ()); - } - do_action("ws_plugin__s2member_during_start_page_after_left_sections", get_defined_vars ()); echo '' . "\n";