From bb216f68f551ff90646b8c1b1e198a42fd3d640a Mon Sep 17 00:00:00 2001 From: Dave Greenberg Date: Tue, 26 Aug 2014 15:05:54 -0700 Subject: [PATCH] CRM-15145 - additional styling for upgrade message, change register link in install success message, update CONTRIBUTORS.txt. ---------------------------------------- * CRM-15145: https://issues.civicrm.org/jira/browse/CRM-15145 --- CONTRIBUTORS.txt | 113 ++++++++++++++++++++++++++++++- CRM/Upgrade/Page/Upgrade.php | 2 +- install/index.php | 4 +- templates/CRM/common/success.tpl | 4 +- 4 files changed, 117 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 9c611e7ac6..f0d0014fdc 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -1,5 +1,116 @@ The following people and organizations sponsored and/or contributed new and improved features to the project. +************************************************ +Key Contributors and Sponsors for 4.5 +************************************************ + +CiviCRM Team - Coleman Watts, David Greenberg, Donald Lobo, + Kurund Jalmi, Michael McAndrew, Monish Deb, Pratik Joshi, + Tim Otten, Yashodha Chaku, Eileen McNaughton +AGH Strategies - Andrew Hunt, Maggie Epps, Tyrell Cook +Allan Chappell +Amnesty International Spain - Carlos Capote +Andy Clark +Arete Imagine - Marisa Porter, Nate Porter +Botanical Society of America - Toby Lounsbury +Chris Burgess +Chris Ward +Circle Interactive - Andrew Walker, Dave Jenkins +CiviDesk - Nicolas Ganivet, Sunil Pawar +Compucorp - Jamie Novick, Erawat Chamanont +CiviCoop - Erik Hommel, Jaap Jansma +Detlev Sieber +Drishtant - Ruchi Kumar +Drupal Association - Neil Drumm +Electronic Frontier Foundation - Mark Burdett, Max Hunter, Leez Wright +Freeform Solutions - Lola Slade +Fuzion, NZ - Eileen McNaughton, Peter Davis, Torrance Hodgeson +Giant Rabbit - Peter Haight, Anthony Nemirovsky +Ginkgo Street Labs - Frank J. Gómez, Michael Daryabeygi +Graham Mitchell +Great Lakes Planetarium Association - Geoff Holt +Jennifer Simonis +Jeremy Proffitt +Jim Meehan +Jimmy Huang +JMA Consulting - Joe Murray +Joanne Chester +Ken West +Kirk Jackson +Korlon - Stuart Gaston +Koumbit - Samuel Vanhove +Lighthouse Consulting and Design - Brian Shaughnessy +Mathieu Lutfy +Mission Matters - Joshua Aranda +National Democratic Institute - Chris Doten +New York State Senate - Ken Zalewski +Niro Solutions +Palente Technology Cooperative - Jon Goldberg, Joseph Lacey +Pogstone - Sarah Gladstone +Progressive Tech Project - Alice Aguilar, Jamie McClelland +Semper IT - Karin Gerritsen +Skvare - Mark Hanna, Peter Petrik +Systopia - Björn Endres +Tadpole - Dana Skallman +Tech to the People - Xavier Dutoit +Veda Consulting - Parvez Saleh, Deepak Srivastava +Web Access - Pradeep Nayak, Tony Mazzarella +Wikimedia Foundation - Adam Wight +Zing - Simon West, Andrew Tombs + +************************************************ +Key Contributors and Sponsors for 4.4 +************************************************ + +CiviCRM Team - Coleman Watts, David Greenberg, Donald Lobo, + Kurund Jalmi, Michael McAndrew, Monish Deb, + Tim Otten, Yashodha Chaku, Eileen McNaughton +AGH Strategies - Andrew Hunt +Backoffice Thinking +Chris Burgess +Circle Interactive - Andrew Walker, Dave Jenkins +CiviDesk - Nicolas Ganivet +CiviCoop - Erik Hommel, Jaap Jansma +CiviHosting - Hershel Robinson +CompuCorp - Jamie Novick, Erawat Chamanont +Confluence - Frank Gomez, Michael Daryabeygi +Dave D +Detlev Sieber +Drupal Association - Neil Drumm +Electronic Frontier Foundation - Micah Lee, Kellie Brownell +Emphanos - Allen Shaw +Freeform Solutions - Lola Slade +Fuzion, NZ - Eileen McNaughton, Peter Davis, Torrance Hodgeson +Giant Rabbit - Anna Heath +Jim Meehan +JMA Consulting - Joe Murray +Joanne Chester +Keith Morgan +Ken West +Korlon - Stuart Gaston +Koumbit - Samuel Vanhove +Lighthouse Consulting and Design - Brian Shaughnessy +Mathieu Lutfy +National Democratic Institute - Chris Doten +New York State Senate - Ken Zalewski +NfP Services (MTL Software Group) - Jag Kandasamy, Rajesh Sundararajan +Niro Solutions +Noah Miller +Orgis - Hans Idink +Palente Technology Cooperative - Jon Goldberg, Joseph Lacey +Paul Delbar +Pogstone - Sarah Gladstone +Progressive Tech Project - Alice Aguilar, Jamie McClelland +Registered Nurses Association of Ontario +San Francisco Baykeeper - Eliet Henderson +Tadpole - Dana Skallman +Tallyfox +Tech to the People - Xavier Dutoit +Veda Consulting - Parvez Saleh, Deepak Srivastava +Web Access - Pradeep Nayak +Wikimedia Foundation - Adam Wight +Zing - Simon West, Andrew Tombs + ************************************************ Key Contributors and Sponsors for 4.3 ************************************************ @@ -10,7 +121,7 @@ CiviCRM Team - Coleman Watts, David Greenberg, Deepak Srivastava, Donald Lobo, AGH Strategies - Andrew Hunt Backoffice Thinking Chris Burgess -Circle Interactive - Andrew Walker, Dave Moreton +Circle Interactive - Andrew Walker, Dave Jenkins CiviDesk - Nicolas Ganivet CiviHosting - Hershel Robinson Community Builders diff --git a/CRM/Upgrade/Page/Upgrade.php b/CRM/Upgrade/Page/Upgrade.php index 4022813d90..47ae44e710 100644 --- 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('Congratulations! Your upgrade was successful! (... wasn\'t that easy!)'); + $postUpgradeMessage = '' . ts('Congratulations! Your upgrade was successful! (... wasn\'t that easy!)') . ''; // lets drop all the triggers here CRM_Core_DAO::dropTriggers(); diff --git a/install/index.php b/install/index.php index 9516dd56bc..db9a3907d0 100644 --- a/install/index.php +++ b/install/index.php @@ -1216,9 +1216,9 @@ class Installer extends InstallRequirements { if (!$this->errors) { global $installType, $installURLPath; - $registerSiteURL = "http://civicrm.org/civicrm/profile/create?reset=1&gid=15"; + $registerSiteURL = "https://civicrm.org/register-site"; $commonOutputMessage = " -
  • Have you registered this site at CiviCRM.org? If not, please help strengthen the CiviCRM ecosystem by taking a few minutes to fill out the site registration form. 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).
    • +
  • Have you registered this site at CiviCRM.org? If not, please help strengthen the CiviCRM ecosystem by taking a few minutes to fill out the site registration form. 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).
  • We have integrated KCFinder with CKEditor and TinyMCE. This allows a user to upload images. All uploaded images are public.
    • "; diff --git a/templates/CRM/common/success.tpl b/templates/CRM/common/success.tpl index 29b6f7e418..73f9612d4d 100644 --- a/templates/CRM/common/success.tpl +++ b/templates/CRM/common/success.tpl @@ -49,7 +49,7 @@ {else}
    -
    +

    {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 ensuring that CiviCRM remains stable, sustainable and consistently improving through membership. ~Donald Lobo {/ts} @@ -58,7 +58,7 @@ {ts 1='https://civicrm.org/register-site'}Not ready for a membership yet? You can still help us learn how to improve CiviCRM by registering your site.{/ts}

    -

    {$message}

    +

    {$message}

    {if $afterUpgradeMessage}

    {ts}Important Notes{/ts}

    {$afterUpgradeMessage}

    -- 2.25.1