From dbf41421ed9debde35d6ff47b06d6291202e2812 Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 28 Sep 2018 17:55:01 +0200 Subject: [PATCH] Removes guide feature --- app/assets/stylesheets/participation.scss | 92 ------------------- app/controllers/guides_controller.rb | 8 -- app/helpers/guides_helper.rb | 19 ---- .../information_texts/_tabs.html.erb | 6 +- app/views/budgets/index.html.erb | 2 +- app/views/guides/new.html.erb | 58 ------------ app/views/proposals/index.html.erb | 4 +- config/i18n-tasks.yml | 1 - config/locales/en/admin.yml | 3 +- config/locales/en/guides.yml | 18 ---- config/locales/es/admin.yml | 3 +- config/locales/es/guides.yml | 18 ---- config/routes.rb | 1 - config/routes/guide.rb | 1 - db/dev_seeds/settings.rb | 1 - db/seeds.rb | 1 - .../information_texts_spec.rb | 5 +- spec/features/guides_spec.rb | 66 ------------- 18 files changed, 9 insertions(+), 298 deletions(-) delete mode 100644 app/controllers/guides_controller.rb delete mode 100644 app/helpers/guides_helper.rb delete mode 100644 app/views/guides/new.html.erb delete mode 100644 config/locales/en/guides.yml delete mode 100644 config/locales/es/guides.yml delete mode 100644 config/routes/guide.rb delete mode 100644 spec/features/guides_spec.rb diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index cafbb52be..bb600ff83 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -9,7 +9,6 @@ // 07. Proposals successful // 08. Polls // 09. Polls results and stats -// 10. Guides // // 01. Votes and supports @@ -2095,94 +2094,3 @@ line-height: rem-calc(60); } } - -// 10. Guides -// ---------------------- - -.guides { - - h2 { - margin: $line-height 0 $line-height * 2; - } - - .guide-budget, - .guide-proposal { - border-radius: rem-calc(3); - margin: $line-height 0; - padding: $line-height; - position: relative; - - .button { - color: $text; - font-weight: bold; - } - - &::before { - border-radius: 100%; - color: #fff; - font-family: "icons" !important; - height: rem-calc(80); - left: 50%; - line-height: rem-calc(80); - margin-left: rem-calc(-40); - position: absolute; - text-align: center; - top: -40px; - width: rem-calc(80); - z-index: 99; - } - } - - .guide-budget { - border: 1px solid $budget; - - &::before { - background: $budget; - content: '\53'; - font-size: rem-calc(40); - } - - .button { - background: #f8f5f9; - border: 1px solid $budget; - } - } - - .guide-proposal { - border: 1px solid $proposals; - - &::before { - background: $proposals; - content: '\68'; - font-size: rem-calc(40); - } - - .button { - background: #fffaf4; - border: 1px solid $proposals; - } - } - - ul { - - @include breakpoint(medium) { - min-height: $line-height * 14; - } - - li { - margin-bottom: $line-height; - padding-left: $line-height; - position: relative; - - &::before { - color: #37af65; - content: '\56'; - font-family: "icons" !important; - font-size: $small-font-size; - left: 0; - position: absolute; - top: 1px; - } - } - } -} diff --git a/app/controllers/guides_controller.rb b/app/controllers/guides_controller.rb deleted file mode 100644 index 0a03955e9..000000000 --- a/app/controllers/guides_controller.rb +++ /dev/null @@ -1,8 +0,0 @@ -class GuidesController < ApplicationController - - skip_authorization_check - - def new - end - -end \ No newline at end of file diff --git a/app/helpers/guides_helper.rb b/app/helpers/guides_helper.rb deleted file mode 100644 index dd504d7d6..000000000 --- a/app/helpers/guides_helper.rb +++ /dev/null @@ -1,19 +0,0 @@ -module GuidesHelper - - def new_proposal_guide - if feature?('guides') && Budget.current&.accepting? - new_guide_path - else - new_proposal_path - end - end - - def new_budget_investment_guide - if feature?('guides') - new_guide_path - else - new_budget_investment_path(current_budget) - end - end - -end diff --git a/app/views/admin/site_customization/information_texts/_tabs.html.erb b/app/views/admin/site_customization/information_texts/_tabs.html.erb index a28fb8f17..0b6cd61fe 100644 --- a/app/views/admin/site_customization/information_texts/_tabs.html.erb +++ b/app/views/admin/site_customization/information_texts/_tabs.html.erb @@ -1,11 +1,11 @@ diff --git a/app/views/budgets/index.html.erb b/app/views/budgets/index.html.erb index 9d73bf571..729975469 100644 --- a/app/views/budgets/index.html.erb +++ b/app/views/budgets/index.html.erb @@ -33,7 +33,7 @@ <% if current_user %> <% if current_user.level_two_or_three_verified? %> <%= link_to t("budgets.investments.index.sidebar.create"), - new_budget_investment_guide, + new_budget_investment_path(@budget), class: "button margin-top expanded" %> <% else %>
diff --git a/app/views/guides/new.html.erb b/app/views/guides/new.html.erb deleted file mode 100644 index 314941ca4..000000000 --- a/app/views/guides/new.html.erb +++ /dev/null @@ -1,58 +0,0 @@ -
-
-
-

<%= t("guides.title", org: setting['org_name']) %>

-

<%= t("guides.subtitle") %>

-
-
- -
- -
-
-

- <%= t("guides.budget_investment.title") %> -

- -
    -
  • <%= t("guides.budget_investment.feature_1_html") %>
    • -
  • <%= t("guides.budget_investment.feature_2_html") %>
    • -
  • <%= t("guides.budget_investment.feature_3_html") %>
    • -
  • <%= t("guides.budget_investment.feature_4_html") %>
    • -
- <% if current_budget %> -
- <%= link_to t("guides.budget_investment.new_button"), - new_budget_investment_path(current_budget), - class: "button expanded" %> -
- <% end %> -
-
- -
-
-

- <%= t("guides.proposal.title") %> -

- -
    -
  • <%= t("guides.proposal.feature_1_html") %>
    • -
  • - <%= t("guides.proposal.feature_2_html", - votes: setting["votes_for_proposal_success"], - org: setting['org_name']) %> -
    • -
  • <%= t("guides.proposal.feature_3_html") %>
    • -
  • <%= t("guides.proposal.feature_4_html") %>
    • -
- -
- <%= link_to t("guides.proposal.new_button"), - new_proposal_path, - class: "button expanded" %> -
-
-
-
-
diff --git a/app/views/proposals/index.html.erb b/app/views/proposals/index.html.erb index 2217513f8..0e19f0795 100644 --- a/app/views/proposals/index.html.erb +++ b/app/views/proposals/index.html.erb @@ -76,7 +76,7 @@ <% if @proposals.any? %>
<%= link_to t("proposals.index.start_proposal"), - new_proposal_guide, + new_proposal_path, class: 'button expanded' %>
<% end %> @@ -109,7 +109,7 @@