Merge branch 'master' into stable

[libreplanet-static.git] / 2015 / exhibit / index.html

diff --git a/2015/exhibit/index.html b/2015/exhibit/index.html
index fa919b49096ad21c3e0afeb177138722f1f5098d..b4c4495a8ced28aa484dbfc729ec99633343378b 100755 (executable)
--- a/2015/exhibit/index.html
+++ b/2015/exhibit/index.html
@@ -1,5 +1,11 @@
 <!--#include virtual="/server/2015/header.html"-->
-                       <h2> Exhibitor Application(form in development) </h2>
+
+<title>LibrePlanet 2015 &mdash; Exhibitor Application</title>
+
+<!--#include virtual="/server/2015/banner.html"-->
+<!--#include virtual="/server/2015/sidebar.html"-->
+
+                       <h2> Exhibitor Application</h2>
 
                        <p>LibrePlanet is the perfect place to
                          spread the word about your organization to an inspired and engaged
@@ -45,10 +51,16 @@
                          <div>
                                <input name="entryURL" type="hidden"
                                           value="https://crm.fsf.org/civicrm/contact/view/delete?=&amp;amp;reset=1&amp;amp;delete=1&amp;amp;cid=743827" />
+                               <!-- change the below URL to
+                                        https://libreplanet.org/2015/exhibit/confirmation.html
+                                        before merging to stable branch -->
                                <input name="postURL" type="hidden"
-                                                 value="https://libreplanet.org/2015/exhibit/confirmation.html" />
+                                                 value="http://libreplanet.org/2015/exhibit/confirmation.html" />
+                               <!-- change the below URL to
+                                        https://libreplanet.org/2015/exhibit/
+                                        before merging to stable branch -->
                                <input name="cancelURL" type="hidden"
-                                          value="https://libreplanet.org/2015/exhibit/" />
+                                          value="http://libreplanet.org/2015/exhibit/" />
                                <input name="add_to_group" type="hidden" value="803" />
                                <input name="_qf_default" type="hidden" value="Edit:cancel" />
                          </div>
@@ -532,7 +544,7 @@
                                        the exhibit hall must meet the FSF's criteria.</li>
                                  <li>Space will be assigned on a first-come, first-served basis.</li>
                                  <li>Exhibitors must follow our
-                                       <a href="http://libreplanet.org/2014/anti-harassment/">anti-harassment
+                                       <a href="../anti-harassment/">anti-harassment
                                          policy</a>.</li>
                                  <li>Logistical details, including shipping information, will be provided
                                        at a later date.</li>