Add GA and contact form

Author: tomhamiltonstubber

_config.yml

@@ -15,7 +15,8 @@ gems:
 exclude:
   - Gemfile
   - Gemfile.lock
-
+include:
+  - _redirects
 footer:
   copyright: TutorCruncher
 address:

_includes/contact.html

@@ -13,48 +13,8 @@ <h2>Contact Us</h2>
     </div>
     <div class="row">
       <div class="col-lg-8 col-lg-offset-2">
-        <form name="sentMessage" id="contactForm" novalidate>
-          <div class="row control-group">
-            <div class="form-group col-xs-12 floating-label-form-group controls">
-              <label>Name</label>
-              <input type="text" class="form-control" placeholder="Name" id="name" required
-                     data-validation-required-message="Please enter your name.">
-              <p class="help-block text-danger"></p>
-            </div>
-          </div>
-          <div class="row control-group">
-            <div class="form-group col-xs-12 floating-label-form-group controls">
-              <label>Email Address</label>
-              <input type="email" class="form-control" placeholder="Email Address" id="email" required
-                     data-validation-required-message="Please enter your email address.">
-              <p class="help-block text-danger"></p>
-            </div>
-          </div>
-          <div class="row control-group">
-            <div class="form-group col-xs-12 floating-label-form-group controls">
-              <label>Phone Number</label>
-              <input type="tel" class="form-control" placeholder="Phone Number" id="phone" required
-                     data-validation-required-message="Please enter your phone number.">
-              <p class="help-block text-danger"></p>
-            </div>
-          </div>
-          <div class="row control-group">
-            <div class="form-group col-xs-12 floating-label-form-group controls">
-              <label>What subjects do you require tutoring in?</label>
-              <textarea rows="5" class="form-control" placeholder="Message" id="message" required
-                        data-validation-required-message="Please enter a message."></textarea>
-              <p class="help-block text-danger"></p>
-            </div>
-          </div>
-          <br>
-          <div id="success"></div>
-          <div class="row">
-            <div class="form-group col-xs-12">
-              <button type="submit" class="btn btn-success btn-lg">Send</button>
-            </div>
-          </div>
-        </form>
+        <div id="socket-enquiry"></div>
       </div>
     </div>
   </div>
-</section>
+</section>

_includes/footer.html

@@ -6,8 +6,8 @@
         <div class="footer-col col-md-4">
           <h3>Location</h3>
           <p>
-            {% for address in site.address %}
-              {{ address.line }} <br>
+            {% for line in site.address %}
+              {{ line }} <br>
             {% endfor %}
           </p>
         </div>
@@ -39,9 +39,29 @@ <h3>About Dino Tutors</h3>
   </div>
 </footer>
 
-<!-- Scroll to Top Button (Only visible on small and extra-small screen sizes) -->
 <div class="scroll-top page-scroll visible-xs visible-sm">
   <a class="btn btn-primary" href="#page-top">
     <i class="fa fa-chevron-up"></i>
   </a>
 </div>
+<script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+
+  ga('create', 'UA-41117087-4', 'auto');
+  ga('send', 'pageview');
+</script>
+<script src="https://cdn.tutorcruncher.com/socket/0.0.9/socket.js"></script>
+<script>
+  socket('9c79f14df986a1ec693c', {
+    mode: 'enquiry',
+    element: '#socket-enquiry',
+    router_mode: 'history'
+  });
+
+  socket('9c79f14df986a1ec693c', {
+    router_mode: 'history'
+  })
+</script>

_includes/nav.html

@@ -28,7 +28,7 @@
           <a href="#contact">Contact</a>
         </li>
         <li class="page-scroll">
-          <a href="https://dinotutors.tutorcruncher.com">Sign in</a>
+          <a href="https://secure.dinotutors.com">Sign in</a>
         </li>
       </ul>
     </div>

_includes/our-tutors.html

@@ -38,10 +38,3 @@ <h3 class="tutor-sign-up">Interested in becoming a tutor?</h3>
     </div>
   </div>
 </section>
-
-<script src="https://cdn.tutorcruncher.com/socket/0.0.5/socket.js"></script>
-<script>
-  socket('9c79f14df986a1ec693c', {
-    router_mode: 'history'
-  })
-</script>

_redirects

@@ -1 +1 @@
-/*    /index.html    200
+/*    /     200

static/css/style.scss

@@ -70,7 +70,7 @@ hr {
       background-color: #fff;
     }
   }
-  .btn-outline {
+  .btn {
     border: solid 2px $primary-colour;
     &:hover, &:focus, &:active, &.active {
       border: solid 2px $primary-colour;
@@ -91,7 +91,7 @@ hr {
       background-color: $primary-colour;
     }
   }
-  .btn-outline {
+  .btn {
     border: solid 2px #fff;
     &:hover, &:focus, &:active, &.active {
       border: solid 2px #fff;
@@ -239,7 +239,7 @@ section#our-tutors {
       color: white;
       .tcs-name {
         transition: all .3s ease;
-        height: 25px;
+        padding: 5px 0;
       }
 
       &:hover {
@@ -258,16 +258,36 @@ section#our-tutors {
       }
       .tcs-extra {
         button {
-          background: $primary-colour;
+          background: #fff;
+          color: $primary-colour;
+          border: solid 2px $primary-colour;
+          &:hover, &:focus, &:active, &.active {
+            border: solid 2px $primary-colour;
+            color: #fff;
+            background: $primary-colour;
+          }
         }
       }
-      .tcs-submit {
-        button {
-          background: $primary-colour;
-        }
+    }
+  }
+}
+
+section#contact {
+  .tcs-submit {
+    button {
+      background: #fff;
+      color: $primary-colour;
+      border: solid 2px $primary-colour;
+      &:hover, &:focus, &:active, &.active {
+        border: solid 2px $primary-colour;
+        color: #fff;
+        background: $primary-colour;
       }
     }
   }
+  .tcs-field {
+    padding: 8px 0;
+  }
 }
 
 .tc-desc {