Skip to content

Commit 5912ac6

Browse files
ayush-billoreayush-billore
committed
The PR adds following GDPR complaiance related changes to OCID component
- add cookie policy to the footer - update logos to reflect current Progress Chef brand. - update favicon to reflect current Progress Chef brand. Signed-off-by: ayush-billore <[email protected]>
1 parent 5be14e5 commit 5912ac6

File tree

8 files changed

+9
-70
lines changed

8 files changed

+9
-70
lines changed

‎src/oc-id/app/assets/images/favicon.ico‎

20.6 KB
Binary file not shown.

‎src/oc-id/app/views/layouts/application.html.erb‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<%= stylesheet_link_tag "application", media: "all" %>
88
<%= javascript_include_tag '//cdnjs.cloudflare.com/ajax/libs/modernizr/2.8.3/modernizr.min.js' %>
99
<%= csrf_meta_tags %>
10+
<%= favicon_link_tag asset_path('favicon.ico') %>
1011
</head>
1112
<body>
1213
<div class="contain-to-grid">
@@ -47,7 +48,11 @@
4748
<%= yield %>
4849
</div>
4950
<footer>
50-
&copy; <%= Time.now.year %> Chef Software, Inc.
51+
<center>
52+
<a href="https://www.progress.com/legal/privacy-policy">Privacy Policy</a> | <a href="https://www.progress.com/legal/cookie-policy">Cookie Policy</a>
53+
<br>
54+
&copy; <%= Time.now.year %> Chef Software, Inc.
55+
</center>
5156
</footer>
5257
<%= javascript_include_tag "application" %>
5358
<script>

‎src/oc-id/lib/assets/images/chef-logo.png‎

-14.9 KB
Binary file not shown.

‎src/oc-id/lib/assets/images/chef-logo.svg‎

Lines changed: 0 additions & 67 deletions
This file was deleted.

‎src/oc-id/lib/assets/images/progress-chef-logo.png‎

23.4 KB
Loading

‎src/oc-id/lib/assets/images/progress-chef-logo.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎src/oc-id/lib/assets/javascripts/chef/components/logo.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
var $el = $(this);
2828

2929
if ($el.find('> svg').length === 0) {
30-
$el.load(Chef.Web.Core.imageUrl('chef-logo.svg'), function() {
30+
$el.load(Chef.Web.Core.imageUrl('progress-chef-logo.svg'), function() {
3131
var tag = $el.data('tag-line');
3232
if (tag) {
3333
var tag = this.querySelector('svg .tag-line text');

‎src/oc-id/lib/chef/web/core/asset_helpers.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def chef_logo(element=:div, opts={})
1515
classnames = (opts[:attributes][:class] || '').split(' ')
1616
opts[:attributes][:class] = classnames.reject { |c| c == logo_classname }.push(logo_classname).join(' ')
1717

18-
opts[:svg] = Nokogiri::XML(open(File.join(File.dirname(__FILE__), '../../../assets/images/chef-logo.svg')))
18+
opts[:svg] = Nokogiri::XML(open(File.join(File.dirname(__FILE__), '../../../assets/images/progress-chef-logo.svg')))
1919

2020
if opts[:data][:'tag-line']
2121
opts[:svg].css('#chef-logo-tag-line text').first.content = opts[:data][:'tag-line']

0 commit comments

Comments
 (0)