typo in Newsletter success msg - new verification code tooltip msg on both forms...

diff --git a/.htaccess b/.htaccess
index 9c67ac2..8089430 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -14,7 +14,7 @@ ErrorDocument 404 /404.html
 RewriteEngine On
 AddDefaultCharset utf-8
 
-RewriteBase /www.bigfore.com/
+RewriteBase /~ove/www.bigfore.com/
 
 # Redirect non-www to www
 RewriteCond %{ENV:GLM_HOST_ID} PRODUCTION

diff --git a/Toolkit/Contacts/ENewsSignup.php b/Toolkit/Contacts/ENewsSignup.php
index 957d4ac..94c1a2e 100755 (executable)
--- a/Toolkit/Contacts/ENewsSignup.php
+++ b/Toolkit/Contacts/ENewsSignup.php
@@ -79,7 +79,7 @@ class Toolkit_Contacts_ENewsSignup
         .listing {display:none;}
         </style>
         <div id="form-success-top">
-            Thank you for requesting the ENewsetter.
+            Thank you for requesting the E-Newsletter.
         </div>';
     //    {{{    configureConstats()
 

diff --git a/Toolkit/Contacts/templates/contactForm.html b/Toolkit/Contacts/templates/contactForm.html
index 2f2f84a..e981a57 100644 (file)
--- a/Toolkit/Contacts/templates/contactForm.html
+++ b/Toolkit/Contacts/templates/contactForm.html
@@ -71,9 +71,7 @@
                         {if:elem.isName(#captcha_rmv#)}
                             <span
                                 class="tooltip"
-                                title="Verification Code|To help us distinguish between
-                                information submitted by individuals and those automatically
-                                entered by software robots, please type the letters shown.">What is this?
+                                title="Verification Code|This helps us distinguish between real people and spam bots.">What is this?
                             </span>
                         {end:}
                     {end:}

diff --git a/Toolkit/FormBuilder.php b/Toolkit/FormBuilder.php
index 4eb5592..d4f0346 100644 (file)
--- a/Toolkit/FormBuilder.php
+++ b/Toolkit/FormBuilder.php
@@ -1184,7 +1184,7 @@ abstract class Toolkit_FormBuilder extends HTML_QuickForm
                 '<tr>
                     <td class="labelcell">'.$required.'<label>{label}</label></td>
                     <td class="fieldcell">'.$error.'{element}
-                        <span class="tooltip" title="Verification Code|To help us distinguish between information submitted by individuals and those automatically entered by software robots, please type the letters shown.">What is this?</span>
+                        <span class="tooltip" title="Verification Code|This helps us distinguish between real people and spam bots.">What is this?</span>
                     </td>
                 </tr>',
                 'captcha_rmv'

diff --git a/Toolkit/Photos/templates/photoGalleryWrapper.html b/Toolkit/Photos/templates/photoGalleryWrapper.html
index 2cedf5a..7fd976e 100644 (file)
--- a/Toolkit/Photos/templates/photoGalleryWrapper.html
+++ b/Toolkit/Photos/templates/photoGalleryWrapper.html
@@ -1,6 +1,3 @@
-<style>
-
-</style>
 <flexy:toJavascript flexy:prefix="" base_url="base_url" ></flexy:toJavascript>
 <flexy:toJavascript flexy:prefix="" pageId="pageId" ></flexy:toJavascript>
 <div id="media-photo-gallery">

diff --git a/assets/cal.png b/assets/cal.png
new file mode 100644 (file)
index 0000000..69010b0
Binary files /dev/null and b/assets/cal.png differ

diff --git a/assets/diamondLine.png b/assets/diamondLine.png
new file mode 100644 (file)
index 0000000..e6e8f7e
Binary files /dev/null and b/assets/diamondLine.png differ

diff --git a/assets/slidOverlay.png b/assets/slidOverlay.png
new file mode 100644 (file)
index 0000000..18e6f22
Binary files /dev/null and b/assets/slidOverlay.png differ

diff --git a/priceQuoteForm.inc b/priceQuoteForm.inc
index 0211dae..7883966 100644 (file)
--- a/priceQuoteForm.inc
+++ b/priceQuoteForm.inc
@@ -501,7 +501,7 @@ class ActionDisplay extends HTML_QuickForm_Action_Display
 //          $renderer->setHeaderTemplate('<tr><td style="white-space:nowrap;background:#996;color:#ffc;" align="left" colspan="2"><b>{header}</b></td></tr>');
 //          $renderer->setGroupTemplate('<table><tr>{content}</tr></table>', 'name');
 //          $renderer->setGroupElementTemplate('<td>{element}<br /><span style="font-size:10px;"><!-- BEGIN required --><span style="color: #f00">*</span><!-- END required --><span style="color:#996;">{label}</span></span></td>', 'name');
-            $renderer->setHeaderTemplate('<tr><td style="white-space:nowrap;background:#C3DBCD;color:#1A2D5A;" align="left" colspan="2"><b>{header}</b></td></tr>');
+            $renderer->setHeaderTemplate('<tr><td colspan="2"><h2>{header}</h2></td></tr>');
             $renderer->setElementTemplate('<td colspan="2"><br /><span><!-- BEGIN required --><span style="color: red">*</span><!-- END required --><span>{label}</span></span>{element}</td>', 'golfing');
             $renderer->setElementTemplate('<td colspan="2"><br /><span><!-- BEGIN required --><span style="color: red">*</span><!-- END required --><span>{label}</span></span>{element}</td>', 'dining');
             $renderer->setGroupElementTemplate('<td>{element}<br /><span style="font-size:10px;"><!-- BEGIN required --><span style="color: #f00">*</span><!-- END required --><span style="color:#996;">{label}</span></span></td>', 'golfing');

diff --git a/static/11.phtml b/static/11.phtml
index d1f524c..7248498 100644 (file)
--- a/static/11.phtml
+++ b/static/11.phtml
@@ -7,7 +7,7 @@ $courses = array(
     'Dunmaglas Golf Course'        => 'dunmaglas.gif',
     'Belvedere Golf Club'          => 'hiddenriver.gif',
     'Trout Creek'                  => 'troutcreek.gif',
-    'Little Travese Bay Golf Club' => 'littletraverse.gif',
+    'Little Traverse Bay Golf Club' => 'littletraverse.gif',
     'Hamlet Village'               => 'hamletvillage.gif',
     'Black Lake Golf Club'         => 'blacklake.gif',
 );

diff --git a/styles.css b/styles.css
index ad15b09..f7fc917 100644 (file)
--- a/styles.css
+++ b/styles.css
@@ -113,11 +113,11 @@ nav li li a {
     text-decoration: none;\r
     background: rgba(255, 255, 255, .7);\r
     font-weight: bold;\r
-    text-shadow: 1px 1px 1px rgba(255, 255, 255, .9);\r
+    text-shadow: 1px 1px 1px rgba(255, 255, 255, .8);\r
     margin-bottom: 1px;\r
     }\r
 nav li ul li a:hover {\r
-    background: rgba(255, 255, 255, .8);\r
+    background: rgba(255, 255, 255, .9);\r
     }\r
 nav li ul li img {\r
     margin: 0 0 0 20px;\r
@@ -128,6 +128,9 @@ nav li ul li:first-child {
     padding-top: 10px;\r
     }\r
 /* Toolbox */\r
+#propertyInfo {\r
+    display: none;\r
+    }\r
 #toolbox {\r
     margin: 50px 90px 50px 70px;\r
     }\r
@@ -164,6 +167,10 @@ nav li ul li:first-child {
     font-variant: small-caps;\r
     font-family: TimesNewRoman, "Times New Roman", Times, Baskerville, Georgia, serif;\r
     }\r
+#inside #toolbox {\r
+    background: url(assets/diamondLine.png) center bottom no-repeat;\r
+    padding-bottom: 2em;\r
+    }\r
 /* quoteRequest */\r
 #quoteRequest {\r
     background: #8b0304;\r
