From dd1178ee1662c03844d4ad58607413d8cbc63325 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Mon, 10 Mar 2014 19:19:47 +0200
Subject: [PATCH] merging changes

---
 app/views/about_us.blade.php   | 51 ++++++++++++++++++++++------------
 app/views/contact_us.blade.php | 49 +++++++++++++++++---------------
 2 files changed, 61 insertions(+), 39 deletions(-)

diff --git a/app/views/about_us.blade.php b/app/views/about_us.blade.php
index d1f51a43450c..f5efb7fdea2a 100644
--- a/app/views/about_us.blade.php
+++ b/app/views/about_us.blade.php
@@ -9,28 +9,41 @@
 @stop
 
 @section('body')
- <!--<script>
-        $(document).ready(function () {
-    var $window = $(window);
-    $('section[data-type="background"]').each(function () {
-        var $bgobj = $(this);
-        $(window).scroll(function () {
-            var yPos = -($window.scrollTop() / $bgobj.data('speed'));
-            var coords = '50% ' + yPos + 'px';
-            $bgobj.css({ backgroundPosition: coords });
-        });
-    });
-    });
-  </script>-->
+
+{{ Form::open(array('url' => 'get_started', 'id' => 'startForm')) }}
+{{ Form::hidden('guest_key') }}
+{{ Form::close() }}
+
+ <script>
+
+  $(document).ready(function () {
+    if (isStorageSupported()) {
+      $('[name="guest_key"]').val(localStorage.getItem('guest_key'));          
+    }
+  });
+
+  function isStorageSupported() {
+    try {
+      return 'localStorage' in window && window['localStorage'] !== null;
+    } catch (e) {
+      return false;
+    }
+  }
+
+  function getStarted() {
+    $('#startForm').submit();
+  }
+
+  </script>
   <div class="navbar" style="margin-bottom:0px">
     <div class="container">
       <div class="navbar-inner">
         <a class="brand" href="#"><img src=
           "images/invoiceninja-logo.png"></a>
           <ul class="navbar-list">
-            <li>{{ link_to('about_us', 'About Us' ) }}</li>
-            <li>{{ link_to('contact_us', 'Contact Us' ) }}</li>
-            <li>{{ link_to('login', Auth::check() ? 'Continue' : 'Login' ) }}</li>
+            <li>{{ link_to('about', 'About Us' ) }}</li>
+            <li>{{ link_to('contact', 'Contact Us' ) }}</li>
+            <li>{{ link_to('login', Auth::check() ? 'My Account' : 'Login' ) }}</li>
           </ul>
         </div>
       </div>
@@ -88,6 +101,7 @@
     </div>
   </div>
 </section>
+<!--
 <section class="about center white-bg">
   <div class="container">
     <div class="row">
@@ -102,6 +116,7 @@
       </div>
     </div>
   </section>
+  -->
   <section class="upper-footer">
    <div class="container">
     <div class="row">
@@ -134,7 +149,9 @@
 
                 <div class="navbar-inner">
                   <ul class="navbar-list">
-                    <li>{{ link_to('login', Auth::check() ? 'Continue' : 'Login' ) }}</li>
+                    <li>{{ link_to('about', 'About Us' ) }}</li>
+                    <li>{{ link_to('contact', 'Contact Us' ) }}</li>
+                    <li>{{ link_to('login', Auth::check() ? 'My Account' : 'Login' ) }}</li>
                   </ul>
 
                     <!--
diff --git a/app/views/contact_us.blade.php b/app/views/contact_us.blade.php
index 60f6bea46126..03ec69beef5a 100644
--- a/app/views/contact_us.blade.php
+++ b/app/views/contact_us.blade.php
@@ -16,29 +16,34 @@
 {{ Form::close() }}
 
  <script>
-        $(document).ready(function () {
-      $("#feedbackSubmit").click(function() {
-    //clear any errors
-    contactForm.clearErrors();
- 
-    //do a little client-side validation -- check that each field has a value and e-mail field is in proper format
-    var hasErrors = false;
-    $('.feedbackForm input,textarea').each(function() {
-      if (!$(this).val()) {
-        hasErrors = true;
-        contactForm.addError($(this));
+    $(document).ready(function () {
+
+      if (isStorageSupported()) {
+        $('[name="guest_key"]').val(localStorage.getItem('guest_key'));          
+      }
+
+        $("#feedbackSubmit").click(function() {
+      //clear any errors
+      contactForm.clearErrors();
+   
+      //do a little client-side validation -- check that each field has a value and e-mail field is in proper format
+      var hasErrors = false;
+      $('.feedbackForm input,textarea').each(function() {
+        if (!$(this).val()) {
+          hasErrors = true;
+          contactForm.addError($(this));
+        }
+      });
+      var $email = $('#email');
+      if (!contactForm.isValidEmail($email.val())) {
+        hasErrors = true;
+        contactForm.addError($email);
+      }
+   
+      //if there are any errors return without sending e-mail
+      if (hasErrors) {
+        return false;
       }
-    });
-    var $email = $('#email');
-    if (!contactForm.isValidEmail($email.val())) {
-      hasErrors = true;
-      contactForm.addError($email);
-    }
- 
-    //if there are any errors return without sending e-mail
-    if (hasErrors) {
-      return false;
-    }
  
   });