Skip to content

Commit

Permalink
Merge pull request #825 from websharks/feature/814
Browse files Browse the repository at this point in the history
PR: feature/814
  • Loading branch information
JasWSInc committed Dec 18, 2015
2 parents 0f283e7 + 03f6017 commit 0c3e707
Show file tree
Hide file tree
Showing 5 changed files with 154 additions and 70 deletions.
2 changes: 1 addition & 1 deletion .gitchange
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1450450975
1450452152
18 changes: 18 additions & 0 deletions s2member/includes/classes/menu-pages.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -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, '', '<span style="display:block; margin:1px 0 1px -5px; padding:0; height:1px; line-height:1px; background:#CCCCCC;"></span>', 'create_users', '#');

Expand Down Expand Up @@ -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.
*
Expand Down
135 changes: 135 additions & 0 deletions s2member/includes/menu-pages/help.inc.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
<?php
/**
* Getting Help.
*
* Copyright: © 2009-2011
* {@link http://websharks-inc.com/ WebSharks, Inc.}
* (coded in the USA)
*
* Released under the terms of the GNU General Public License.
* You should have received a copy of the GNU General Public License,
* along with this software. In the main directory, see: /licensing/
* If not, see: {@link http://www.gnu.org/licenses/}.
*
* @package s2Member\Menu_Pages
* @since 151218
*/
if(!defined('WPINC')) // MUST have WordPress.
exit ("Do not access this file directly.");

if (!class_exists ("c_ws_plugin__s2member_menu_page_help"))
{
/**
* Getting Help.
*
* @package s2Member\Menu_Pages
* @since 151218
*/
class c_ws_plugin__s2member_menu_page_help
{
public function __construct ()
{
echo '<div class="wrap ws-menu-page">' . "\n";

echo '<div class="ws-menu-page-toolbox">'."\n";
c_ws_plugin__s2member_menu_pages_tb::display ();
echo '</div>'."\n";

echo '<h2>Getting Help w/ s2Member®</h2>' . "\n";

echo '<table class="ws-menu-page-table">' . "\n";
echo '<tbody class="ws-menu-page-table-tbody">' . "\n";
echo '<tr class="ws-menu-page-table-tr">' . "\n";
echo '<td class="ws-menu-page-table-l">' . "\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 '<div class="ws-menu-page-group" title="Getting Help w/ s2Member" default-state="open">' . "\n";

echo '<div class="ws-menu-page-section ws-plugin--s2member-help">' . "\n";
echo '<p>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 <a href="http://s2member.com/kb/" target="_blank" rel="external">s2Member Knowledge Base</a>, <a href="http://s2member.com/videos/" target="_blank" rel="external">Video Tutorials</a>, <a href="http://s2member.com/forums/" target="_blank" rel="external">Forums</a> and <a href="http://s2member.com/r/codex/" target="_blank" rel="external">Codex</a>. If you are planning to do something creative with s2Member, you might want to <a href="http://jobs.wordpress.net" target="_blank" rel="external">hire a freelance developer</a> to assist you.</p>' . "\n";
echo '<p><strong>See also:</strong> <a href="http://s2member.com/r/common-troubleshooting-tips/" target="_blank" rel="external">s2Member Troubleshooting Guide</a> (please read this first if you\'re having trouble).</p>'."\n";

echo '<div class="ws-menu-page-hr"></div>' . "\n";

echo '<h3 style="margin-bottom:0;">Testing Server Compatibility</h3>'."\n";
echo '<p>Please download the <a href="http://s2member.com/r/server-scanner-info/">s2Member Server Scanner</a>. Unzip, upload via FTP; then open in a browser for a full report.</p>'."\n";

echo '<div class="ws-menu-page-hr"></div>' . "\n";

echo '<h3 style="margin-bottom:0;">Troubleshooting Payment Gateway Integrations</h3>'."\n";
echo '<p>Please use s2Member\'s <a href="'.esc_attr(admin_url("/admin.php?page=ws-plugin--s2member-logs")).'">Log Viewer</a>. Log files can be very helpful.</p>'."\n";

echo '<div class="ws-menu-page-hr"></div>' . "\n";

echo '<h3 style="margin-bottom:0;">Search s2Member KB Articles<em>!</em></h3>'."\n";
echo '<form method="get" action="http://s2member.com/kb/" target="_blank" onsubmit="if(this.q.value === \'enter search terms...\') this.q.value = \'\';" autocomplete="off">'."\n";
echo '<p><input type="text" name="kb_q" value="enter search terms..." style="width:60%;" onfocus="if(this.value === \'enter search terms...\') this.value = \'\';" onblur="if(this.value === \'\') this.value = \'enter search terms...\';" /> <input type="submit" value="Search" style="font-size:120%; font-weight:normal;" /></p>'."\n";
echo '</form>'."\n";

do_action("ws_plugin__s2member_during_start_page_during_left_sections_during_help", get_defined_vars ());

echo '</div>' . "\n";

echo '</div>' . "\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 '<div class="ws-menu-page-group" title="s2Member Tech. Support (for Pro Customers)" default-state="open">' . "\n";

echo '<div class="ws-menu-page-section ws-plugin--s2member-support">' . "\n";
echo '<p style="max-width:900px;">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 <a href="https://wordpress.org/support/plugin/s2member" target="_blank" rel="external">public community forum</a>.</p>'."\n";

echo '<ul>'."\n";
echo '<li>For pre-sale questions please see: <a href="http://s2member.com/kb/kb-tag/pre-sale-faqs/" target="_blank" rel="external">Pre-Sale FAQs</a>.</li>'."\n";
echo '<li>For installation instructions, please see: <a href="http://s2member.com/installation/" target="_blank" rel="external">Installing/Updating s2Member & s2Member Pro</a>.</li>'."\n";
echo '<li>For troubleshooting (and documentation) please <a href="http://s2member.com/kb/" target="_blank" rel="external">search our Knowledge Base</a>.</li>'."\n";
echo '<li>Paying customers in need of assistance may <a href="http://s2member.com/r/new-trouble-ticket/" target="_blank" rel="external">submit a trouble ticket</a>.</li>'."\n";
echo '<li>If you have other questions, please <a href="http://s2member.com/r/new-pre-sale-inquiry/" target="_blank" rel="external">contact our sales dept</a>.</li>'."\n";
echo '</ul>'."\n";

do_action("ws_plugin__s2member_during_start_page_during_left_sections_during_support", get_defined_vars ());

echo '</div>' . "\n";

echo '</div>' . "\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 '<div class="ws-menu-page-group" title="Upgrading to s2Member Pro<em>!</em>" default-state="open">' . "\n";

echo '<div class="ws-menu-page-section ws-plugin--s2member-pro">' . "\n";
echo '<p>Among many other features/enhancements, <a href="http://s2member.com/" target="_blank" rel="external">s2Member Pro</a> 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.</p>' . "\n";
echo '<p><strong>Learn more here:</strong> <a href="http://s2member.com/features/" target="_blank" rel="external">s2Member Pro Features</a></p>'."\n";
do_action("ws_plugin__s2member_during_help_page_during_left_sections_during_pro", get_defined_vars ());
echo '</div>' . "\n";

echo '</div>' . "\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 '</td>' . "\n";

echo '<td class="ws-menu-page-table-r">' . "\n";
c_ws_plugin__s2member_menu_pages_rs::display ();
echo '</td>' . "\n";

echo '</tr>' . "\n";
echo '</tbody>' . "\n";
echo '</table>' . "\n";

echo '</div>' . "\n";
}
}
}

new c_ws_plugin__s2member_menu_page_help ();
34 changes: 0 additions & 34 deletions s2member/includes/menu-pages/logs.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 '<div class="ws-menu-page-group" title="Getting Help">'."\n";

echo '<div class="ws-menu-page-section ws-plugin--s2member-help">'."\n";
echo '<h3>Getting Help w/ s2Member (Troubleshooting)</h3>'."\n";
echo '<p>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 <a href="http://s2member.com/kb/" target="_blank" rel="external">s2Member Knowledge Base</a>, <a href="http://www.s2member.com/videos/" target="_blank" rel="external">Video Tutorials</a>, <a href="http://www.s2member.com/forums/" target="_blank" rel="external">Forums</a> and <a href="http://www.s2member.com/codex/" target="_blank" rel="external">Codex</a>. If you are planning to do something creative with s2Member, you might want to <a href="http://jobs.wordpress.net" target="_blank" rel="external">hire a freelance developer</a> to assist you.</p>'."\n";
echo '<p><strong>See also:</strong> <a href="http://www.s2member.com/kb/common-troubleshooting-tips/" target="_blank" rel="external">s2Member Troubleshooting Guide</a> (please read this first if you\'re having trouble).</p>'."\n";

echo '<div class="ws-menu-page-hr"></div>'."\n";

echo '<h3 style="margin-bottom:0;">Testing Server Compatibility</h3>'."\n";
echo '<p>Please download the <a href="http://www.s2member.com/r/server-check-tool/">s2Member Server Scanner</a>. Unzip, upload via FTP; then open in a browser for a full report.</p>'."\n";

echo '<div class="ws-menu-page-hr"></div>'."\n";

echo '<h3 style="margin-bottom:0;">Troubleshooting Payment Gateway Integrations</h3>'."\n";
echo '<p>Please use the s2Member Log Viewer (below). Log files can be very helpful.</p>'."\n";

