forked from mysociety/fixmystreet
-
-
Notifications
You must be signed in to change notification settings - Fork 5
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
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
8a24082
added linkedin icon to footer
znmustic 371d3e0
Added media screen for socials footer
znmustic 4434772
#84 #146 #174 #178 #179
znmustic d1de90b
fix format
znmustic 5932a9c
Fix format
znmustic 39ffe36
Fix Format
znmustic 6a6224e
Fix format
znmustic 139f46c
Fix format
znmustic b3df3b3
Fix format
znmustic 2d9fee8
Fix format
znmustic 88aa41e
Fix format
znmustic File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,64 +1,75 @@ | ||
| [% IF pagefooter %] | ||
|
|
||
| <footer class="footer" role="contentinfo"> | ||
| <div class="footer-desc"> | ||
| <picture class="popravi-logo"> | ||
| <source srcset="/cobrands/[% c.cobrand.asset_moniker %]/images/popravi-logo-white.svg"> | ||
| <img src="/cobrands/[% c.cobrand.asset_moniker %]/images/popravi-logo-white.svg" alt="[% site_name %]"> | ||
| </picture> | ||
| <p class="footer-text footer-text-long-desc"> | ||
| Popravi.to je online alat napravljen u svrhu poboljšanja javnih politika i inkluzivnom odlučivanju, | ||
| te kako bi građanima pružio mehanizme za prijavu problema lokalnoj administraciji te nadzoru | ||
| njihovog rješavanja u svojoj sredini. | ||
| </p> | ||
| <form class="button-link-footer"> | ||
| <button formaction="/" class="button report-issue-button-footer" tabindex="0" aria-label="report problem">[%- loc('Report a problem') -%]</button> | ||
| </form> | ||
| </div> | ||
| <nav> | ||
| <ul class="menu-list-footer [% ul_class %]" [% " id='" _ ul_id _ "'" IF ul_id %]> | ||
| <!-- <li class="menu-item menu-item-footer"><a href="/reports" tabindex="0" aria-label="all reports">[%- loc('All reports') -%]</a></li> | ||
| <li class="menu-item menu-item-footer"><a href="/alert" tabindex="0" aria-label="notifications">[%- loc('Local alerts') -%]</a></li> --> | ||
| <li class="menu-item menu-item-footer"><a href="/faq" tabindex="0" aria-label="help">[%- loc('Help') -%]</a></li> | ||
| <li class="menu-item menu-item-footer"><a href="/privacy" tabindex="0" aria-label="help">[%- loc('Privacy') -%]</a></li> | ||
| <li class="menu-item menu-item-footer"><a href="/about/house-rules" tabindex="0" aria-label="help">[%- loc('Pravila ponašanja') -%]</a></li> | ||
|
|
||
| [%~ IF c.user_exists ~%] | ||
| <li class="menu-item menu-item-footer"><a href="/my" tabindex="0" aria-label="my profile">[%- loc('Your account') -%]</a></li> | ||
| [%~ ELSE ~%] | ||
| <li class="menu-item menu-item-footer"><a href="/auth" tabindex="0" aria-label="sign in">[%- loc('Sign in') -%]</a></li> | ||
| [%~ END ~%] | ||
|
|
||
| </ul> | ||
| </nav> | ||
| <div class="poweredby"> | ||
| <p class="footer-text">[% loc('Powered by') %]</p> | ||
| <picture class="fixmystreet-logo"> | ||
| <source srcset="/cobrands/[% c.cobrand.asset_moniker %]/images/fixmystreetlogo.svg"> | ||
| <img src="/cobrands/[% c.cobrand.asset_moniker %]/images/fixmystreetlogo.svg" alt="FixMyStreet"> | ||
| </picture> | ||
| <p class="footer-text">[% loc('With love') %]</p> | ||
| <picture class="fixmystreet-logo"> | ||
| <source srcset="/cobrands/[% c.cobrand.asset_moniker %]/images/logo-codeforcroatia@2x.svg"> | ||
| <img src="/cobrands/[% c.cobrand.asset_moniker %]/images/logo-codeforcroatia@2x.svg" alt="Code for Croatia"> | ||
| </picture> | ||
| <picture class="fixmystreet-logo"> | ||
| <source srcset="/cobrands/[% c.cobrand.asset_moniker %]/images/logo-gong@2x.svg"> | ||
| <img src="/cobrands/[% c.cobrand.asset_moniker %]/images/logo-gong@2x.svg" alt="Gong"> | ||
| </picture> | ||
| </div> | ||
| <div> | ||
| <p class="footer-text footer-socials">[% loc('Find us on') %]</p> | ||
| <footer class="footer" role="contentinfo"> | ||
| <div class="footer-desc"> | ||
| <picture class="popravi-logo"> | ||
| <source srcset="/cobrands/[% c.cobrand.asset_moniker %]/images/popravi-logo-white.svg"> | ||
| <img src="/cobrands/[% c.cobrand.asset_moniker %]/images/popravi-logo-white.svg" alt="[% site_name %]"> | ||
| </picture> | ||
| <p class="footer-text footer-text-long-desc"> | ||
| Popravi.to je online alat napravljen u svrhu poboljšanja javnih politika i inkluzivnom odlučivanju, | ||
| te kako bi građanima pružio mehanizme za prijavu problema lokalnoj administraciji te nadzoru | ||
| njihovog rješavanja u svojoj sredini. | ||
| </p> | ||
| <form class="button-link-footer"> | ||
| <button formaction="/" class="button report-issue-button-footer" tabindex="0" | ||
| aria-label="report problem">[%- loc('Report a problem') -%]</button> | ||
| </form> | ||
| </div> | ||
| <nav> | ||
| <ul class="socials"> | ||
| <li class="footer-social-item"><a href="https://github.com/codeforcroatia/Popravi.to" tabindex="0" aria-label="GitHub"><span class="github-link"></span></a></li> | ||
| <li class="footer-social-item"><a href="https://twitter.com/PopraviTo" tabindex="0" aria-label="Twitter"><span class="twitter-link"></span></a></li> | ||
| <li class="footer-social-item"><a href="https://www.facebook.com/Popravi.to" tabindex="0" aria-label="Facebook"><span class="facebook-link"></span></a></li> | ||
| <ul class="menu-list-footer [% ul_class %]" [% " id='" _ ul_id _ "'" IF ul_id %]> | ||
| <!-- <li class="menu-item menu-item-footer"><a href="/reports" tabindex="0" aria-label="all reports">[%- loc('All reports') -%]</a></li> | ||
| <li class="menu-item menu-item-footer"><a href="/alert" tabindex="0" aria-label="notifications">[%- loc('Local alerts') -%]</a></li> --> | ||
| <li class="menu-item menu-item-footer"><a href="/faq" tabindex="0" aria-label="help">[%- loc('Help') -%]</a> | ||
| </li> | ||
| <li class="menu-item menu-item-footer"><a href="/privacy" tabindex="0" aria-label="help">[%- loc('Privacy') | ||
| -%]</a></li> | ||
| <li class="menu-item menu-item-footer"><a href="/about/house-rules" tabindex="0" aria-label="help">[%- | ||
| loc('Pravila ponašanja') -%]</a></li> | ||
|
|
||
| [%~ IF c.user_exists ~%] | ||
| <li class="menu-item menu-item-footer"><a href="/my" tabindex="0" aria-label="my profile">[%- loc('Your | ||
| account') -%]</a></li> | ||
| [%~ ELSE ~%] | ||
| <li class="menu-item menu-item-footer"><a href="/auth" tabindex="0" aria-label="sign in">[%- loc('Sign in') | ||
| -%]</a></li> | ||
| [%~ END ~%] | ||
|
|
||
| </ul> | ||
| </nav> | ||
| </div> | ||
| </footer> | ||
| <div class="poweredby"> | ||
| <p class="footer-text">[% loc('Powered by') %]</p> | ||
| <picture class="fixmystreet-logo"> | ||
| <source srcset="/cobrands/[% c.cobrand.asset_moniker %]/images/fixmystreetlogo.svg"> | ||
| <img src="/cobrands/[% c.cobrand.asset_moniker %]/images/fixmystreetlogo.svg" alt="FixMyStreet"> | ||
| </picture> | ||
| <p class="footer-text">[% loc('With love') %]</p> | ||
| <picture class="fixmystreet-logo"> | ||
| <source srcset="/cobrands/[% c.cobrand.asset_moniker %]/images/logo-codeforcroatia@2x.svg"> | ||
| <img src="/cobrands/[% c.cobrand.asset_moniker %]/images/logo-codeforcroatia@2x.svg" alt="Code for Croatia"> | ||
| </picture> | ||
| <picture class="fixmystreet-logo"> | ||
| <source srcset="/cobrands/[% c.cobrand.asset_moniker %]/images/logo-gong@2x.svg"> | ||
| <img src="/cobrands/[% c.cobrand.asset_moniker %]/images/logo-gong@2x.svg" alt="Gong"> | ||
| </picture> | ||
| </div> | ||
| <div> | ||
| <p class="footer-text footer-socials">[% loc('Find us on') %]</p> | ||
| <nav> | ||
| <ul class="socials"> | ||
| <li class="footer-social-item"><a href="https://github.com/codeforcroatia/Popravi.to" tabindex="0" | ||
| aria-label="GitHub"><span class="github-link"></span></a></li> | ||
| <li class="footer-social-item"><a href="https://twitter.com/PopraviTo" tabindex="0" | ||
| aria-label="Twitter"><span class="twitter-link"></span></a></li> | ||
| <li class="footer-social-item"><a href="https://www.facebook.com/Popravi.to" tabindex="0" | ||
| aria-label="Facebook"><span class="facebook-link"></span></a></li> | ||
| <li class="footer-social-item"><a href="https://www.linkedin.com/showcase/popravi.to" tabindex="0" | ||
| aria-label="LinkedIn"><span class="linkedin-link"></span></a></li> | ||
| </ul> | ||
| </nav> | ||
| </div> | ||
| </footer> | ||
|
|
||
| [% END %] | ||
|
|
||
| [% INCLUDE 'common_footer_tags.html' %] | ||
| [% INCLUDE 'common_footer_tags.html' %] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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