updated the signup form.

added text about the form at the top. the checkbox and the privacy
policy link are in the same line now.

diff --git a/2014/anti-harassment/index.html b/2014/anti-harassment/index.html
index ec7d2dc79d584de3d2d25c8806ed6c58980a9bd7..6a2b5854e7f3d2900bc33537362894a41bf44d80 100644 (file)
--- a/2014/anti-harassment/index.html
+++ b/2014/anti-harassment/index.html
@@ -34,9 +34,8 @@
                                  <input name="_qf_default" type="hidden" value="Edit:cancel" />
                                </div>
 
-                               <div id="crm-container" class="crm-container crm-public" lang="en"
-                                        xml:lang="en">
-
+                               <div id="crm-container" lang="en" xml:lang="en">
+                                 <p>Registration has not yet opened. Sign up for updates!</p>
                                  <div id="editrow-email-Primary"
                                           class="form-group">
                                        <label class="sr-only" for="email-Primary">
@@ -61,17 +60,17 @@
                                        <div class="checkbox">
                                          <input
                                                 type="hidden" name="custom_79[yes]" value="" />
-                                         <label>
+                                         <label class="lp-label-news">
                                                <input id="custom_79_yes"
                                                           name="custom_79[yes]" type="checkbox" value="1" checked="checked"
                                                           class="checkbox" />
                                                Also join the FSF's newsletter
                                          </label>
+                                         <p class="help-block">Read our
+                                               <a href="https://my.fsf.org/donate/privacypolicy.html">
+                                                 privacy policy</a>.</p>
                                        </div>
                                  </div>
-                                 <p class="help-block">Read our
-                                       <a href="https://my.fsf.org/donate/privacypolicy.html">
-                                         privacy policy</a>.</p>
                                </div>
                          </form>
                        </div> <!-- end of signup form -->

diff --git a/2014/assets/css/custom.css b/2014/assets/css/custom.css
index e7578a4db3637ec3fa03801680d82d657de43370..7c4cb617205a56e6f0f074311a5e0c27b565a1d4 100644 (file)
--- a/2014/assets/css/custom.css
+++ b/2014/assets/css/custom.css
@@ -115,6 +115,17 @@ body {
   box-shadow: none;
 }
 
+.lp-label-news {
+       display: inline-block;
+}
+
+.checkbox .help-block {
+  display: inline-block;
+  margin-top: 0;
+  margin-bottom: 10px;
+  color: #737373;
+}
+
 .btn-default {
   color: #ffffff;
   background-color: rgba(145, 145, 145, 0.5);
@@ -233,7 +244,7 @@ hr {
 }
 
 .margin-top {
-       margin-top: 40px;
+       margin-top: 22px;
 }
 
 /* Footer - adapted from <http://getbootstrap.com/examples/sticky-footer/>

diff --git a/2014/javascript/index.html b/2014/javascript/index.html
index aedc6e1d2c050bd40715747ab1ebda35e15926ef..13f77669c391f1bb92dd7a4ad6d7b1fc7c413e40 100644 (file)
--- a/2014/javascript/index.html
+++ b/2014/javascript/index.html
@@ -33,9 +33,8 @@
                                  <input name="_qf_default" type="hidden" value="Edit:cancel" />
                                </div>
 
-                               <div id="crm-container" class="crm-container crm-public" lang="en"
-                                        xml:lang="en">
-
+                               <div id="crm-container" lang="en" xml:lang="en">
+                                 <p>Registration has not yet opened. Sign up for updates!</p>
                                  <div id="editrow-email-Primary"
                                           class="form-group">
                                        <label class="sr-only" for="email-Primary">
@@ -60,17 +59,17 @@
                                        <div class="checkbox">
                                          <input
                                                 type="hidden" name="custom_79[yes]" value="" />
-                                         <label>
+                                         <label class="lp-label-news">
                                                <input id="custom_79_yes"
                                                           name="custom_79[yes]" type="checkbox" value="1" checked="checked"
                                                           class="checkbox" />
                                                Also join the FSF's newsletter
                                          </label>
+                                         <p class="help-block">Read our
+                                               <a href="https://my.fsf.org/donate/privacypolicy.html">
+                                                 privacy policy</a>.</p>
                                        </div>
                                  </div>
-                               <p class="help-block">Read our
-                                 <a href="https://my.fsf.org/donate/privacypolicy.html">
-                                         privacy policy</a>.</p>
                                </div>
                          </form>
                        </div> <!-- end of signup form -->

diff --git a/server/staging/lpc14/index.html b/server/staging/lpc14/index.html
index 36bcafd61dabe5fb97552c2c85e135d8c27ec054..8cfeacf7f89f8c5e954c7917d12f5ee0512c1718 100644 (file)
--- a/server/staging/lpc14/index.html
+++ b/server/staging/lpc14/index.html
@@ -34,9 +34,8 @@
                                  <input name="_qf_default" type="hidden" value="Edit:cancel" />
                                </div>
 
-                               <div id="crm-container" class="crm-container crm-public" lang="en"
-                                        xml:lang="en">
-
+                               <div id="crm-container" lang="en" xml:lang="en">
+                                 <p>Registration has not yet opened. Sign up for updates!</p>
                                  <div id="editrow-email-Primary"
                                           class="form-group">
                                        <label class="sr-only" for="email-Primary">
@@ -61,17 +60,17 @@
                                        <div class="checkbox">
                                          <input
                                                 type="hidden" name="custom_79[yes]" value="" />
-                                         <label>
+                                         <label class="lp-label-news">
                                                <input id="custom_79_yes"
                                                           name="custom_79[yes]" type="checkbox" value="1" checked="checked"
                                                           class="checkbox" />
                                                Also join the FSF's newsletter
                                          </label>
+                                         <p class="help-block">Read our
+                                               <a href="https://my.fsf.org/donate/privacypolicy.html">
+                                                 privacy policy</a>.</p>
                                        </div>
                                  </div>
-                               <p class="help-block">Read our
-                                 <a href="https://my.fsf.org/donate/privacypolicy.html">
-                                         privacy policy</a>.</p>
                                </div>
                          </form>
                        </div> <!-- end of signup form -->