From 4b2a73dd8d5c7db50fa42567fe06cd7b3cc41aad Mon Sep 17 00:00:00 2001
From: Andrew Brown <andrew@gomoment.com>
Date: Thu, 11 Aug 2016 01:30:06 -0500
Subject: [PATCH] Update privacy policy, add bug/feature/feedback form links

---
 app/assets/stylesheets/footer.css   | 16 +++++-----
 app/assets/stylesheets/navbar.css   |  4 +++
 app/views/layouts/_navbar.html.erb  |  6 ++++
 app/views/main/privacyinfo.html.erb | 47 +++++++++++++++--------------
 config/routes.rb                    |  2 +-
 5 files changed, 44 insertions(+), 31 deletions(-)

diff --git a/app/assets/stylesheets/footer.css b/app/assets/stylesheets/footer.css
index 4676cac6..ad0d58c9 100644
--- a/app/assets/stylesheets/footer.css
+++ b/app/assets/stylesheets/footer.css
@@ -1,9 +1,9 @@
-  body {
-    display: flex;
-    min-height: 100vh;
-    flex-direction: column;
-  }
+body {
+  display: flex;
+  min-height: 100%;
+  flex-direction: column;
+}
 
-  main {
-    flex: 1 0 auto;
-  }
\ No newline at end of file
+main {
+  flex: 1 0 auto;
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/navbar.css b/app/assets/stylesheets/navbar.css
index dd43d98e..e51c54bd 100644
--- a/app/assets/stylesheets/navbar.css
+++ b/app/assets/stylesheets/navbar.css
@@ -5,4 +5,8 @@
 .universe-filter-active {
 	height: 64px;
 	background: purple;
+}
+
+.navbar-fixed {
+	margin-bottom: 15px;
 }
\ No newline at end of file
diff --git a/app/views/layouts/_navbar.html.erb b/app/views/layouts/_navbar.html.erb
index 7836292a..82ad9a10 100644
--- a/app/views/layouts/_navbar.html.erb
+++ b/app/views/layouts/_navbar.html.erb
@@ -1,6 +1,12 @@
 <ul id="dropdown1" class="dropdown-content">
   <li><%= link_to 'Account settings', edit_user_registration_path %></li>
   <li class="divider"></li>
+  <li><%= link_to 'Privacy policy', privacy_policy_path %></li>
+  <li class="divider"></li>
+  <li><%= link_to 'Report a problem', 'https://docs.google.com/forms/d/e/1FAIpQLSe0jnqJlcPJDqwogGere5j8-8F1nSGGYkzbsI-XkOeMnGwLrA/viewform', target: '_new' %></li>
+  <li><%= link_to 'Request a feature', 'https://docs.google.com/forms/d/e/1FAIpQLScOhSMdDqWqJu9HGPQdmd0R9s90_AcSo0g6_Nc1qNjQIbSaXA/viewform', target: '_new' %></li>
+  <li><%= link_to 'Leave feedback', 'https://docs.google.com/forms/d/e/1FAIpQLScZWEVMgm8hBWIIVj1LPzo0GqflmWUrLQlc4TAYqsaS087oAA/viewform', target: '_new' %></li>
+  <li class="divider"></li>
   <li><%= link_to "Sign out", destroy_user_session_path %></li>
 </ul>
 
diff --git a/app/views/main/privacyinfo.html.erb b/app/views/main/privacyinfo.html.erb
index fbfce89f..b818af3a 100644
--- a/app/views/main/privacyinfo.html.erb
+++ b/app/views/main/privacyinfo.html.erb
@@ -1,26 +1,29 @@
-<div class="card">
-	<h3 class="card-heading simple">Your privacy is important.</h3>
-	<div class="card-body">
-		<p>
-			I'm no lawyer, and I won't pretend to be. Nobody likes reading those legalese documents, so I'll just give you the facts in English:
-		</p>
+<div class="row">
+  <div class="col s12 m12 l12">
+    <div class="card hoverable" style="padding: 30px;">
+	    <h3 class="card-heading simple">Your privacy is important.</h3>
+		<div class="card-body">
+			<p>
+				I'm no lawyer, and I won't pretend to be. Nobody likes reading those legalese documents, so I'll just give you the facts in English:
+			</p>
 
-		<ul>
-			<li>Indent will <strong>always</strong> do its best to maintain the security and privacy of your data, in order to ensure that it is you and only you that has access to view, modify, or remove it.</li>
-			<br />
-			<li>Indent will <strong>never</strong> share your personal information or any information you create in the process of planning characters, locations, etc., with anyone other than you. No advertisers, no partners, no anything except a good product for planning.</li>
-			<br />
-			<li>Indent will <strong>never</strong> assume ownership of any data you enter, anywhere. All information relating to stories, characters, locations, etc., are owned by you, the author, and only you.</li>
-		</ul>
+			<ul>
+				<li>Notebook will <strong>always</strong> do its best to maintain the security and privacy of your data, in order to ensure that it is you and only you that has access to view, modify, or remove it, unless you explicitly designate otherwise.</li>
+				<br />
+				<li>Notebook will <strong>never</strong> share your personal information or any information you create in the process of planning characters, locations, etc., with anyone other than you. No advertisers, no partners, no anything except a good product for planning.</li>
+				<br />
+				<li>Notebook will <strong>never</strong> assume ownership of any data you enter, anywhere. All information relating to stories, characters, locations, etc., are owned by you, the author, and only you.</li>
+			</ul>
 
-		<p>
-			For those of you who <em>do</em> like legalese documents: I'm sorry I'm not a lawyer. I'm working to get one to write something official soon, but in the meantime you'll have to take my word for it.
-		</p>
+			<p>
+				For those of you who <em>do</em> like legalese documents: I'm sorry I'm not a lawyer. I'm working to get one to write something official soon, but in the meantime you'll have to take my word for it.
+			</p>
 
-		<p>
-			If you have <em>any</em> questions at all, feel free to contact me personally at the email address below and I'd be more than happy to chat:
-			&lt;image of email address&gt;
-		</p>
+			<p>
+				If you have <em>any</em> questions at all, feel free to contact me personally at an<span>dr</span>ew<strong>@</strong><span></span>indent<span>labs</span>.com, or <a href="https://github.com/indentlabs/notebook/issues/new">open an issue on GitHub here</a>.
+			</p>
+		</div>
+		<div class="card-comments"></div>
+	  </div>
 	</div>
-	<div class="card-comments"></div>
-</div>
+</div>
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index d65cd9d9..07792e04 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -7,7 +7,7 @@ Rails.application.routes.draw do
 
   # Info pages
   scope '/about' do
-    get '/privacy',    to: 'main#privacyinfo', as: :privacy_info
+    get '/privacy',    to: 'main#privacyinfo', as: :privacy_policy
   end
 
   # User-centric stuff