Skip to content

Commit

Permalink
Update UI to reflect new feature set. See: #850
Browse files Browse the repository at this point in the history
  • Loading branch information
jaswsinc committed Jan 19, 2016
1 parent f0fe046 commit c6021eb
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 4 deletions.
8 changes: 6 additions & 2 deletions s2member/includes/menu-pages/mms-ops.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ class c_ws_plugin__s2member_menu_page_mms_ops
public function __construct()
{
if(c_ws_plugin__s2member_utils_conds::pro_is_installed()) {
new c_ws_plugin__s2member_pro_menu_page_mms_ops();
c_ws_plugin__s2member_pro_menu_pages::mms_ops_page_display();
return; // Stop here.
}
echo '<div class="wrap ws-menu-page">'."\n";

Expand All @@ -47,7 +48,6 @@ public function __construct()

if(is_multisite() && is_main_site()) // These panels will ONLY be available on the Main Site.
{
echo '<p style="margin-top:0;">s2Member is compatible with Multisite Networking, but it requires the pro add-on. Please consider upgrading if you would like to integrate s2Member Pro with a Multisite Network.</p>'."\n";
echo '<img src="'.esc_attr($GLOBALS["WS_PLUGIN__"]["s2member"]["c"]["dir_url"]).'/images/large-icon.png" title="s2Member (a Membership management system for WordPress)" alt="" style="float:right; margin:25px 0 0 25px; border:0;" />'."\n";

if(file_exists($ws_plugin__s2member_temp = dirname(dirname(dirname(__FILE__)))."/readme-ms.txt"))
Expand All @@ -61,7 +61,9 @@ public function __construct()
$ws_plugin__s2member_temp = preg_replace("/(\=)( )(.+?)( )(\=)/", "<h3>$3</h3>", $ws_plugin__s2member_temp);
$ws_plugin__s2member_temp = NC_Markdown($ws_plugin__s2member_temp);

echo '<div style="max-width:1024px;">';
echo preg_replace("/(\<a)( href)/i", "$1".' target="_blank" rel="nofollow external"'."$2", $ws_plugin__s2member_temp);
echo '</div>';
}
}
else // Otherwise, we can display a simple notation; leading into Multisite Networking.
Expand All @@ -80,7 +82,9 @@ public function __construct()
$ws_plugin__s2member_temp = preg_replace("/(\=)( )(.+?)( )(\=)/", "<h3>$3</h3>", $ws_plugin__s2member_temp);
$ws_plugin__s2member_temp = NC_Markdown($ws_plugin__s2member_temp);

echo '<div style="max-width:1024px;">';
echo preg_replace("/(\<a)( href)/i", "$1".' target="_blank" rel="nofollow external"'."$2", $ws_plugin__s2member_temp);
echo '</div>';
}
}

Expand Down
8 changes: 6 additions & 2 deletions s2member/readme-ms.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
= Is s2Member compatible with WordPress Multisite Networking? =
Yes, but this requires s2Member Pro. s2Member Pro is compatible with Multisite Networking. After you enable Multisite Networking, install the s2Member Pro add-on. Then navigate to `s2Member → Multisite (Config)` in the Dashboard on your Main Site. You can get started now, by turning on [Multisite Networking](http://codex.wordpress.org/Create_A_Network) inside your installation of WordPress®.
Multisite support is no longer included in the s2Member Framework. However, it is available with s2Member Pro. s2Member Pro is compatible with Multisite Networking. After you enable Multisite Networking, install the s2Member Pro Add-On. Then, navigate to `s2Member → Multisite (Config)` in the Dashboard of your Main Site. You can learn more about s2Member Pro at [s2Member.com](http://www.s2member.com/).

You can learn more about s2Member® at [s2Member.com](http://www.s2member.com/).
= I was using the free version in a Multisite Network before. What happened? =
s2Member (when running on a Multisite Network) requires minor alterations in WordPress core that are not compatible with plugins available at WordPress.org (i.e., not allowed) at this time. For this reason, full support for Multisite Networks is now available only in the pro version.

= What if I have already configured Multisite Network options on this site? =
If you already customized s2Member's Multisite Network configuration options in a previous release, those settings will remain and still be functional over the short-term; i.e., the functionality that makes s2Member compatible with Multisite Networking is still included, even in the s2Member Framework. However, the routines that deal with core patches, and those that allow you to change Multisite options are no longer available. You will need to acquire the pro version to regain that portion of the s2Member Dashboard.

0 comments on commit c6021eb

Please # to comment.