Merge pull request #15 from antibland/proposal-text-change

Links for Proposals section (#6)
CodeForPortland · Feb 28, 2019 · cc024d0 · cc024d0
2 parents 00a7565 + ececcf0
commit cc024d0
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 2 deletions.
diff --git a/app/assets/stylesheets/custom.scss b/app/assets/stylesheets/custom.scss
@@ -3,3 +3,8 @@
 // * English: https://github.com/consul/consul/blob/master/CUSTOMIZE_EN.md#css
 // * Spanish: https://github.com/consul/consul/blob/master/CUSTOMIZE_ES.md#css
 //
+
+.content-link {
+  color: black;
+  text-decoration: underline;
+}
diff --git a/app/views/proposals/index.html.erb b/app/views/proposals/index.html.erb
@@ -102,7 +102,23 @@
             </p>
             <p><%= t("proposals.index.section_footer.description1",
                       org: link_to(setting["org_name"], new_user_registration_path)).html_safe %></p>
-            <p><%= t("proposals.index.section_footer.description2") %></p>
+            <p>
+              <%= t('proposals.index.section_footer.description2',
+                    ordinance_link: link_to(
+                      t('proposals.index.section_footer.ordinance'),
+                      "https://www.portlandoregon.gov/revenue/article/707697",
+                      target: "_blank",
+                      rel: "noopener external",
+                      class: "content-link"
+                    ),
+                    community_forum_link: link_to(
+                      t('proposals.index.section_footer.community_forum'),
+                      debates_path,
+                      class: "content-link"
+                    )
+                  ).html_safe
+              %>
+            </p>
             <p><%= t("proposals.index.section_footer.description3") %></p>
             <p><%= t("proposals.index.section_footer.description4") %></p>
             <p><%= t("proposals.index.section_footer.description5") %></p>

diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml
@@ -397,8 +397,10 @@ en:
         help: Help with project proposals
       section_footer:
         title: Help with project proposals
+        ordinance: ordinance
+        community_forum: Community Forum
         description1: "%{org} with your email and password to create an account and certify yourself as a resident of Portland. To create or support proposals it is necessary to have a verified account."
-        description2: "Read and evaluate proposals for transitioning to a clean energy economy and click Support when you think a project merits consideration by other people in the community. Before you create a proposal, please review the [ordinance] to understand and best articulate how your project aligns with the mission of the Portland Clean Energy Fund. If you are unsure the [Community Forum] can help."
+        description2: "Read and evaluate proposals for transitioning to a clean energy economy and click Support when you think a project merits consideration by other people in the community. Before you create a proposal, please review the %{ordinance_link} to understand and best articulate how your project aligns with the mission of the Portland Clean Energy Fund. If you are unsure the %{community_forum_link} can help."
         description3: "After clicking “Create a proposal” in the upper right of this page, describe your project with a title, short summary, and explanation. You can link to videos from YouTube or Vimeo that support your proposal and include images and pdf documents. Use all or only some of the document types, depending on the needs of your project and the documents you have. The project area can be identified by selecting: All city, SE, SW, NW, NE, N, or choosing from the list of neighborhoods. And for specific locations, use the map to navigate and place the marker."
         description4: "To help the community discover similar efforts, select Tags that match your project. Click on the pre-existing Categories to tag your proposal. And if one doesn’t yet exist, create a new one specific to your project. Tags include broad categories such as Weatherization, Heating, Cooling, and more specific items like Shared Electric Metrofiet."
         description5: "Any resident of Portland can make a proposal for how to distribute funds, and if it receives the support of ten percent of the Portlanders registered here, the proposal will progress to the [Voting] phase. After a citywide vote, the appointed members of the community panel will vet proposals that fulfill the mandate of the Portland Clean Energy Fund and recommend to the mayor how to distribute funds—the money enters Portland’s economy as grants to Oregon nonprofit organizations."