diff --git a/app/controllers/manage/configs_controller.rb b/app/controllers/manage/configs_controller.rb index ea9fb5b08..8282922eb 100644 --- a/app/controllers/manage/configs_controller.rb +++ b/app/controllers/manage/configs_controller.rb @@ -10,7 +10,6 @@ def index @questionnaire_settings = ['accepting_questionnaires', 'last_day_to_apply', 'auto_late_waitlist', 'disabled_fields'].freeze @styling = ['default_page_title', 'homepage_url', 'logo_asset', 'email_banner_asset', 'favicon_asset', 'custom_css'].freeze @communications = ['email_from', 'disclaimer_message', 'thanks_for_applying_message', 'thanks_for_rsvp_message', 'questionnaires_closed_message', 'bus_captain_notes'] - @legal = ['agreement_pdf_asset'].freeze respond_with(HackathonConfig.get_all) end diff --git a/app/views/manage/configs/index.html.haml b/app/views/manage/configs/index.html.haml index 8d24afee2..2b47cb3d2 100644 --- a/app/views/manage/configs/index.html.haml +++ b/app/views/manage/configs/index.html.haml @@ -113,34 +113,7 @@ %span %span.fa.fa-external-link.icon-space-r-half Open link - .card.mb-3 - .card-body - %h4.card-title.font-weight-bold - Legal - %h6.card-subtitle.mb-2.text-muted - Agreements for your hackers. - - @legal.each_entry do |key| - - value = HackathonConfig[key] - %hr - %p.mb-1 - = link_to edit_manage_config_path(key), class: 'icon-space-r' do - %span.fa.fa-pencil - %b - = t("simple_form.labels.hackathon_config.#{key}") - %p.text-muted= t("simple_form.hints.hackathon_config.#{key}").html_safe - %pre.mb-0= value - - if value.is_a?(String) - - images = ['.ico', '.jpg', '.jpeg', '.png', '.gif', '.svg'].freeze - - links = ['http://', 'https://'].freeze - - if value.end_with?(*images) - %br - = image_tag value, style: 'max-height: 100px;', class: 'img-thumbnail img-template' - - elsif value.start_with?(*links) - %br - = link_to value, target: 'blank' do - %span - %span.fa.fa-external-link.icon-space-r-half - Open link + .col-lg-6 .card.mb-3 .card-body diff --git a/config/app.yml b/config/app.yml index 4a2da5bd5..544c53127 100644 --- a/config/app.yml +++ b/config/app.yml @@ -13,7 +13,6 @@ defaults: &defaults logo_asset: "" favicon_asset: "" email_banner_asset: "" - agreement_pdf_asset: agreement.pdf email_from: '"HackFoo" ' default_page_title: HackFoo - Jan 1-2, 2017 homepage_url: "" diff --git a/config/locales/en.yml b/config/locales/en.yml index 303dd5d48..2ec73ca7e 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -67,7 +67,6 @@ en: logo_asset: Optional logo asset (should be a full https:// URL to a .jpg, .png, or .svg file) favicon_asset: Optional favicon asset (should be a full https:// URL to a .ico file) email_banner_asset: Optional banner asset to show at top of emails (should be a full https:// URL to a .jpg or .png file) - agreement_pdf_asset: Your hackathon's agreement (e.g. school activity release form, should be a full https:// URL to a web page or .pdf file) email_from: '"From" email address for all emails sent through the website (e.g. BrickHack <hello@example.com>)' default_page_title: Default <title> for all pages (e.g. HackFoo - Jan 1-2, 2017) @@ -117,7 +116,6 @@ en: hackathon_config: name: Hackathon Name email_from: From Email - agreement_pdf_asset: Agreement PDF Asset custom_css: Custom CSS homepage_url: Homepage URL thanks_for_rsvp_message: Thanks For RSVP Message