diff --git a/app/router.js b/app/router.js index 5642a3709..f731559d9 100644 --- a/app/router.js +++ b/app/router.js @@ -91,7 +91,9 @@ AppRouter.map(function() { this.route('organization', function() { this.route('settings', function() { }); }); - this.route('terms-of-use'); + + this.route('privacy'); + this.route('terms'); }); export default AppRouter; diff --git a/app/styles/main.scss b/app/styles/main.scss index 1748fe519..565a28605 100644 --- a/app/styles/main.scss +++ b/app/styles/main.scss @@ -71,6 +71,15 @@ ul { margin: 0; padding: 0; list-style-type: none; + + &.bulleted { + list-style-type: disc; + margin-left: 30px; + + li { + margin-bottom: 0.5em; + } + } } .border-top { @@ -171,3 +180,8 @@ p.subtext { line-height: 2em; } } + +.legal { + margin: auto; + max-width: 600px; +} diff --git a/app/templates/components/donation/donation-container.hbs b/app/templates/components/donation/donation-container.hbs index 625183207..c6ac0862d 100644 --- a/app/templates/components/donation/donation-container.hbs +++ b/app/templates/components/donation/donation-container.hbs @@ -37,7 +37,8 @@ diff --git a/app/templates/components/site-footer.hbs b/app/templates/components/site-footer.hbs index a0c331c20..9bb211cc7 100644 --- a/app/templates/components/site-footer.hbs +++ b/app/templates/components/site-footer.hbs @@ -24,13 +24,13 @@
  • team@codecorps.org
  • -{{!--
  • - Terms of Use +
  • + {{link-to 'Terms of Use' 'terms'}}
  • - Privacy Policy + {{link-to 'Privacy Policy' 'privacy'}}
  • - --}} +
  • Learn

    diff --git a/app/templates/privacy.hbs b/app/templates/privacy.hbs new file mode 100644 index 000000000..9a7c7cf6b --- /dev/null +++ b/app/templates/privacy.hbs @@ -0,0 +1,181 @@ + diff --git a/app/templates/terms-of-use.hbs b/app/templates/terms-of-use.hbs deleted file mode 100644 index 0a5e7b4b4..000000000 --- a/app/templates/terms-of-use.hbs +++ /dev/null @@ -1,2 +0,0 @@ -

    Terms of Use

    -

    Coming soon...

    diff --git a/app/templates/terms.hbs b/app/templates/terms.hbs new file mode 100644 index 000000000..4d925aea1 --- /dev/null +++ b/app/templates/terms.hbs @@ -0,0 +1,217 @@ + diff --git a/tests/integration/components/site-footer-test.js b/tests/integration/components/site-footer-test.js index 5833ed0c3..60840baeb 100644 --- a/tests/integration/components/site-footer-test.js +++ b/tests/integration/components/site-footer-test.js @@ -21,8 +21,8 @@ test('it renders all elements', function(assert) { assert.equal(this.$('ul.footer-columns > li:eq(1) li:eq(1)').text().trim(), 'Team'); assert.equal(this.$('ul.footer-columns > li:eq(2) li:eq(0)').text().trim(), 'team@codecorps.org'); - // assert.equal(this.$('ul.footer-columns > li:eq(2) li:eq(1)').text().trim(), 'Terms of Use'); - // assert.equal(this.$('ul.footer-columns > li:eq(2) li:eq(2)').text().trim(), 'Privacy Policy'); + assert.equal(this.$('ul.footer-columns > li:eq(2) li:eq(1)').text().trim(), 'Terms of Use'); + assert.equal(this.$('ul.footer-columns > li:eq(2) li:eq(2)').text().trim(), 'Privacy Policy'); assert.equal(this.$('ul.footer-columns > li:eq(2) li:eq(0) a').attr('href'), 'mailto:team@codecorps.org'); diff --git a/tests/unit/routes/terms-of-use-test.js b/tests/unit/routes/terms.js similarity index 72% rename from tests/unit/routes/terms-of-use-test.js rename to tests/unit/routes/terms.js index 2421fe848..7955b39ae 100644 --- a/tests/unit/routes/terms-of-use-test.js +++ b/tests/unit/routes/terms.js @@ -1,6 +1,6 @@ import { moduleFor, test } from 'ember-qunit'; -moduleFor('route:terms-of-use', 'Unit | Route | terms of use', { +moduleFor('route:terms', 'Unit | Route | terms', { needs: ['service:metrics'] });