search

TeamMentor / TM_4_0_Design

Repo Holds TM 4.x issues
4 stars 3 forks source link

Terms and Conditions Page Question #123

Closed romichg closed 9 years ago

romichg commented 9 years ago

When scrolling all the way to the bottom of the landing page there is a link to Terms and Conditions which currently points to http://localhost:1337/terms-and-conditions.html. The link at the moment is broken.

The text for the page is here: https://github.com/TeamMentor/TM_4_0_Design/blob/master/source/content/terms-and-conditions.md

  1. Dinis, lets take it out for now from this version as we never had anything like that before.
  2. @tlaloc75 @SI-Lisa Should we have something like this? Here is a screenshot of where the link is- team mentor 4 0 html version - iceweasel_010
DinisCruz commented 9 years ago

For reference, this is what it look likes when viewed:

image

@michaelhidalgo do you want to have a go at removing this link using the workflow show in https://github.com/TeamMentor/TM_4_0_Design/issues/117 and https://github.com/TeamMentor/TM_4_0_Design/issues/119

michaelhidalgo commented 9 years ago

This test verifies that the link to Terms & Conditions is there:

it 'Issue 123-Terms and conditions link is available', (done)->
    jade.page_Home (html, $) ->
      footerDiv =  $('#footer').html()
      footerDiv.assert_Contains("Terms & Conditions")
      done();

screen shot 2014-12-17 at 7 35 28 am

Once fixed: 

  it 'Issue 123-Terms and conditions link is available', (done)->
    jade.page_Home (html, $) ->
      footerDiv =  $('#footer').html()
      footerDiv.assert_Not_Contains("Terms & Conditions")
      done();

screen shot 2014-12-17 at 7 41 48 am

After merging :

screen shot 2014-12-17 at 8 45 23 am

SI-Lisa commented 9 years ago

I think we do need it for some basic legal air cover. I think it is fine if the link goes to another page that isn't as pretty or even a pop up window that has the T&Cs present.

On Tue, Dec 16, 2014 at 12:28 PM, RomichG notifications@github.com wrote:

When scrolling all the way to the bottom of the landing page there is a link to Terms and Conditions which currently points to http://localhost:1337/terms-and-conditions.html. The link at the moment is broken.

The text for the page is here:

https://github.com/TeamMentor/TM_4_0_Design/blob/master/source/content/terms-and-conditions.md

  1. Dinis, lets take it out for now from this version as we never had anything like that before.
  2. @tlaloc75 https://github.com/tlaloc75 @SI-Lisa https://github.com/SI-Lisa Should we have something like this? Here is a screenshot of where the link is- [image: team mentor 4 0 html version - iceweasel_010] https://cloud.githubusercontent.com/assets/1326120/5458282/eed9bfd4-851e-11e4-82a7-5414f442cf34.png

— Reply to this email directly or view it on GitHub https://github.com/TeamMentor/TM_4_0_Design/issues/123.

DinisCruz commented 9 years ago

this looks good @michaelhidalgo

btw where is commit with the fix? ( please push it to your github repo)

michaelhidalgo commented 9 years ago

As I'm learning how to use Source Tree, i did 5 commits :

https://github.com/michaelhidalgo/TM_4_0_Design/commit/e5f77919688bd0d72ab651092c8726f3c08e5859 https://github.com/michaelhidalgo/TM_4_0_Design/commit/285094072fcdd09945de6088e733fae35f8f54ac https://github.com/michaelhidalgo/TM_4_0_Design/commit/412cb85b9fe192a95bf447b839477c40755f464f https://github.com/michaelhidalgo/TM_4_0_Design/commit/43c0ac5f2cae2a7572a979f10556504fd80c09cb https://github.com/michaelhidalgo/TM_4_0_Design/commit/a150e479853c70822f49e60f7002614190e40c34

romichg commented 9 years ago

Source tree is made by the same people that make Jira :) we'll be leaving github before you know it :) j/k @SI-Lisa what should be the text? Is the license agreement that is in here (regardless of the format) ok? Or should we have different text/adjust this one?

DinisCruz commented 9 years ago

ok I merged Michael's changed with https://github.com/TeamMentor/TM_4_0_Design/pull/133

luchia commented 9 years ago

Hi guys, sorry I haven't seen this thread earlier. I can't remember who sent me the document initially, but Jason asked if we could have this available on TM landing page.

If someone can send me a correct document, I can update this for you or change it however you would like.

romichg commented 9 years ago

Need to test the removal of the page, and get the correct text from Lisa. Then have it re-added.

SI-Lisa commented 9 years ago

Hi All, Adding Alli here. Alli, could you provide Roman with the standard Terms and Conditions language that we use on our SI website for them to use on the TEAM Mentor site?

Thanks! Lisa

On Wed, Dec 17, 2014 at 6:58 PM, RomichG notifications@github.com wrote:

Need to test the removal of the page, and get the correct text from Lisa. Then have it re-added.

— Reply to this email directly or view it on GitHub https://github.com/TeamMentor/TM_4_0_Design/issues/123#issuecomment-67420014 .

SI-Lisa commented 9 years ago

Is this what you’re referring to?

From: Lisa Parcella [mailto:lparcella@securityinnovation.com] Sent: Thursday, December 18, 2014 9:20 AM To: TeamMentor/TM_4_0_Design; Alli Campofranco Cc: TeamMentor/TM_4_0_Design Subject: Re: [TM_4_0_Design] Terms and Conditions Page Question (#123)

Hi All, Adding Alli here. Alli, could you provide Roman with the standard Terms and Conditions language that we use on our SI website for them to use on the TEAM Mentor site?

Thanks! Lisa

On Wed, Dec 17, 2014 at 6:58 PM, RomichG notifications@github.com wrote:

Need to test the removal of the page, and get the correct text from Lisa. Then have it re-added.

— Reply to this email directly or view it on GitHub https://github.com/TeamMentor/TM_4_0_Design/issues/123#issuecomment-67420014 .

romichg commented 9 years ago

Here is a link that should be used: https://securityinnovation.com/uploads/security-innovation-software-license.pdf

Which I think is exactly the same as in the original link. https://github.com/TeamMentor/TM_4_0_Design/blob/master/source/content/terms-and-conditions.md

Michael can you put that back, and make sure we have appropriate unit tests for the link to be working? Thanks.

michaelhidalgo commented 9 years ago

Ok here are two test that verify that the link exist and that the content exists : 


  it 'Issue 123 - Terms and conditions link is available', (done)->
    jade.page_User_Logout (html,$)->
      footerDiv =  $('#footer').html()
      footerDiv.assert_Contains("Terms & Conditions")
      done();

  it 'Issue 123 - Terms and conditions Page is displayed', (done)->
    jade.page_User_Logout (html,$)->
      footerDiv =  $('#footer').html()
      footerDiv.assert_Contains("Terms & Conditions")
      page.click 'Terms & Conditions', (html,$)->
        $('#security-innovation-software-license-agreement').html().assert_Is("Security Innovation Software License Agreement")
        done();
michaelhidalgo commented 9 years ago

With Pull Request

DinisCruz commented 9 years ago

merged