updated the sidebar of the LP 14 pages.

[libreplanet-static.git] / 2014 / anti-harassment / index.html

diff --git a/2014/anti-harassment/index.html b/2014/anti-harassment/index.html
index e5a9c129c0d9985240272f90d1e17f27f5d87b65..b4b17071dc236a244da2b648400e18d6accd88a6 100644 (file)
--- a/2014/anti-harassment/index.html
+++ b/2014/anti-harassment/index.html
@@ -19,7 +19,7 @@
                          <div class="lp-head">
                                <h1><a href="/server/staging/lpc14"> LibrePlanet <small>2014</small></a></h1>
                                <p><strong>March 2014 in Cambridge, MA</strong></p>
-                               <p class="text-muted">The yearly conference of the free software community</p>
+                               <p class="text-muted">A yearly conference for the free software community.</p>
                          </div>
                        </div><!-- end of lp header -->
                        <div class="col-sm-5"> <!-- start of signup form -->
@@ -64,11 +64,14 @@
                                                <input id="custom_79_yes"
                                                           name="custom_79[yes]" type="checkbox" value="1" checked="checked"
                                                           class="checkbox" />
-                                               Also join the FSF's newsletter
+                                               Also subscribe to the FSF's newsletter and updates.
                                          </label>
                                          &middot;
                                          <p class="help-block">
-                                               <a href="https://my.fsf.org/donate/privacypolicy.html">Read our privacy policy.</a></p>
+                                               <a href="https://my.fsf.org/donate/privacypolicy.html">
+                                                 Privacy policy
+                                               </a>
+                                         </p>
                                        </div>
                                  </div>
                                </div>
@@ -97,16 +100,17 @@
                                  Share your ideas</a></li>
                        </ul>
                        <ul class="nav nav-pills nav-stacked">
-                         <li><a href="https://libreplanet.org/wiki/LibrePlanet:Conference/2013/Video">LibrePlanet 2013 videos</a></li>
+                         <li><a href="http://media.libreplanet.org/">LibrePlanet 2013 videos</a></li>
                          <li><a href="https://libreplanet.org/wiki/LibrePlanet:Conference">Previous conferences</a></li>
                          <li class="active"><a href="/2014/anti-harassment/">Anti-harassment policy</a></li>
                          <li class="fsf-donate">
                                <a href="https://my.fsf.org/associate/support_freedom">
                                  <span class="glyphicon glyphicon-heart"></span>
-                                 Donate to the FSF
+                                 Become an FSF member
                                </a>
                          </li>
                        </ul>
+                       <p class="text-muted text-center">and attend the conference gratis!</p>
                  </div> <!-- end of nav items -->
 
                  <div class="col-sm-9"> <!-- start of anti-harassment column -->
@@ -150,7 +154,19 @@
                  Foundation</a> is a nonprofit with a worldwide mission to
                  advance software freedom.</p>
 
-                 <p class="text-muted text-center"><a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US"><img alt="Creative Commons License" style="border-width:0" src="//i.creativecommons.org/l/by-sa/3.0/80x15.png" /></a>  This page and its images, logos and videos are licensed under a<br><a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported License</a>. Copyright &copy; 2013 Free Software Foundation.</p>
+               <p class="text-muted text-center">
+                 <a rel="license"
+                        href="http://creativecommons.org/licenses/by-sa/3.0/us/">
+                       <img alt="[ Creative Commons License ]" style="border-width:0"
+                                src="//i.creativecommons.org/l/by-sa/3.0/80x15.png" />
+                 </a>
+                 This page and its images, logos and videos are licensed under a <br />
+                 <a rel="license"
+                        href="http://creativecommons.org/licenses/by-sa/3.0/us/">
+                       Creative Commons Attribution-ShareAlike 3.0 US
+                 </a>.
+                 Copyright &copy; 2013 Free Software Foundation.
+               </p>
 
                <p class="text-muted text-center">
                  <a href="http://weblabels.fsf.org/libreplanet.org/CURRENT/" rel="jslicense">