replicant s3 picture + alphabetizing sellers

[fsf-giving-guide.git] / v10 / givingguide.html

diff --git a/v10/givingguide.html b/v10/givingguide.html
index 1614621aabbe4eb3c9c98af28797cb4d01822e01..39f0c5405d7f1b007d2c66dab447df443698e480 100644 (file)
--- a/v10/givingguide.html
+++ b/v10/givingguide.html
@@ -675,7 +675,7 @@ advertisers.</p>
           <div class="row is-table-row">
           <div class="good col-md-6 col-sm-6" style="position:relative">
           <h5 class="text-center">Galaxy S3 with Replicant</h5>
           <div class="row is-table-row">
           <div class="good col-md-6 col-sm-6" style="position:relative">
           <h5 class="text-center">Galaxy S3 with Replicant</h5>

-            <img src="img/products/mobile_n2.png" alt="replicant phone" class="center-block" />
+            <img src="img/products/mobile_s3.png" alt="replicant phone" class="center-block" />

             <!-- Buy/Download Button   -->
             <a id="get-item-replicant" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-replicant" aria-expanded="false" aria-controls="sellers" style="display:none">
               BUY
             <!-- Buy/Download Button   -->
             <a id="get-item-replicant" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-replicant" aria-expanded="false" aria-controls="sellers" style="display:none">
               BUY


@@ -688,7 +688,10 @@ advertisers.</p>
                 <p style="color: #6b6b6b">
                   <strong>Get it from</strong>
                 </p>
                 <p style="color: #6b6b6b">
                   <strong>Get it from</strong>
                 </p>

-                <a href="https://tehnoetic.com/tehnoetic-s3-phone-replicant" class="seller action-button">Technoethical</a>
+                               <p>                <a href="https://tehnoetic.com/tehnoetic-s3-phone-replicant" class="seller action-button">Technoethical</a></p>
+                                               <p class="sale-info links">
+                  <a href="#technoethical-promotion">Sale details.</a>           
+                </p>

               </div>
             </div>
 
               </div>
             </div>
 


@@ -758,6 +761,9 @@ advertisers.</p>
             <!-- Buy/Download Button   -->
             <a id="get-item-x200" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-x200" aria-expanded="false" aria-controls="sellers-x200" style="display:none">
               BUY
             <!-- Buy/Download Button   -->
             <a id="get-item-x200" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-x200" aria-expanded="false" aria-controls="sellers-x200" style="display:none">
               BUY

+              <!-- Begin Sale -->
+              <span class="sale" >sale</span>
+              <!-- End Sale -->

                        </a>
             <div class="collapse" id="sellers-x200">
               <div class="center-block seller-group">
                        </a>
             <div class="collapse" id="sellers-x200">
               <div class="center-block seller-group">


@@ -767,7 +773,10 @@ advertisers.</p>
                <p>
                <a href="https://shop.libiquity.com/product/taurinus-x200" class="seller action-button">Libiquity</a>
                </p>
                <p>
                <a href="https://shop.libiquity.com/product/taurinus-x200" class="seller action-button">Libiquity</a>
                </p>

+                               <p><a href="https://tehnoetic.com/laptops/tet-x200" class="seller action-button">Technoethical</a></p>

                                <p>  <a href="https://store.vikings.net/x200-ryf-certfied" class="seller action-button">Vikings</a></p>
                                <p>  <a href="https://store.vikings.net/x200-ryf-certfied" class="seller action-button">Vikings</a></p>

+                <p class="sale-info links">
+                  <a href="#technoethical-promotion">Sale details.</a></p>

               </div>
             </div>
 
               </div>
             </div>
 


@@ -781,8 +790,12 @@ advertisers.</p>
                 </p>
                <p>
                <a href="https://shop.libiquity.com/product/taurinus-x200" class="seller action-button">Libiquity</a>
                 </p>
                <p>
                <a href="https://shop.libiquity.com/product/taurinus-x200" class="seller action-button">Libiquity</a>

