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

Issues #84 #146 #174 #178 #179 #192

Merged
merged 11 commits into from
Jun 12, 2023
Merged

Conversation

znmustic
Copy link

@znmustic znmustic commented Jun 6, 2023

Please check the following:

  • Whether this PR should include changes to any documentation, or the FAQ;
  • All cobrand-specific commits start their commit message with the cobrand in square brackets;
  • Is new functionality tested? CodeCov will warn you about the diff coverage, but won’t complain about e.g. new files;
  • Are the changes tested for accessibility?
  • Have you updated the changelog? If this is not necessary, put square brackets around this: skip changelog

Please check the contributing docs, and describe your pull request here.
Screenshots or GIF animations (using e.g. LICEcap) may be helpful.

Please include any issues that are fixed, using "fixes" or "closes" so that
they are auto-closed when the PR is merged.

Thanks for contributing!

@schlos schlos changed the title #84 #146 #174 #178 #179 Issues #84 #146 #174 #178 #179 Jun 7, 2023
<p class="page-text-misc">[% loc('Category') %]</p>
<p class="page-text-left-aligned">[% problem.category %]</p>
<br>
<p class="page-text-misc">[% loc('Subcategory') %]</p>
Copy link
Member

Choose a reason for hiding this comment

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

For category and sub-category we need to implement these conditions like shown on this sub-template from parent repo:
https://github.com/mysociety/fixmystreet/blob/v3.1/templates/web/base/report/new/category_wrapper.html
and
https://github.com/mysociety/fixmystreet/blob/v3.1/templates/web/base/report/new/category.html
and
https://github.com/mysociety/fixmystreet/blob/v3.1/templates/web/base/report/new/_category_select.html
and all sub-nested templates they have under category from pages above.

You can also follow the same patch as in the example, i.e. create new file under:
templates/web/popravitodev/report/new/category.html with content same but design elements updated to our code. Since _category_select.html is included in their example, we need to add also that bit in our template. To make it easier, you can add that code snippet in place where they have "[%~ INCLUDE 'report/new/_category_select.html' ~%]" *replace this with _category_select.html content + apply our css for our design.

In this file (_main.html) in place where categories snippet has to be executed, add this:
[% PROCESS "report/new/category_wrapper.html" %]
like shown in their example here:
https://github.com/mysociety/fixmystreet/blob/v3.1/templates/web/base/report/new/form_report.html#L16

Ping me if you need more infos.

p.s. fix for this can be included in the next Pull Request as I will merge this one.

Copy link
Member

Choose a reason for hiding this comment

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

I've opened a ticket for this bug: #193

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants