Polishing up the streaming pages.

diff --git a/2014/live/room123.html b/2014/live/room123.html
index 4ccebef4e5bc0db7b95a93087071def755642387..1fa6ed0e62b656a70fdff2eeede1a5a64f7e9242 100644 (file)
--- a/2014/live/room123.html
+++ b/2014/live/room123.html
@@ -108,12 +108,11 @@
                                  <li><a href="http://libreplanet.org/2014/live/room141.html">Room 141</a></li>
                                  <li><a href="http://libreplanet.org/2014/live/room155.html">Room 155</a></li>
                                </ol>
-<p>Join the discussion on IRC!</p>
+<p>Join the discussion online!</p>
 <ul>
 <li>Conference-wide IRC channel: <strong>#libreplanet</strong></li>
-<li>IRC channel for room 123: <strong>#libreplanet_room123</strong></li>
-<br>
-<li>Conference hashtag for <a href="https://fsf.org/twitter">microblogging</a>: #lp2015</li>
+<li>IRC channel for Room 123: <strong>#libreplanet_room123</strong></li>
+<li>Conference hashtag for <a href="https://fsf.org/twitter">microblogging</a>: #lp2014</li>
 </ul>
 
                          </div>
@@ -122,7 +121,7 @@
 
                                <div class="panel panel-default"> <!-- start support bar -->
                                  <div class="panel-heading">
-                                       <h3 class="panel-title">Support FSF!</h3>
+                                       <h3 class="panel-title">Support the FSF!</h3>
                                  </div>
                                  <div class="panel-body">
                                        <p>Hard-working FSF hackers are running our most
@@ -143,10 +142,10 @@
 
                                <div class="panel panel-default"> <!-- start LP15 signup -->
                                  <div class="panel-heading">
-                                       <h3 class="panel-title">Get updates about LibrePlanet 2015</h3>
+                                       <h3 class="panel-title">Stay in the loop</h3>
                                  </div>
                                  <div class="panel-body">
-
+<p>Sign up to receive updates about LibrePlanet 2015.</p>
                                        <form action="https://crm.fsf.org/civicrm/profile/create?gid=281&amp;reset=1"
                                                  class="" method="post" name="Edit" id="Edit" >
 

diff --git a/2014/live/room141.html b/2014/live/room141.html
index ccda3d930cd57270b237ed05ae59e7535cfd477a..1c4f0dfc12613351a5d0cc9ead230ed48b836080 100644 (file)
--- a/2014/live/room141.html
+++ b/2014/live/room141.html
@@ -107,14 +107,19 @@
                                  <li class="active">Room 141</a></li>
                                  <li><a href="http://libreplanet.org/2014/live/room155.html">Room 155</a></li>
                                </ol>
-
+<p>Join the discussion online!</p>
+<ul>
+<li>Conference-wide IRC channel: <strong>#libreplanet</strong></li>
+<li>IRC channel for Room 141: <strong>#libreplanet_room141</strong></li>
+<li>Conference hashtag for <a href="https://fsf.org/twitter">microblogging</a>: #lp2014</li>
+</ul>
                          </div>
 
                          <div class="col-sm-4"> <!-- start sidebar -->
 
                                <div class="panel panel-default"> <!-- start support bar -->
                                  <div class="panel-heading">
-                                       <h3 class="panel-title">Support FSF!</h3>
+                                       <h3 class="panel-title">Support the FSF!</h3>
                                  </div>
                                  <div class="panel-body">
                                        <p>Hard-working FSF hackers are running our most
@@ -135,10 +140,10 @@
 
                                <div class="panel panel-default"> <!-- start LP15 signup -->
                                  <div class="panel-heading">
-                                       <h3 class="panel-title">LP15 Signup!</h3>
+                                       <h3 class="panel-title">Stay in the loop</h3>
                                  </div>
                                  <div class="panel-body">
-
+<p>Sign up to receive updates about LibrePlanet 2015.</p>
                                        <form action="https://crm.fsf.org/civicrm/profile/create?gid=281&amp;reset=1"
                                                  class="" method="post" name="Edit" id="Edit" >
 

diff --git a/2014/live/room155.html b/2014/live/room155.html
index c6479694c44c48e7cd1a07ff3de83baf50abed68..2153306c3775f9ef1d16ba4062dda4d317724962 100644 (file)
--- a/2014/live/room155.html
+++ b/2014/live/room155.html
@@ -107,14 +107,19 @@
                                  <li><a href="http://libreplanet.org/2014/live/room141.html">Room 141</a></li>
                                  <li class="active">Room 155</li>
                                </ol>
-
+<p>Join the discussion online!</p>
+<ul>
+<li>Conference-wide IRC channel: <strong>#libreplanet</strong></li>
+<li>IRC channel for Room 155: <strong>#libreplanet_room155</strong></li>
+<li>Conference hashtag for <a href="https://fsf.org/twitter">microblogging</a>: #lp2014</li>
+</ul>
                          </div>
 
                          <div class="col-sm-4"> <!-- start sidebar -->
 
                                <div class="panel panel-default"> <!-- start support bar -->
                                  <div class="panel-heading">
-                                       <h3 class="panel-title">Support FSF!</h3>
+                                       <h3 class="panel-title">Support the FSF!</h3>
                                  </div>
                                  <div class="panel-body">
                                        <p>Hard-working FSF hackers are running our most
@@ -135,10 +140,10 @@
 
                                <div class="panel panel-default"> <!-- start LP15 signup -->
                                  <div class="panel-heading">
-                                       <h3 class="panel-title">LP15 Signup!</h3>
+                                       <h3 class="panel-title">Stay in the loop</h3>
                                  </div>
                                  <div class="panel-body">
-
+<p>Sign up to receive updates about LibrePlanet 2015.</p>
                                        <form action="https://crm.fsf.org/civicrm/profile/create?gid=281&amp;reset=1"
                                                  class="" method="post" name="Edit" id="Edit" >