[gnome-web-www] Update the content of the page to make it clear that the matter is resolved

[Marina Zhurakhinskaya <marinaz src gnome org>]

commit 2b2aa3733513d08c74b5d9878426253a36cdbcc7
Author: Marina Zhurakhinskaya <marinaz redhat com>
Date:   Thu Nov 13 13:35:56 2014 -0500

    Update the content of the page to make it clear that the matter is resolved

 theme/groupon/index.html |   27 ++++++++++++---------------
 1 files changed, 12 insertions(+), 15 deletions(-)
---
diff --git a/theme/groupon/index.html b/theme/groupon/index.html
index 79b3927..bc382ae 100644
--- a/theme/groupon/index.html
+++ b/theme/groupon/index.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Help the GNOME Foundation defend the GNOME trademark</title>
+    <title>Thank you for helping the GNOME Foundation defend the GNOME trademark!</title>
 
     <!-- Bootstrap -->
     <link href="https://static.gnome.org/groupon/css/bootstrap.min.css"; rel="stylesheet">
@@ -23,7 +23,7 @@
     <div class="header">
       <div class="container">
         <div class="row">
-          <div class="col-md-10 col-md-offset-1"><h1>Help the GNOME Foundation defend the GNOME trademark 
against Groupon!</h1></div>
+          <div class="col-md-10 col-md-offset-1"><h1>Thank you for helping the GNOME Foundation defend the 
GNOME trademark!</h1></div>
         </div>
       </div>
    </div>
@@ -32,8 +32,15 @@
       <div class="row">
         <div class="col-md-10 col-md-offset-1">
 
-          <p>Update: Thank you for all the support that you have given us.
-          Groupon has <a 
href="http://www.gnome.org/news/2014/11/groupon-has-agreed-to-change-its-product-name/";>confirmed</a> with 
the GNOME Foundation that they are going to abandon all of their 28 pending trademark applications and will 
proceed with a name change for their product. We could not have done this without your help!</p>
+          <p><b>This matter is resolved!</b> Thank you for all the support that you have given us! The 
response to this campaign was overwhelming, with 5622 individuals contributing USD 102,608.76 to help the 
GNOME Foundation defend its trademark. As a result of the campaign, Groupon <a 
href="http://www.gnome.org/news/2014/11/groupon-has-agreed-to-change-its-product-name/";>decided</a> to 
abandon all of their 28 pending trademark applications and will proceed with a name change for their product. 
We could not have done this without your help!</p>
+
+          <p>GNOME is humbled by the support we have received from the community and we are excited that the 
money raised can now be spent on making GNOME better. We look forward to reporting back to you on all the 
great things this will enable us to do!</p>
+
+          <p>If you would like to support GNOME further, you can become a <a 
href="http://www.gnome.org/friends/";>Friend of GNOME!</a></p>
+
+<div style="margin-top:50px">
+
+          <p><i>Below is the text of the original fundraising plea and the supporting quotes. It was also 
accompanied by the donation button and the buttons to spread the message on social media.</i></p>
 
           <p>"GNOME" has been a familiar name in software for the past 17 years, and a <a 
href="http://tsdr.uspto.gov/#caseNumber=76368848&caseType=SERIAL_NO&searchType=statusSearch";>registered 
trademark</a> since 2006. The <a href="https://www.gnome.org/";>GNOME project</a> has been a staple desktop 
for GNU/Linux and BSD desktops. It was the default desktop for Sun Microsystems workstation class machines, 
continues to be the default desktop for the Red Hat Enterprise Linux and SUSE Linux Enterprise Server 
distributions, and it is the default desktop of Fedora and Debian. SUSE Linux Enterprise Point of Service 
solution for the retail industry is based on GNOME. GNOME technology can be found in TVs, tablets, phones, 
consumer devices, and in common software everywhere.</p>
 
@@ -41,17 +48,6 @@
 
           <p>We want to show that our brand matters and that you care. Of the 28 trademark applications 
Groupon filed, we have to file formal proceedings to oppose 10 of them by December 3, 2014. Help us raise the 
funds to fight back and most of all call public attention to this terrible behavior by Groupon. Help us make 
sure that when people hear about GNOME software they learn about freedom and not proprietary software.  Our 
counsel has advised us that we will need $80,000 to oppose the registration of the first set of 10 
applications. If we are able to defend the mark without spending this amount, we will use the remaining funds 
to bolster and improve GNOME. Please help us raise the money to protect GNOME's trademark and strengthen Free 
Software!</p>
 
-          <div class="row">
-            <div class="col-md-6 col-md-offset-3">
-              <div class="donate-share-container">
-                <a href="https://www.gnome.org/friends/"; class="btn btn-success donate-button">Become a 
friend of GNOME!</a>
-               <p class="spread-the-word"><a 
href="https://www.gnome.org/friends/other-ways-to-donate/";>GNOME can also accept donations by check, 
bank/wire transfer, Flattr and Bitcoin</a></p>
-                <p class="spread-the-word">Say something about this on: <a 
href="https://www.facebook.com/sharer.php?u=https://gnome.org/groupon/";>Facebook</a>, <a 
href="https://plus.google.com/share?url=https://gnome.org/groupon/";>Google+</a> and <a 
href="https://twitter.com/intent/tweet?url=https://gnome.org/groupon/&related=gnome";>Twitter</a></p>
-                <p class="spread-the-word">So far, we have raised 101453.65 USD. We would like to thank our 
donors for their generous support.</p>
-              </div>
-            </div>
-          </div>
-
          <p><quote>This legal defense is not just about protecting GNOME's trademark; it is about asserting 
to the corporate world that FLOSS trademarks can and will be guarded. Not just by the project in question, 
but by the community as a whole. As a result, all FLOSS trademarks will be strengthened at once.</quote><br/>
 -- Lucas Nussbaum, Debian Project Leader</p>
 
@@ -61,6 +57,7 @@
   <p><quote>GNOME has been one of the hallmarks and foundation for the open source community for over 15 
years.  We are outraged that Groupon would attempt to insinuate that its proprietary software and products 
have anything to do with the GNOME community and years of trust and good will that GNOME has built over the 
years.  We stand by GNOME in protecting its trademark and encourage everyone in the open source and free 
software community to do the same.</quote><br/>
   -- Andrew Lee, Private Internet Access co-founder and Chief Creative Officer</p>
 
+</div>
           <div class="footer-art"></div>
 
         </div>