Merge pull request #4 from madebyuppercut/rose

Rose

5 files changed, 33 insertions, 15 deletions

diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss
index d04e9a4..5aa1d06 100644
--- a/app/assets/stylesheets/custom.css.scss
+++ b/app/assets/stylesheets/custom.css.scss
@@ -53,6 +53,21 @@ a{
 .product{ color: $green; }
 .features{ color: $orange; }
 
+.static{
+  clear: both;
+  padding-top: 45px;
+  margin-bottom: 100px;
+  p{
+    font: 36px/48px "Helvetica Neue";
+    font-weight: 200;
+  }
+
+  .back{
+    font: 36px/48px "Helvetica Neue";
+    font-weight: 500;
+  }
+}
+
 #new_sign_up{
   label{
     font-style: italic;
@@ -74,16 +89,7 @@ a{
   @include clearfix;
 }
 
-
-#thanks{
-  clear: both;
-  padding-top: 45px;
-  p{
-    font: 36px/48px "Helvetica Neue";
-    font-weight: 200;
-  }
-
-  a{
-    font-weight: 400;
-  }
+#privacy{
+  strong { font: 36px/48px "Helvetica Neue"; }
+  p{ font: 14px/18px "Helvetica Neue"; }
 }
diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
new file mode 100644
index 0000000..a75df60
--- /dev/null
+++ b/app/controllers/pages_controller.rb
@@ -0,0 +1,3 @@
+class PagesController < HighVoltage::PagesController
+  layout 'application'
+end
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index b742eca..eb6f552 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -32,7 +32,7 @@
     <footer>
       <div class="content">
           <div class="row">
-            <%= link_to "Privacy Policy" %> &copy; 2013 Parley, Inc. All rights reserved.
+            <%= link_to "Privacy Policy", page_path("privacy")  %> &copy; 2013 Parley, Inc. All rights reserved.
           </div>
       </div>
     </footer>
diff --git a/app/views/pages/privacy.html.erb b/app/views/pages/privacy.html.erb
new file mode 100644
index 0000000..44d00f0
--- /dev/null
+++ b/app/views/pages/privacy.html.erb
@@ -0,0 +1,9 @@
+<div id="privacy" class="static">
+  <p><%= link_to "< Back", root_path, class: "back" %></p>
+  <p><strong>Privacy Policy</strong></p>
+  <p>We at Things Made by Uppercut, Inc. take your individual privacy very seriously. We aim to ensure that we meet the requirements of the Data Protection Act.</p>
+  <p>Any personal information collected via the website will be stored and processed exclusively for the purposes of Things Made by Uppercut, Inc.</p>
+  <p>No personal information you provide via this web site will be passed on to any third party. Your details will not be kept for longer than necessary. Things Made by Uppercut, Inc. are the sole owner of any information we collect via the website. If you provide your personal details we may use the information provided to contact you in relation to the specifics of your request.</p>
+  <p>If you submit contact details such as an email address, Things Made by Uppercut, Inc. may use the information you have provided to contact you from time to time about items we think you may find of interest. Some of the contacts may be automated. You can opt out of some or all contacts at any time by contacting us.</p>
+  <p>If you sign up to receive regular news and information by any means, you may cancel the receipt of such bulletins at any time. Personal details which you provide solely for the purpose of receiving news will not be used for any other purpose. We use traffic analysis tools to analyze traffic on this website. These tools display aggregate data such as the total number of visitors and "hits" each day and their broad geographical location, popular search queries and which sites link to our site. We do not associate this data with any personally identifying information which you may choose to provide us. If you have any queries about our privacy policy, or you are concerned that it has not been followed, please email us at <%= mail_to "service@madebyuppercut.com", "service@madebyuppercut.com", encode: "hex" %></p>
+</div>
diff --git a/app/views/sign_ups/show.html.erb b/app/views/sign_ups/show.html.erb
index 5e2cfbd..fce7189 100644
--- a/app/views/sign_ups/show.html.erb
+++ b/app/views/sign_ups/show.html.erb
@@ -1,5 +1,5 @@
-<div id="thanks">
+<div id="thanks" class="static">
   <p><strong>Thanks for signing up with Parley.</strong> We&rsquo;ll keep you informed with any important updates and, of course, the official launch date.</p>
   <p>In order to create the perfect tool for your organization, we'd love to hear from you. We'll be sending you a quick survey shortly to get your feedback, if you have the time to help out.</p>
-  <p><%= link_to "< Back", root_path %></p>
+  <p><%= link_to "< Back", root_path, class: "back" %></p>
 </div>