Skip to content

Commit

Permalink
Merge pull request #1187 from rapidpro/logo-lang
Browse files Browse the repository at this point in the history 
Adjust logos
  • Loading branch information
@norkans7
norkans7 authored Feb 26, 2024
2 parents d51e19d + 6d3ff69 commit ba8b836
Show file tree
Hide file tree
Showing 11 changed files with 30 additions and 6 deletions.
Binary file removed static/img/logos/UREPORT/U-Report_Logo.png
View file
Binary file not shown.
Binary file added static/img/logos/UREPORT/U-Report_Logo_AR.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/img/logos/UREPORT/U-Report_Logo_EN.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/img/logos/UREPORT/U-Report_Logo_RU.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed static/img/logos/UREPORT/U-Report_Logo_invert.png
View file
Binary file not shown.
Binary file added static/img/logos/UREPORT/U-Report_Logo_invert_AR.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/img/logos/UREPORT/U-Report_Logo_invert_EN.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/img/logos/UREPORT/U-Report_Logo_invert_RU.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 10 additions & 2 deletions templates/base_admin_dashboard.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,11 @@
<div style="justify-content: start;" class="level-item square-logo">
<div style="width:360px">
{% if org|config:"has_new_brand" %}
<img src="{{ STATIC_URL }}/img/logos/UREPORT/U-Report_Logo.png" alt="{{ org.name }}" class="logo">
{% if org.language != "ar" and org.language != "ru" %}
<img src="{{ STATIC_URL }}/img/logos/UREPORT/U-Report_Logo_EN.png" alt="{{ org.name }}" class="logo">
{% else %}
<img src="{{ STATIC_URL }}/img/logos/UREPORT/U-Report_Logo_{{ org.language|upper }}.png" alt="{{ org.name }}" class="logo">
{% endif %}
{% else %}
{% thumbnail org.get_logo "x180" format="PNG" as im %}
<img src="{{ im.url }}" alt="{{ org.name }}" class="logo">
Expand Down Expand Up @@ -340,7 +344,11 @@
<a href="{% url 'public.index' %}" class="md:hidden flex-1 text-center mb-6 inline-flex">
<div style="width:180px">
{% if org|config:"has_new_brand" %}
<img src="{{ STATIC_URL }}/img/logos/UREPORT/U-Report_Logo.png" alt="{{ org.name }}" class="logo">
{% if org.language != "ar" and org.language != "ru" %}
<img src="{{ STATIC_URL }}/img/logos/UREPORT/U-Report_Logo_EN.png" alt="{{ org.name }}" class="logo">
{% else %}
<img src="{{ STATIC_URL }}/img/logos/UREPORT/U-Report_Logo_{{ org.language|upper }}.png" alt="{{ org.name }}" class="logo">
{% endif %}
{% else %}
{% thumbnail org.get_logo "x180" format="PNG" as im %}
<img src="{{ im.url }}" alt="{{ org.name }}" class="logo">
Expand Down
6 changes: 5 additions & 1 deletion templates/public/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,11 @@
<div class="inline-block mx-auto my-auto text-center">
<div class="w-64">
{% if org|config:"has_new_brand" %}
<img src="{{ STATIC_URL }}/img/logos/UREPORT/U-Report_Logo_invert.png" alt="{{ org.name }}" class="logo">
{% if org.language != "ar" and org.language != "ru" %}
<img src="{{ STATIC_URL }}/img/logos/UREPORT/U-Report_Logo_invert_EN.png" alt="{{ org.name }}" class="logo">
{% else %}
<img src="{{ STATIC_URL }}/img/logos/UREPORT/U-Report_Logo_invert_{{ org.language|upper }}.png" alt="{{ org.name }}" class="logo">
{% endif %}
{% else %}
<img src="{{ STATIC_URL }}img/u-report-global-logo-white.png" alt="">
{% endif %}
Expand Down
18 changes: 15 additions & 3 deletions templates/public_base.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,11 @@
<div class="p-4 ">
<a href="https://ureport.in/" class="hover:bg-gray-900 inline-block border-white p-2">
{% if org|config:"has_new_brand" %}
<img src="{{ STATIC_URL }}/img/logos/UREPORT/U-Report_Logo_invert.png" alt="{{ org.name }}" class="logo">
{% if org.language != "ar" and org.language != "ru" %}
<img src="{{ STATIC_URL }}/img/logos/UREPORT/U-Report_Logo_invert_EN.png" alt="{{ org.name }}" class="logo">
{% else %}
<img src="{{ STATIC_URL }}/img/logos/UREPORT/U-Report_Logo_invert_{{ org.language|upper }}.png" alt="{{ org.name }}" class="logo">
{% endif %}
{% else %}
<img src="{{ STATIC_URL }}img/u-report-global-logo-white.png" alt="">
{% endif %}
Expand Down Expand Up @@ -643,7 +647,11 @@
<div class="md:flex max-w-page mx-auto justify-around mt-5 mb-12 hidden border-b pb-6">
<a href="{% url 'public.index' %}" class="flex-initial text-center">
<div style="width:500px">
<img src="{{ STATIC_URL }}/img/logos/UREPORT/U-Report_Logo.png" alt="{{ org.name }}" class="logo">
{% if org.language != "ar" and org.language != "ru" %}
<img src="{{ STATIC_URL }}/img/logos/UREPORT/U-Report_Logo_EN.png" alt="{{ org.name }}" class="logo">
{% else %}
<img src="{{ STATIC_URL }}/img/logos/UREPORT/U-Report_Logo_{{ org.language|upper }}.png" alt="{{ org.name }}" class="logo">
{% endif %}
</div>
</a>
<div class="flex-1 font-bold text-2xl mt-16" style="font-family:'Noto Sans', sans-serif;">
Expand Down Expand Up @@ -705,7 +713,11 @@
<a href="{% url 'public.index' %}" class="flex-initial text-center">
<div style="width:180px">
{% if org|config:"has_new_brand" %}
<img src="{{ STATIC_URL }}/img/logos/UREPORT/U-Report_Logo.png" alt="{{ org.name }}" class="logo">
{% if org.language != "ar" and org.language != "ru" %}
<img src="{{ STATIC_URL }}/img/logos/UREPORT/U-Report_Logo_EN.png" alt="{{ org.name }}" class="logo">
{% else %}
<img src="{{ STATIC_URL }}/img/logos/UREPORT/U-Report_Logo_{{ org.language|upper }}.png" alt="{{ org.name }}" class="logo">
{% endif %}
{% else %}
{% thumbnail org.get_logo "x180" format="PNG" as im %}
<img src="{{ im.url }}" alt="{{ org.name }}" class="logo" alt="">
Expand Down

0 comments on commit ba8b836

Please sign in to comment.