-               </p><p>
-                                 <a href="https://store.vikings.net/x200-ryf-certfied" class="seller action-button">Vikings</a></p>
+               </p>
+                       <p><a href="https://tehnoetic.com/laptops/tet-x200" class="seller action-button">Technoethical</a></p>
+<p>                              <a href="https://store.vikings.net/x200-ryf-certfied" class="seller action-button">Vikings</a></p>
+                               <p class="sale-info links">
+                  <a href="#technoethical-promotion">Sale details.</a>           
+                </p>

               </div>
             </noscript>
             <!-- End Buy/Download button -->
               </div>
             </noscript>
             <!-- End Buy/Download button -->


@@ -942,7 +955,10 @@ numbers, which aids in password generation and encryption.</p>
               </a>
               <div class="collapse" id="sellers-mini-adapter">
                 <div class="center-block seller-group">
               </a>
               <div class="collapse" id="sellers-mini-adapter">
                 <div class="center-block seller-group">

-                  <a href="https://www.thinkpenguin.com/gnu-linux/penguin-wireless-n-usb-adapter-gnu-linux-tpe-n150usb" class="seller action-button">ThinkPenguin</a>
+                                 <p><a href="https://tehnoetic.com/tehnoetic-wireless-adapter-gnu-linux-libre-tet-n150" class="seller action-button">Technoethical</a></p>
+<p class="sale-info links">
+  <a href="#technoethical-promotion">Sale details</a></p>
+                  <p><a href="https://www.thinkpenguin.com/gnu-linux/penguin-wireless-n-usb-adapter-gnu-linux-tpe-n150usb" class="seller action-button">ThinkPenguin</a></p>

                   <p class="sale-info links">
                     <a href="#thinkpenguin-promotion">Sale details.</a>
                   </p>
                   <p class="sale-info links">
                     <a href="#thinkpenguin-promotion">Sale details.</a>
                   </p>


@@ -957,6 +973,9 @@ numbers, which aids in password generation and encryption.</p>
                   <p style="color: #6b6b6b">
                     <strong>Get it from</strong>
                   </p>
                   <p style="color: #6b6b6b">
                     <strong>Get it from</strong>
                   </p>

+                                 <p><a href="https://tehnoetic.com/tehnoetic-wireless-adapter-gnu-linux-libre-tet-n150" class="seller action-button">Technoethical</a></p>
+<p class="sale-info links">
+  <a href="#technoethical-promotion">Sale details</a></p>

                   <a href="https://www.thinkpenguin.com/gnu-linux/penguin-wireless-n-usb-adapter-gnu-linux-tpe-n150usb" class="seller action-button">ThinkPenguin</a>
 <p class="sale-info links">
                     <a href="#thinkpenguin-promotion">Sale details.</a>
                   <a href="https://www.thinkpenguin.com/gnu-linux/penguin-wireless-n-usb-adapter-gnu-linux-tpe-n150usb" class="seller action-button">ThinkPenguin</a>
 <p class="sale-info links">
                     <a href="#thinkpenguin-promotion">Sale details.</a>


@@ -1138,7 +1157,7 @@ numbers, which aids in password generation and encryption.</p>
 <li>All of the music on <a href="https://bandcamp.com">Bandcamp</a> is DRM-free and comes in a variety of formats, including patent-free ones like FLAC and Ogg Vorbis.</li>
 <li><a href="https://www.dischord.com/">Dischord Records</a>, a classic punk label providing music since 1980.</li>
 <li><a href="https://www.emusic.com/">Emusic</a> is a DRM-free replacement for services like Spotify and Apple Music.</li>
 <li>All of the music on <a href="https://bandcamp.com">Bandcamp</a> is DRM-free and comes in a variety of formats, including patent-free ones like FLAC and Ogg Vorbis.</li>
 <li><a href="https://www.dischord.com/">Dischord Records</a>, a classic punk label providing music since 1980.</li>
 <li><a href="https://www.emusic.com/">Emusic</a> is a DRM-free replacement for services like Spotify and Apple Music.</li>

-<li><a href="https://folkways.si.edu/">Folkways</a>, providing digital downloads of the world's best folk and children's music, courtesy of the Smithsonian Institute, courtesy of the Smithsonian Institute.</li>
+<li><a href="https://folkways.si.edu/">Folkways</a>, providing digital downloads of the world's best folk and children's music, courtesy of the Smithsonian Institute.</li>

 </ul>
                  </div>
           <div class="good col-md-6 col-sm-6">
 </ul>
                  </div>
           <div class="good col-md-6 col-sm-6">