diff --git a/app/helpers/settings.rb b/app/helpers/settings.rb
index d308535ab..9584f86ac 100644
--- a/app/helpers/settings.rb
+++ b/app/helpers/settings.rb
@@ -4,4 +4,6 @@ def setting_for_widget(widget)
Setting.where(key: 'feature.user.recommendations').first
end
+
+
end
\ No newline at end of file
diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
index d2488e0c7..bfa823e8e 100644
--- a/app/views/layouts/_footer.html.erb
+++ b/app/views/layouts/_footer.html.erb
@@ -8,13 +8,14 @@
<%= t("layouts.footer.description",
open_source: link_to(t("layouts.footer.open_source"), t("layouts.footer.open_source_url"), target: "blank", rel: "nofollow"),
+ pcef: link_to(t("layouts.footer.pcef"), t("layouts.footer.pcef_url"), target: "blank", rel: "nofollow"),
consul: link_to(t("layouts.footer.consul"), t("layouts.footer.consul_url"), target: "blank", rel: "nofollow"),
cforpdx: link_to(t("layouts.footer.cforpdx"), t("layouts.footer.cforpdx_url"), target: "blank", rel: "nofollow"),
latinxtech: link_to(t("layouts.footer.latinxtech"), t("layouts.footer.latinxtech_url"), target: "blank", rel: "nofollow")
).html_safe
%>
- <%= t("layouts.footer.contact_us") %>
+
@@ -52,24 +53,23 @@
-
+
<% if setting['twitter_handle'] %>
-
- <%= link_to "https://twitter.com/#{setting['twitter_handle']}", target: "_blank", rel: "noopener external",
- title: t("shared.go_to_page") + t("social.twitter", org: setting['org_name']) + t('shared.target_blank_html') do %>
- <%= t("social.twitter", org: setting['org_name']) %>
-
- <% end %>
+ <%= link_to "Twitter", "https://twitter.com/#{setting['twitter_handle']}", target: "_blank", rel: "noopener external",
+ title: t("shared.go_to_page") + t("social.twitter", org: setting['org_name']) + t('shared.target_blank_html') %>
+
+ |
<% end %>
<% if setting['facebook_handle'] %>
-
<%= link_to "https://www.facebook.com/#{setting['facebook_handle']}/", target: "_blank", rel: "noopener external",
title: t("shared.go_to_page") + t("social.facebook", org: setting['org_name']) + t('shared.target_blank_html') do %>
<%= t("social.facebook", org: setting['org_name']) %>
-
+ Facebook
<% end %>
<% end %>
diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml
index a58917baa..7d0ff4592 100644
--- a/config/locales/en/general.yml
+++ b/config/locales/en/general.yml
@@ -7,7 +7,7 @@ en:
erase_account_link: Erase my account
finish_verification: Complete verification
notifications: Notifications
- organization_name_label: Name of organization
+ organization_name_label: Portland Clean Energy Fund
organization_responsible_name_placeholder: Representative of the organization/collective
personal: Personal details
phone_number_label: Phone number
@@ -201,20 +201,19 @@ en:
ie: We have detected that you are browsing with Internet Explorer. For an enhanced experience, we recommend using %{firefox} or %{chrome}.
ie_title: This website is not optimised for your browser
footer:
-
pcef: Portland Clean Energy Fund
- pcef_url: http://www.portlandcleanenergyinitiative.com
+ pcef_url: https://www.portlandcleanenergyinitiative.com/
cforpdx: Code for PDX
cforpdx_url: http://www.codeforpdx.org
latinxtech: Latinx Tech PDX
latinxtech_url: http://www.meetup.com/LatinxTechPDX/
accessibility: Accessibility
- conditions: Terms and conditions of use
+ conditions: Terms and Conditions of Use
consul: CONSUL
consul_url: http://www.consulproject.org
contact_us: For technical assistance visit
- copyright: CONSUL, %{year}
- description: This portal uses the %{consul} open source software. Adapting %{consul} for the has involved the local community, including volunteers from %{cforpdx} and %{latinxtech}.
+ copyright: City of Portland, %{year}
+ description: This portal uses the %{consul} open source software. Adapting %{consul} for the %{pcef} has involved the local community, including volunteers from %{cforpdx} and %{latinxtech}.
open_source: open-source software
open_source_url: http://www.gnu.org/licenses/agpl-3.0.html
participation_text: A commitment to low-income people and communities of color. Help identify proposals for the Portland Clean Energy Fund.
diff --git a/config/locales/en/settings.yml b/config/locales/en/settings.yml
index f3952d6e2..bcb40c121 100644
--- a/config/locales/en/settings.yml
+++ b/config/locales/en/settings.yml
@@ -32,10 +32,10 @@ en:
per_page_code_head_description: "This code will appear inside the label. Useful for entering custom scripts, analytics..."
per_page_code_body: "Code to be included on every page ()"
per_page_code_body_description: "This code will appear inside the label. Useful for entering custom scripts, analytics..."
- twitter_handle: "Twitter handle"
- twitter_handle_description: "If filled in it will appear in the footer"
- twitter_hashtag: "Twitter hashtag"
- twitter_hashtag_description: "Hashtag that will appear when sharing content on Twitter"
+ twitter_handle: "pdxcleanenergy"
+ twitter_handle_description: "PDX Clean Energy"
+ twitter_hashtag: "#pdxcleanenergy"
+ twitter_hashtag_description: "Portland Clean Energy Fund"
facebook_handle: "Facebook handle"
facebook_handle_description: "If filled in it will appear in the footer"
youtube_handle: "Youtube handle"
@@ -47,7 +47,7 @@ en:
url: "Main URL"
url_description: "Main URL of your website"
org_name: "Portland Clean Energy Fund"
- org_name_description: "Name of your organization"
+ org_name_description: ""
place_name: "Place"
place_name_description: "Name of your city"
related_content_score_threshold: "Related content score threshold"
diff --git a/db/seeds.rb b/db/seeds.rb
index 053afdcb4..c516e65b0 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -45,9 +45,9 @@
Setting['per_page_code_body'] = ''
# Social settings
-Setting["twitter_handle"] = nil
-Setting["twitter_hashtag"] = nil
-Setting["facebook_handle"] = nil
+Setting["twitter_handle"] = 'pdxcleanenergy'
+Setting["twitter_hashtag"] = '#pdxcleanenergy'
+Setting["facebook_handle"] = 'pdxcleanenergy'
Setting["youtube_handle"] = nil
Setting["telegram_handle"] = nil
Setting["instagram_handle"] = nil