Updated faq, updated sections, removed donation refs

2 files changed, 18 insertions, 20 deletions

diff --git a/theme/templates/base.html b/theme/templates/base.html
index 49a3958..13e5575 100644
--- a/theme/templates/base.html
+++ b/theme/templates/base.html
@@ -87,7 +87,7 @@
                         <li><a href="{% if self.title() != SITENAME %}/{% endif %}#news" class="smooth">News</a></li>
                         <li><a href="{% if self.title() != SITENAME %}/{% endif %}#about" class="smooth">About</a></li>
                         <li><a href="{% if self.title() != SITENAME %}/{% endif %}#features" class="smooth">Features</a></li>
-                        <li><a href="{% if self.title() != SITENAME %}/{% endif %}#donate" class="smooth">Donate</a></li>
+<!--                        <li><a href="{% if self.title() != SITENAME %}/{% endif %}#donate" class="smooth">Donate</a></li>-->
                     </ul>
                     <ul class="nav navbar-nav navbar-right">
                         <li{% if self.title() == "FAQ" %} class="active"{% endif %}><a href="/faq">FAQ</a></li>
diff --git a/theme/templates/index.html b/theme/templates/index.html
index ecaaa0a..459006b 100644
--- a/theme/templates/index.html
+++ b/theme/templates/index.html
@@ -117,8 +117,8 @@
                 
                 
         <p>Most importantly, the <span class="neo900">Neo900</span> is an <strong>open platform</strong>, carrying on in the tradition  of the <a href="http://openmoko.org/">Openmoko</a> project.
-        <span class="neo900">Neo900</span> will support all operating systems available for GTA04 (<a href="http://qtmoko.sourceforge.net/">QtMoko</a>, <a href="http://shr-project.org/">SHR</a>, <a href="http://debian.org/">Debian</a>, <a href="http://replicant.us/">Replicant</a>, ...) and should serve as a great platform for porting systems like <a href="http://talk.maemo.org/showthread.php?t=91308">Maemo</a>, Ubuntu or Firefox OS - or even for writing your own one! We <strong>bring the hardware</strong>, you <strong>choose your OS</strong>.</p>
-                
+        <span class="neo900">Neo900</span> will support all operating systems available for GTA04 (<a href="http://qtmoko.sourceforge.net/">QtMoko</a>, <a href="http://shr-project.org/">SHR</a>, <a href="http://debian.org/">Debian</a>, <a href="http://replicant.us/">Replicant</a>, ...) and should serve as a great platform for porting systems like <a href="http://talk.maemo.org/showthread.php?t=91308">Maemo</a>, Ubuntu or Firefox OS - or even for writing your own one!</p>
+        <p>We <strong>bring the hardware</strong>, you <strong>choose the operating system</strong>.</p>
         
         <a href="http://talk.maemo.org/showthread.php?t=91142" class="btn btn-default">See the forum thread &raquo;</a>
         </div>
@@ -181,8 +181,8 @@
     </div>
     <div class="col-sm-6 col-md-4">
     <div class="thumbnail">
-    <h3>Battery hot-swap</h3>
-    <p>For all fast handed hackers over there that can replace the battery in just few seconds, we're going to support switching it <strong>on the fly</strong>, without turning off the phone!</p>
+    <h3>NFC</h3>
+    <p>Hacker friendly NFC circuit with SWP support for secure element in either of both SIM slots, exposed RF pads and the freedom to implement custom solutions down to the driver/signal-modulation level.</p>
     </div>
     </div>
     </div>
@@ -232,27 +232,25 @@
     </div>
     </div>
 
-    <div class="jumbotron stripe sunrise" id="donate" data-stellar-background-ratio="0.5">
-    <a target="_blank"  class="credit" href="https://secure.flickr.com/photos/ptrktn/4233596678/" data-toggle="popover" data-trigger="hover" data-placement="left" data-content='"The First Sunrise of 2010" licensed on CC-BY 2.0'>by ptrktn</a>
-    <div class="container">
-<h2 class="h1">Donating</h2>
-<p class="center" style="margin: 40px 0 10px"><strong>Current state:</strong> 423 donations received <span style="font-size: 0.75em">(March 12, 2015)</span></p>
-<p class="center">Please <a href="subscribe" style="color: white; text-decoration: underline" class="btn-subscribe" data-toggle="modal">subscribe to our newsletter</a> to stay informed!</p>
-
-<p class="center" style="margin-top: 40px"><a class="btn btn-lg btn-primary" href="/donate">Donate</a></p>
-
-
-<p class="center" style="font-size:0.75em; margin-top: 2em"><a href="/donate-gdc" style="color: white; text-decoration: underline">Donated previously but haven't transfered yet?</a></p>
-
-</div>
-</div>
-    
 <div class="jumbotron stripe">
 <div>
 <a href="http://talk.maemo.org/showthread.php?t=93375" target="_blank"><img src="/static/plan.png" style="width:100%" /></a>
 </div>
 </div>
+<!--
+    <div class="jumbotron stripe sunrise" id="donate" data-stellar-background-ratio="0.5">
+    <a target="_blank"  class="credit" href="https://secure.flickr.com/photos/ptrktn/4233596678/" data-toggle="popover" data-trigger="hover" data-placement="left" data-content='"The First Sunrise of 2010" licensed on CC-BY 2.0'>by ptrktn</a>
+    <div class="container center">
+<h2 class="h1">Donate</h2>
+<p>Please note, we are still accepting new donations, but they are no longer considered as a pre-order, neither are the amount offered as a rebate if you would like to order a device.<br />
+All donations made from now on are consider as nothing but <strong>pure donations</strong> to help this project succeed.</p>
+<p style="margin-top: 2em;"><a class="btn btn-lg btn-primary" href="/donate">Donate</a></p>
+<p class="center" style="font-size:0.75em; margin-top: 2em"><a href="/donate-gdc" style="color: white; text-decoration: underline">Donated previously but haven't transfered yet?</a></p>
+<p style="margin-top: 2em;">Please <a href="subscribe" style="color: white; text-decoration: underline" class="btn-subscribe" data-toggle="modal">subscribe to our newsletter</a> to stay informed!</p>
 
+</div>
+</div>
+-->
       <!-- /END THE FEATURETTES -->