Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lead generation modal for Spicule #25

Merged
merged 8 commits into from
Mar 27, 2019

Conversation

barrymcgee
Copy link
Contributor

@barrymcgee barrymcgee commented Feb 19, 2019

Done

Added lead generation form for Spicule

QA

Notes

  • This form still needs to be connected to Marketo so remains blocked.

@webteam-app
Copy link
Collaborator

@barrymcgee barrymcgee changed the base branch from master to develop March 11, 2019 09:34
@clagom
Copy link

clagom commented Mar 11, 2019

Ok, we can proceed on with this. We discussed the issue with legal, and we can have a combined message with Canonical and Spicule with a thick box agreement with both private policies.

Tengu will stay as it is currently (no form), as the status of the partnership is unclear. Spicule can go on.

Sending the copy for the check box shortly later.
@barrymcgee

@clagom
Copy link

clagom commented Mar 11, 2019

@barrymcgee, here's copy:
In submitting this form, I confirm that I have read and agree to Canonical’s Privacy Notice (LINK: https://www.ubuntu.com/legal/data-privacy/contact?_ga=2.67215766.606903877.1552321043-1465573742.1527584293) and Privacy Policy (LINK: https://www.ubuntu.com/legal/data-privacy?_ga=2.67215766.606903877.1552321043-1465573742.1527584293) and Spicule's Privacy Policy (LINK: https://spicule.co.uk/privacy-policy/) and acknowledge that I may be contacted by Spicule and/or Canonical.

@barrymcgee barrymcgee force-pushed the lead-gen-modal-forms branch from 748a006 to f0196fc Compare March 13, 2019 11:30
@barrymcgee barrymcgee marked this pull request as ready for review March 13, 2019 11:30
@barrymcgee barrymcgee requested a review from clagom March 13, 2019 11:32
@anthonydillon
Copy link
Collaborator

@barrymcgee can you add labels if you want reviews please

@barrymcgee barrymcgee changed the base branch from develop to master March 19, 2019 15:55
@barrymcgee barrymcgee force-pushed the lead-gen-modal-forms branch from 673650e to dcadaf2 Compare March 19, 2019 16:16
@spencerbygraves
Copy link

@barrymcgee does this need a design review?

@webteam-app
Copy link
Collaborator

@barrymcgee
Copy link
Contributor Author

barrymcgee commented Mar 20, 2019

@spencerbygraves
Copy link

@barrymcgee it appears to work on the experts page but if I start to scroll this happens:

image

When viewing the bundle I have to scroll to see the button, so when I click this happens:

image

Also, I think the dialog being as wide as the page is unnecessary, something like half the width would be fine.

Thanks.

@spencerbygraves
Copy link

@barrymcgee I'm on holiday tomorrow and Friday, so please ask @clagom to take a look if another review is needed

@clagom
Copy link

clagom commented Mar 26, 2019

Hi @barrymcgee, @spencerbygraves and I had a look at the demo, thank you.
On top of Spencer's comment up there, we can implement to close the modal by clicking on the dark background (this is a behaviour that we use across websites). I see the filled data is maintained if you close the modal and reopen it, so it shouldn't be a problem for that.
I think we don't need the title "Get in touch with Spicule", that would save us some space.

Copy link

@spencerbygraves spencerbygraves left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@barrymcgee it appears to work on the experts page but if I start to scroll this happens:

image

When viewing the bundle I have to scroll to see the button, so when I click this happens:

image

Also, could you update a couple of things please:

  • I think the dialog being as wide as the page is unnecessary, in the design it's much narrower.
  • Can you adjust the spacing above and below the hr please:
    image
  • Can we group the two telephone numbers under the one icon please, see the design
  • And the privacy message should be 14px please

Thanks

Copy link

@spencerbygraves spencerbygraves left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @barrymcgee looking good.

Just two small things then both @clagom and I are happy.

  • Can the 14px privacy text have a line-height of 1.25rem please, as in Vanilla
  • Can you move the send button to the right please

Thanks 👍

Copy link

@spencerbygraves spencerbygraves left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@barrymcgee thanks for updating. Could you just add 'rem' to the line-height, 1.25; please, it's not displaying correctly without it.

Also I missed the padding left on the contact list, could you remove it please so everything aligns on the left:

image

Thanks

@barrymcgee
Copy link
Contributor Author

@spencerbygraves Demo service playing up - here's a screenshot instead

Screenshot 2019-03-27 at 14 19 34

@spencerbygraves
Copy link

@barrymcgee looks good thanks for updating 👍

Copy link

@spencerbygraves spencerbygraves left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@@ -17,7 +16,7 @@ jobs:
command: pip3 install flake8
- run:
name: Lint webapp with Flake8
command: flake8 webapp
command: flake8 --max-line-length 95 webapp
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this will be overridden by #79

static/js/app/modal.js Outdated Show resolved Hide resolved
@@ -187,5 +150,9 @@ <h4>
</div>
</div>
</div>
{% include "shared/_spicule_lead-gen-form.html" %}
<script>
window.app.modal('leadGenerationModal');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because the lead gen form is the one that actually includes the JS onto the page I feel like the instantiation of that modal should also be in that template. Doing it this way leads to the possibility of one or the other being removed accidentally.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But then you hardwire the id of the form within the partial? You previously asked that I refactor this partial so there could be more than one modal per page if needed?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this case the partial is the lead generation form. And you're instantiating it as a lead generation form. If you were to create another modal you'd likely have another partial with a different name.

{% endif %}

<script>
window.app.modal('leadGenerationModal');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See above comment about this initialization.

tests/store/test_views.py Outdated Show resolved Hide resolved
webapp/store/views.py Outdated Show resolved Hide resolved
@barrymcgee barrymcgee force-pushed the lead-gen-modal-forms branch from a4c9726 to 1103eb0 Compare March 27, 2019 18:48
hatched
hatched previously approved these changes Mar 27, 2019
Copy link
Contributor

@hatched hatched left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @barrymcgee just a small change then it's good to land.

@param { String } modalId
The DOM id of the element you'd like to turn into a modal.
*/
window.app.modal = function(modalId) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now that this is being included as a template it should check to see if the variable is available before assigning into it. In this case it's not really a problem but just a good practice

if (!window.app.model) {
   ...
}

@hatched hatched merged commit ce0159a into canonical:master Mar 27, 2019
@barrymcgee barrymcgee deleted the lead-gen-modal-forms branch April 4, 2019 11:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants