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

Add logos for Skosmos 3 #1562

Merged
merged 3 commits into from
Nov 24, 2023
Merged

Add logos for Skosmos 3 #1562

merged 3 commits into from
Nov 24, 2023

Conversation

UnniKohonen
Copy link
Contributor

Reasons for creating this PR

Skosmos 3 is missing logos from all pages, this PR adds a logo to headerbar on landing page and to topbar on other pages.

Link to relevant issue(s), if any

  • Closes #

Description of the changes in this PR

  • Add .svg files for logos
  • Add logo to landing page
  • Add logo to other pages

Known problems or uncertainties in this PR

Headerbar (and thus logo) is visible on about and feedback pages, which should be fixed.

Checklist

  • phpUnit tests pass locally with my changes
  • I have added tests that show that the new code works, or tests are not relevant for this PR (e.g. only HTML/CSS changes)
  • The PR doesn't reduce accessibility of the front-end code (e.g. tab focus, scaling to different resolutions, use of .sr-only class, color contrast)
  • The PR doesn't introduce unintended code changes (e.g. empty lines or useless reindentation)

@UnniKohonen UnniKohonen added this to the 3.0 milestone Nov 23, 2023
Copy link

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

Copy link

codecov bot commented Nov 23, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (76d9ec5) 70.54% compared to head (52ee826) 70.54%.
Report is 1 commits behind head on skosmos-3.

Additional details and impacted files
@@             Coverage Diff              @@
##             skosmos-3    #1562   +/-   ##
============================================
  Coverage        70.54%   70.54%           
  Complexity        1644     1644           
============================================
  Files               32       32           
  Lines             4315     4315           
============================================
  Hits              3044     3044           
  Misses            1271     1271           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

{% if request.vocabid == '' and request.page != 'about' and request.page != 'feedback' %}
<span class="fs-6 py-3 text-light">Yhteishaku sanastoista v</span>
{% else %}
<a id="skosmos-logo-top" href="{{ request.lang }}/{% if request.contentLang and request.contentLang != request.lang %}?clang={{ request.contentLang }}{% endif %}{% if request.queryParam('anylang') == 'on' %}{% if request.contentLang == request.lang %}?{% else %}&{% endif %}anylang=on{% endif %}">
Copy link
Member

Choose a reason for hiding this comment

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

This is a terrible way of generating the link URL for the home page, but I see that it has been used in many other places as well (a few lines down in the same file) so I guess one more time doesn't hurt much.
However, I think a better mechanism should be developed. We already have the custom link_url filter, maybe it could be used instead, with some enhancements?

@osma
Copy link
Member

osma commented Nov 24, 2023

Looks good and gets the job done. I commented about the URL generation, but that is a more general problem, not specific to this PR. I'll merge this as it is.

@osma osma merged commit 4368496 into skosmos-3 Nov 24, 2023
12 checks passed
@osma osma deleted the add-skosmos-3-logo branch November 24, 2023 12:02
@osma osma modified the milestones: 3.x, 3.0 Jan 22, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done (verified in test.dev.finto.fi, set Milestone 3.0 for both issue & PR)
Development

Successfully merging this pull request may close these issues.

2 participants