Merge pull request #335 from heroku/johlym/cpra

Add CPRA link to footer
heroku · May 30, 2023 · 6439c83 · 6439c83
2 parents 72ff174 + fa572eb
commit 6439c83
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 .rvmrc
 .bundle
 .tool-versions
+.DS_Store
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.6.6
+3.2.2
diff --git a/Gemfile b/Gemfile
@@ -1,9 +1,10 @@
 source 'http:https://rubygems.org'
 
-ruby '2.6.6'
+ruby '3.2.2'
 
 gem 'sinatra'
 gem 'thin'
 gem 'maruku'
 gem 'i18n'
 gem 'rack-ssl-enforcer'
+gem 'rexml'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,23 +1,30 @@
 GEM
  remote: http:https://rubygems.org/
  specs:
- daemons (1.2.3)
- eventmachine (1.2.0.1)
- i18n (0.7.0)
- maruku (0.7.2)
- rack (1.6.12)
- rack-protection (1.5.3)
+ concurrent-ruby (1.2.2)
+ daemons (1.4.1)
+ eventmachine (1.2.7)
+ i18n (1.13.0)
+ concurrent-ruby (~> 1.0)
+ maruku (0.7.3)
+ mustermann (3.0.0)
+ ruby2_keywords (~> 0.0.1)
+ rack (2.2.7)
+ rack-protection (3.0.6)
  rack
  rack-ssl-enforcer (0.2.9)
- sinatra (1.4.7)
- rack (~> 1.5)
- rack-protection (~> 1.4)
- tilt (>= 1.3, < 3)
- thin (1.6.4)
+ rexml (3.2.5)
+ ruby2_keywords (0.0.5)
+ sinatra (3.0.6)
+ mustermann (~> 3.0)
+ rack (~> 2.2, >= 2.2.4)
+ rack-protection (= 3.0.6)
+ tilt (~> 2.0)
+ thin (1.8.2)
  daemons (~> 1.0, >= 1.0.9)
  eventmachine (~> 1.0, >= 1.0.4)
- rack (~> 1.0)
- tilt (2.0.4)
+ rack (>= 1, < 3)
+ tilt (2.1.0)
 
 PLATFORMS
  ruby
@@ -26,11 +33,12 @@ DEPENDENCIES
  i18n
  maruku
  rack-ssl-enforcer
+ rexml
  sinatra
  thin
 
 RUBY VERSION
- ruby 2.6.6p146
+ ruby 3.2.2p53
 
 BUNDLED WITH
- 1.17.2
+ 2.4.10
diff --git a/app.json b/app.json
@@ -1,6 +1,6 @@
 {
  "name": "12factor",
- "stack": "heroku-18",
+ "stack": "heroku-22",
  "scripts": {
  },
  "env": {

diff --git a/public/css/screen.css b/public/css/screen.css
@@ -168,3 +168,9 @@ article img.full {
  float: none;
  margin-left: 0;
 }
+
+.cpra a img {
+ height: 17px;
+ margin-bottom: -2px !important;
+ margin-right: 5px;
+}
diff --git a/public/images/privacy.png b/public/images/privacy.png
diff --git a/views/layout.erb b/views/layout.erb
@@ -42,6 +42,7 @@
  <div><a href="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/heroku/12factor">Sourcecode</a></div>
  <div><a href="/12factor.epub">Download ePub Book</a></div>
  <div><a href="https://www.heroku.com/policy/privacy">Privacy Policy</a></div>
+ <div class="cpra"><a rel="" href="https://www.salesforce.com/form/other/privacy-request/"><img src="/images/privacy.png" aria-label="Privacy Icon" title="Privacy Icon">Your Privacy Choices</a></div>
 </footer>
 </body>
 </html>