CRM-15145 - Fundraising and membership program related changes to Configuration Check...

----------------------------------------
* CRM-15145:
  https://issues.civicrm.org/jira/browse/CRM-15145

diff --git a/CRM/Upgrade/Page/Upgrade.php b/CRM/Upgrade/Page/Upgrade.php
index fbf3ab29dea8f98b55a5542a006ccd28fdd5a2c9..4022813d907cc2ecfcc3b92332a6bd131a7af2c9 100644 (file)
--- a/CRM/Upgrade/Page/Upgrade.php
+++ b/CRM/Upgrade/Page/Upgrade.php
@@ -142,7 +142,7 @@ class CRM_Upgrade_Page_Upgrade extends CRM_Core_Page {
     }
     // end of hack
 
-    $postUpgradeMessage = ts('CiviCRM upgrade was successful.');
+    $postUpgradeMessage = ts('Congratulations! Your upgrade was successful! (... wasn\'t that easy!)');
 
     // lets drop all the triggers here
     CRM_Core_DAO::dropTriggers();

diff --git a/templates/CRM/Admin/Page/Admin.tpl b/templates/CRM/Admin/Page/Admin.tpl
index 035f61d7663cb8718da7a0a2960e25eb4227b9fb..40d2004d09682b88423ff379291dde8274594eec 100644 (file)
--- a/templates/CRM/Admin/Page/Admin.tpl
+++ b/templates/CRM/Admin/Page/Admin.tpl
@@ -28,7 +28,7 @@
     <div class="messages status no-popup">
       <table>
         <tr><td class="tasklist">
-          {ts 1='http://civicrm.org/civicrm/profile/create?reset=1&gid=15'}Have you registered this site at CiviCRM.org? If not, please help strengthen the CiviCRM ecosystem by taking a few minutes to <a href="%1" target="_blank">fill out the site registration form</a>. The information collected will help us prioritize improvements, target our communications and build the community. If you have a technical role for this site, be sure to check "Keep in Touch" to receive technical updates (a low volume mailing list).{/ts}</td>
+          {ts 1='https://civicrm.org/register-site'}Have you registered this site at CiviCRM.org? If not, please help strengthen the CiviCRM ecosystem by taking a few minutes to <a href="%1" target="_blank">fill out the site registration form</a>. The information collected will help us prioritize improvements, target our communications and build the community. If you have a technical role for this site, be sure to check "Keep in Touch" to receive technical updates (a low volume mailing list).{/ts}</td>
         </tr>
       </table>
     </div>

diff --git a/templates/CRM/Admin/Page/ConfigTaskList.tpl b/templates/CRM/Admin/Page/ConfigTaskList.tpl
index 062ca00f350dcfdc2897d3081f65b73d2c8ebbc3..2998137e2333e87022988e7d1e2cdb5665fbbcec 100644 (file)
--- a/templates/CRM/Admin/Page/ConfigTaskList.tpl
+++ b/templates/CRM/Admin/Page/ConfigTaskList.tpl
@@ -32,7 +32,7 @@
 
 <table class="selector">
     <tr class="columnheader">
-        <td colspan="2">{ts}Site Configuration{/ts}</td>
+        <td colspan="2">{ts}Site Configuration and Registration{/ts}</td>
     </tr>
     <tr class="even">
         <td class="tasklist nowrap"><a href="{crmURL p="civicrm/admin/setting/localization" q="reset=1&civicrmDestination=`$destination`"}" title="{$linkTitle}">{ts}Localization{/ts}</a></td>
@@ -48,6 +48,10 @@
         {/ts}</a></td>
         <td>{ts}Enable the required CiviCRM components.(CiviContribute, CiviEvent etc.){/ts}</td>
     </tr>
+    <tr class="even">
+        <td class="tasklist nowrap"><a href="https://civicrm.org/register-site" title="{ts}Register your site at CiviCRM.org. Opens in a new window.{/ts}" target="_blank">{ts}Register your site{/ts}</a></td>
+        <td>{ts}Register your site, join the community, and help CiviCRM remain a leading CRM for organizations worldwide.{/ts}</td>
+    </tr>
 
     <tr class="columnheader">
         <td colspan="2">{ts}Viewing and Editing Contacts{/ts}</td>

diff --git a/templates/CRM/common/success.tpl b/templates/CRM/common/success.tpl
index c0bf8d97b86f4246c20ab1c7a06ffc0dd7c5c9a1..29b6f7e418cda73868174e33888d9886afb8f30e 100644 (file)
--- a/templates/CRM/common/success.tpl
+++ b/templates/CRM/common/success.tpl
@@ -49,16 +49,16 @@
 
 {else}
     <div class="crm-container" style="margin-top: 2em; padding: 1em; background-color: #EEFFEE; border: 1px #070 solid; color: black;">
-      <p><span class="crm-status-icon success"> </span><strong>{$message}</strong></p>
       <div style="padding: 1em; background-color: rgba(255, 255, 255, 0.76);">
         <p>
           <img style="display:block; float:left; width:40px; margin-right:10px;" src="{$config->resourceBase}i/logo_lg.png">
-          {ts 1='http://civicrm.org/civicrm/profile/create?reset=1&gid=15'}This release was made possible by contributions from people like <strong>you</strong>. <a href="%1" target="_blank">Register your site</a> to join the community.{/ts}
+          {ts 1='https://civicrm.org/membership'}If you feel that CiviCRM is valuable to your organization, consider that thousands of organizations worldwide also feel the same way. Protect your investment, and theirs, by <a href="%1" target="_blank">ensuring that CiviCRM remains stable, sustainable and consistently improving through membership</a>. ~Donald Lobo {/ts}
         </p>
         <p>
-          {ts 1='http://civicrm.org/contribute' 2='http://civicrm.org/make-it-happen'}If CiviCRM is useful to your organization, consider making a <a href="%1" target="_blank">monthly contribution</a>, or helping to <a href="%2" target="_blank">fund a proposed improvement</a>.{/ts}
+          {ts 1='https://civicrm.org/register-site'}Not ready for a membership yet? You can still help us learn how to improve CiviCRM by <a href="%1" target="_blank">registering your site</a>.{/ts}
         </p>
       </div>
+      <p><span class="crm-status-icon success"> </span><strong>{$message}</strong></p>
       {if $afterUpgradeMessage}
         <h3>{ts}Important Notes{/ts}</h3>
         <p>{$afterUpgradeMessage}</p>