"End search" becomes "before you export" #798
Conversation
galund
force-pushed
the
end-search-becomes-before-you-export
branch
2 times, most recently
from
32e7ed6 to
66589eb
Compare
| </form> | ||
|
|
||
| <p><a href="{{ url_for('direct_award.view_project', framework_family=framework.framework, project_id=project.id) }}">Return to overview</a></p> | ||
| <p><a href="{{ url_for('direct_award.view_project', framework_family=framework.framework, project_id=project.id) }}">Return to your task list</a></p> |
There was a problem hiding this comment.
Can we change this to framework.family?
|
|
||
| <div class="end-search-page"> | ||
| <div class="grid-row"> | ||
| <div class="column-two-thirds"> | ||
| <div class="column-two-thirds dmspeak"> |
There was a problem hiding this comment.
What does dmspeak do here?
There was a problem hiding this comment.
Ahhhh dmspeak. Long story behind it I think but I think all you need to know is it's a dumping ground of all kinds of more "conversational" styles we use...
| <header class="page-heading"> | ||
| <h1> | ||
| End your search | ||
| Before you export your results | ||
| </h1> | ||
| </header> |
There was a problem hiding this comment.
I think there is a template for headings now, you can use
{% with heading="Before you export your results" %}
{% include "toolkit/page-heading.html %}
{% endwith %}
There was a problem hiding this comment.
But ewww yuck no :-)
| @@ -30,6 +30,13 @@ def options(self): | |||
| return [{"label": label, "value": value} for value, label in self.choices] | |||
|
|
|||
|
|
|||
| class DMBooleanField(BooleanField): | |||
There was a problem hiding this comment.
Is this needed? It feels like we have this in utils now
There was a problem hiding this comment.
That PR didn't land yet :( Crown-Commercial-Service/digitalmarketplace-utils#400
galund
force-pushed
the
end-search-becomes-before-you-export
branch
4 times, most recently
from
439ee84 to
1a5ddae
Compare
| export your results. | ||
| </p> | ||
| </div> | ||
| {% endif %} |
There was a problem hiding this comment.
This feels like it should be using the validation masthead template from the frontend toolkit?
There was a problem hiding this comment.
It's based on that, but this is an intentional change because the form only has one question. So we don't need the 'heading plus list of question/errors' format, but something slightly different i.e. just one para of text.
There was a problem hiding this comment.
We use the standard heading+question for all the other one-question forms.
There was a problem hiding this comment.
Well the login screen has something different. The content here seems right to me, and has been discussed a fair amount.
galund
force-pushed
the
end-search-becomes-before-you-export
branch
from
1a5ddae to
ee1a42f
Compare
| {% if errors %} | ||
| <div class="validation-masthead" aria-labelledby="validation-masthead-heading" aria-role="group" tabindex="-1"> | ||
| <p> | ||
| You need to <a href="#user_understands">confirm that you’ve finished editing your search</a> before you |
There was a problem hiding this comment.
It would be nice to do something more like the toolkit here with a href="#{{ form.user_understands.id }}".
- This is more a content change rather than new functionality, but there is a small form with a tick box that must be ticked. - We also now take users directly to the export page once they've confirmed that they're ready. https://trello.com/c/Z1a3weIe/131-replace-end-search-with-before-you-export-your-results
- requires updated front-end toolkit. https://trello.com/c/Z1a3weIe/131-replace-end-search-with-before-you-export-your-result
galund
force-pushed
the
end-search-becomes-before-you-export
branch
from
14c5e06 to
c37c4cd
Compare
"End search" is now cast in terms "being ready to download".
https://trello.com/c/Z1a3weIe/131-replace-end-search-with-before-you-export-your-results