@@ -171,27 +178,56 @@ nav li ul li:first-child {
     line-height: 60px;\r
     }\r
 #quoteRequest form {\r
-    margin: 0;\r
+    margin: 0 0 0 20px;\r
+    float: left;\r
     }\r
 #quoteRequest h2 {\r
     margin: 0 0 0 40px;\r
     color: white;\r
+    float: left;\r
+    }\r
+#quoteRequest label {\r
+    color: white;\r
+    }\r
+#quoteArrival,\r
+#quoteDeparture {\r
+    background: url(assets/cal.png) right center no-repeat white;\r
+    }\r
+.labelcell {\r
+    width: 200px;\r
+    }\r
+#viewCourses {\r
+    display: block;\r
+    padding: 15px;\r
     }\r
 /* Slideshow */\r
 #slideshow {\r
     position: relative;\r
     }\r
-.nivo-caption {\r
-    display: none !important;\r
+#slideOverlay {\r
+    position: absolute;\r
+    bottom: 50px;\r
+    left: 50px;\r
+    z-index: 110;\r
+}\r
+#slideshow .nivo-caption {\r
+    background: none;\r
+    font-family: TimesNewRoman, "Times New Roman", Times, Baskerville, Georgia, serif;\r
+    text-align: right;\r
+    font-size: 14px;\r
+    font-style: italic;\r
+    padding: 10px 20px;\r
+    text-shadow: 1px 1px 1px rgba(0, 0, 0, .9);\r
     }\r
 \r
 .nivo-controlNav {\r
     display: block;\r
     position: absolute;\r
     z-index: 999;\r
-    bottom: 10px;\r
+    bottom: 0;\r
     width: 100%;\r
     text-align: center;\r
+    padding: 0;\r
     }\r
     \r
 /* Property Images */\r
