Merge branch 'lil-updates' into 'master'

Lil updates

See merge request monero-project/forum-funding-system!8

_layouts/ffs-fr.html

@@ -59,7 +59,7 @@ layout: base
                                 <p class="bar-fund-status">Raised <span class="progress-number-funded">{{proposal.amount-funded}}</span> of <span class="progress-number-goal">{{proposal.amount}}</span> XMR</p>
                             </div>
                             <div class="progress-bar">
-                                <span class="fund-progress" style="width: {{proposal-percentage}}%"></span>
+                                <span class="fund-progress" style="width: {{proposal.percentage}}%"></span>
                             </div>
                            <p><a href="{{proposal.donate-url}}" class="btn btn-primary">Contribute</a></p>
                            {%endif%}

_layouts/ffs-wip.html

@@ -88,7 +88,7 @@ layout: base
                                             </div>
                                     {%endif%}
                                   </div>
-                                </div>
+                             </div>
                        </div>
                     </div>
                 </div>

forum-funding-system/donate/index.html

@@ -131,33 +131,22 @@
                                             <p>1. Choose the amount of XMR you wish to contribute to this proposal</p>
                                             <p>2. Scan this QR code or tap to open in your Monero wallet app:</p>
                                             <p>
-                                                <a href="[MONERO LINK HERE]" class="qr"><img src="[PATH TO QR CODE HERE]"/></a>
+                                                <a href="[MONERO URL HERE]" class="qr"><img src="[QR CODE IMAGE HERE]"/></a>
                                             </p>
                                             <p>3. Send! Thank you! You are amazing!</p>
                                        </div>
                                   </div>
                                   <input class="input" name="tabs" type="radio" id="tab-2"/>
-                                  <label class="label" for="tab-2">Integrated Address</label>
+                                  <label class="label" for="tab-2">Address</label>
                                   <div class="panel col-xs-12">
                                       <div class="panel-segment">
-                                            <h3>Contribute using an integrated address</h3>
+                                            <h3>Contribute using an address</h3>
                                             <p>1. Choose the amount of XMR you wish to contribute to this proposal</p>
-                                            <p>2. Enter the following XMR address:</p>   <p class="string">[INTEGRATED ADDRESS HERE]</p>
+                                            <p>2. Enter the following XMR address:</p>   <p class="string">[SUBADDRESS HERE]</p>
                                             <p>3. Send! Thank you! You are amazing!</p>
                                       </div>
                                   </div>
-                                  <input class="input" name="tabs" type="radio" id="tab-3"/>
-                                  <label class="label" for="tab-3">Payment ID</label>
-                                  <div class="panel col-xs-12">
-                                        <div class="panel-segment">
-                                            <h3>Contribute using a payment ID</h3>
-                                            <p>1. Choose the amount of XMR you wish to contribute to this proposal</p>
-                                            <p>2. Enter the following XMR address:</p>   <p class="string">45ttEikQEZWN1m7VxaVN9rjQkpSdmpGZ82GwUps66neQ1PqbQMno4wMY8F5jiDt2GoHzCtMwa7PDPJUJYb1GYrMP4CwAwNp</p>
-                                            <p>3. Enter the following payment ID that is unique to this proposal:</p>                 <p class="string">[PAYMENT ID HERE]</p>
-                                            <p>4. Send! Thank you! You're amazing!</p>
-                                        </div>
-                                  </div>
-                                </div>
+                              </div>
                        </div>
                     </div>
         </section>