echo '<div class="ws-menu-page-hr"></div>'."\n";

echo '<h3 style="margin-bottom:0;">Search s2Member KB Articles<em>!</em></h3>'."\n";
echo '<form method="get" action="http://s2member.com/kb/" target="_blank" onsubmit="if(this.q.value === \'enter search terms...\') this.q.value = \'\';" autocomplete="off">'."\n";
echo '<p><input type="text" name="kb_q" value="enter search terms..." style="width:60%;" onfocus="if(this.value === \'enter search terms...\') this.value = \'\';" onblur="if(this.value === \'\') this.value = \'enter search terms...\';" /> <input type="submit" value="Search" style="font-size:120%; font-weight:normal;" /></p>'."\n";
echo '</form>'."\n";

do_action("ws_plugin__s2member_during_logs_page_during_left_sections_during_help", get_defined_vars());
echo '</div>'."\n";
echo '</div>'."\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());
Expand Down
35 changes: 0 additions & 35 deletions s2member/includes/menu-pages/start.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,6 @@ public function __construct ()
echo '<div class="ws-menu-page-group" title="Upgrading to s2Member Pro<em>!</em>" default-state="open">' . "\n";

echo '<div class="ws-menu-page-section ws-plugin--s2member-pro">' . "\n";
echo '<h3>s2Member Pro—A Recommended Upgrade</h3>' . "\n";
echo '<p>Among many other features/enhancements, <a href="http://s2member.com/" target="_blank" rel="external">s2Member Pro</a> 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.</p>' . "\n";
echo '<p><strong>Learn more here:</strong> <a href="http://s2member.com/features/" target="_blank" rel="external">s2Member Pro Features</a></p>'."\n";
do_action("ws_plugin__s2member_during_start_page_during_left_sections_during_pro", get_defined_vars ());
Expand All @@ -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 '<div class="ws-menu-page-group" title="Getting Help w/ s2Member" default-state="open">' . "\n";

echo '<div class="ws-menu-page-section ws-plugin--s2member-help">' . "\n";
echo '<p>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 <a href="http://s2member.com/kb/" target="_blank" rel="external">s2Member Knowledge Base</a>, <a href="http://s2member.com/videos/" target="_blank" rel="external">Video Tutorials</a>, <a href="http://s2member.com/forums/" target="_blank" rel="external">Forums</a> and <a href="http://s2member.com/r/codex/" target="_blank" rel="external">Codex</a>. If you are planning to do something creative with s2Member, you might want to <a href="http://jobs.wordpress.net" target="_blank" rel="external">hire a freelance developer</a> to assist you.</p>' . "\n";
echo '<p><strong>See also:</strong> <a href="http://s2member.com/r/common-troubleshooting-tips/" target="_blank" rel="external">s2Member Troubleshooting Guide</a> (please read this first if you\'re having trouble).</p>'."\n";

echo '<div class="ws-menu-page-hr"></div>' . "\n";

echo '<h3 style="margin-bottom:0;">Testing Server Compatibility</h3>'."\n";
echo '<p>Please download the <a href="http://s2member.com/r/server-scanner-info/">s2Member Server Scanner</a>. Unzip, upload via FTP; then open in a browser for a full report.</p>'."\n";

echo '<div class="ws-menu-page-hr"></div>' . "\n";

echo '<h3 style="margin-bottom:0;">Troubleshooting Payment Gateway Integrations</h3>'."\n";
echo '<p>Please use s2Member\'s <a href="'.esc_attr(admin_url("/admin.php?page=ws-plugin--s2member-logs")).'">Log Viewer</a>. Log files can be very helpful.</p>'."\n";

echo '<div class="ws-menu-page-hr"></div>' . "\n";

echo '<h3 style="margin-bottom:0;">Search s2Member KB Articles<em>!</em></h3>'."\n";
echo '<form method="get" action="http://s2member.com/kb/" target="_blank" onsubmit="if(this.q.value === \'enter search terms...\') this.q.value = \'\';" autocomplete="off">'."\n";
echo '<p><input type="text" name="kb_q" value="enter search terms..." style="width:60%;" onfocus="if(this.value === \'enter search terms...\') this.value = \'\';" onblur="if(this.value === \'\') this.value = \'enter search terms...\';" /> <input type="submit" value="Search" style="font-size:120%; font-weight:normal;" /></p>'."\n";
echo '</form>'."\n";

do_action("ws_plugin__s2member_during_start_page_during_left_sections_during_help", get_defined_vars ());
echo '</div>' . "\n";
echo '</div>' . "\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 '</td>' . "\n";
Expand Down

0 comments on commit 0c3e707

Please sign in to comment.