@@ -537,4 +573,15 @@ address {
     }\r
 #breadcrumbs a {\r
     color: #333;\r
+    }\r
+form .tooltip {\r
+    text-decoration: underline;\r
+    font-size: 12px;\r
+    cursor: help;\r
+    }\r
+#contact_form table,\r
+#contact_form tr,\r
+#contact_form td\r
+{\r
+    border: 0;\r
     }
\ No newline at end of file

diff --git a/templates/template.html b/templates/template.html
index e28f279..9e26bfd 100644 (file)
--- a/templates/template.html
+++ b/templates/template.html
@@ -21,6 +21,7 @@
             </nav>
             {if:rotatingImages}
             <div id="slideshow">
+                <img src="{mediaBaseURL:h}assets/slidOverlay.png" id="slideOverlay">
                 {rotatingImages:h}
             </div>
             {end:}
@@ -29,14 +30,14 @@
             <h2>Quote Request</h2>
             <form flexy:ignore="yes" method="post" action="{mediaBaseURL:h}index.php?catid=9">
                 <input type="hidden" name="_qf_default" value="page1:next">
-                <input name="arrival" value="{arrivalDate:h}">
-                <input name="departure" value="{departureDate:h}">
-                <select name="golfers">
+                <label>Arrival:</label> <input name="arrival" value="{arrivalDate:h}" id="quoteArrival">
+                <label>Departure:</label> <input name="departure" value="{departureDate:h}" id="quoteDeparture">
+                <label>Golfers:</label> <select name="golfers">
                     <?php for ($i = 0; $i <= 20; ++$i) {?>
                     <option value="<?php echo $i;?>"><?php echo $i;?></option>
                     <?php }?>
                 </select>
-                <select name="nongolfers">
+                <label>Non-Golfers:</label> <select name="nongolfers">
                     <?php for ($i = 0; $i <= 20; ++$i) {?>
                     <option value="<?php echo $i;?>"><?php echo $i;?></option>
                     <?php }?>
@@ -57,7 +58,7 @@
                     <li><img src="{propImageStyle:h}{property[image2]:h}" flexy:if="property[image2]" /></li>
                 </ul>
                 {toolboxContent:h}
-                <address flexy:if="property">
+                <address flexy:if="property" id="propertyInfo">
                     {property[street]} &middot; {property[city]}, {property[state]} {property[zip]} &middot; {property[phone]} &middot; <a href="http://{property[url]}">{property[url]}</a>
                 </address>
                 <div id="googlemap" flexy:if="property">
@@ -143,7 +144,7 @@
             </ul>
         </div>
         <div id="copyright">
-            Copyright&copy;<?php echo date('Y');?> Big Fore Corporation, All Rights Reserved &#124; Produced by <a href="http://www.gaslightmedia.com/">Gaslight Media</a>
+            Copyright&copy;<?php echo date('Y');?> Big Fore Corporation, All Rights Reserved &middot; Produced by <a href="http://www.gaslightmedia.com/">Gaslight Media</a>
         </div>
     </div>
 {bottomScripts:h}