Skip to content

Commit

Permalink
Merge pull request #184 from Ilhasoft/update/1.2.94.3
Browse files Browse the repository at this point in the history 
Removing slash from .html files
  • Loading branch information
@elitonzky
elitonzky authored Feb 8, 2024
2 parents 5ad2664 + daac2b3 commit 5a4bc5c
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 20 deletions.
14 changes: 7 additions & 7 deletions templates/base_admin_dashboard.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
<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">
<img src="{{ STATIC_URL }}img/logos/UREPORT/U-Report_Logo.png" alt="{{ org.name }}" class="logo">
{% else %}
{% thumbnail org.get_logo "x180" format="PNG" as im %}
<img src="{{ im.url }}" alt="{{ org.name }}" class="logo">
Expand Down Expand Up @@ -316,7 +316,7 @@
<a href="{% url 'public.index' %}" class="md:block flex-1 text-center mb-2 hidden">
{% if org|config:"has_new_brand" %}
<div style="max-width:220px">
<img src="{{ STATIC_URL }}/img/logos/UREPORT/U-Report_Logo_footer.png" alt="{{ org.name }}" class="logo">
<img src="{{ STATIC_URL }}img/logos/UREPORT/U-Report_Logo_footer.png" alt="{{ org.name }}" class="logo">
</div>
{% else %}
<div style="max-width:360px">
Expand All @@ -329,9 +329,9 @@
<div class="md:flex justify-center hidden">
<div style="max-width:150px" class="md:block block">
{% if org.language != "ar" and org.language != "ru" and org.language != "ch" and org.language != "fr" %}
<img src="{{ STATIC_URL }}/img/logos/UNICEF/UNICEF_logo_footer_EN.png" class="md:-ml-0 -ml-2" alt="">
<img src="{{ STATIC_URL }}img/logos/UNICEF/UNICEF_logo_footer_EN.png" class="md:-ml-0 -ml-2" alt="">
{% else %}
<img src="{{ STATIC_URL }}/img/logos/UNICEF/UNICEF_logo_footer_{{ org.language|upper }}.png"
<img src="{{ STATIC_URL }}img/logos/UNICEF/UNICEF_logo_footer_{{ org.language|upper }}.png"
class="md:-ml-0 -ml-2"
alt="">
{% endif %}
Expand All @@ -340,7 +340,7 @@
<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">
<img src="{{ STATIC_URL }}img/logos/UREPORT/U-Report_Logo.png" alt="{{ org.name }}" class="logo">
{% else %}
{% thumbnail org.get_logo "x180" format="PNG" as im %}
<img src="{{ im.url }}" alt="{{ org.name }}" class="logo">
Expand All @@ -350,11 +350,11 @@
<div class="md:hidden flex flex-1 justify-end float-right">
<div style="width:120px" class="md:block block">
{% if org.language != "ar" and org.language != "ru" and org.language != "ch" and org.language != "fr" %}
<img src="{{ STATIC_URL }}/img/logos/UNICEF/UNICEF_logo_footer_EN.png"
<img src="{{ STATIC_URL }}img/logos/UNICEF/UNICEF_logo_footer_EN.png"
class="md:-ml-0 -ml-2"
alt="UNICEF logo">
{% else %}
<img src="{{ STATIC_URL }}/img/logos/UNICEF/UNICEF_logo_footer_{{ org.language|upper }}.png"
<img src="{{ STATIC_URL }}img/logos/UNICEF/UNICEF_logo_footer_{{ org.language|upper }}.png"
class="md:-ml-0 -ml-2"
alt="UNICEF logo">
{% endif %}
Expand Down
2 changes: 1 addition & 1 deletion templates/public/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@
<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">
<img src="{{ STATIC_URL }}img/logos/UREPORT/U-Report_Logo_invert.png" alt="{{ org.name }}" class="logo">
{% else %}
<img src="{{ STATIC_URL }}img/u-report-global-logo-white.png" alt="">
{% endif %}
Expand Down
18 changes: 9 additions & 9 deletions templates/public_base.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,7 @@
<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">
<img src="{{ STATIC_URL }}img/logos/UREPORT/U-Report_Logo_invert.png" alt="{{ org.name }}" class="logo">
{% else %}
<img src="{{ STATIC_URL }}img/u-report-global-logo-white.png" alt="">
{% endif %}
Expand Down Expand Up @@ -641,7 +641,7 @@
<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">
<img src="{{ STATIC_URL }}img/logos/UREPORT/U-Report_Logo.png" alt="{{ org.name }}" class="logo">
</div>
</a>
<div class="flex-1 font-bold text-2xl mt-16" style="font-family:'Noto Sans', sans-serif;">
Expand Down Expand Up @@ -703,7 +703,7 @@
<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">
<img src="{{ STATIC_URL }}img/logos/UREPORT/U-Report_Logo.png" alt="{{ org.name }}" class="logo">
{% else %}
{% thumbnail org.get_logo "x180" format="PNG" as im %}
<img src="{{ im.url }}" alt="{{ org.name }}" class="logo" alt="">
Expand Down Expand Up @@ -803,7 +803,7 @@
<a href="{% url 'public.index' %}" class="md:block flex-1 text-center mb-2 hidden">
{% if org|config:"has_new_brand" %}
<div style="max-width:220px">
<img src="{{ STATIC_URL }}/img/logos/UREPORT/U-Report_Logo_footer.png" alt="{{ org.name }}" class="logo">
<img src="{{ STATIC_URL }}img/logos/UREPORT/U-Report_Logo_footer.png" alt="{{ org.name }}" class="logo">
</div>
{% else %}
<div style="max-width:360px">
Expand All @@ -816,9 +816,9 @@
<div class="md:flex justify-center hidden">
<div style="max-width:150px" class="md:block block">
{% if org.language != "ar" and org.language != "ru" and org.language != "ch" and org.language != "fr" %}
<img src="{{ STATIC_URL }}/img/logos/UNICEF/UNICEF_logo_footer_EN.png" class="md:-ml-0 -ml-2" alt="">
<img src="{{ STATIC_URL }}img/logos/UNICEF/UNICEF_logo_footer_EN.png" class="md:-ml-0 -ml-2" alt="">
{% else %}
<img src="{{ STATIC_URL }}/img/logos/UNICEF/UNICEF_logo_footer_{{ org.language|upper }}.png"
<img src="{{ STATIC_URL }}img/logos/UNICEF/UNICEF_logo_footer_{{ org.language|upper }}.png"
class="md:-ml-0 -ml-2"
alt="">
{% endif %}
Expand All @@ -827,7 +827,7 @@
<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_footer.png" alt="{{ org.name }}" class="logo">
<img src="{{ STATIC_URL }}img/logos/UREPORT/U-Report_Logo_footer.png" alt="{{ org.name }}" class="logo">
{% else %}
{% thumbnail org.get_logo "x180" format="PNG" as im %}
<img src="{{ im.url }}" alt="{{ org.name }}" class="logo">
Expand All @@ -837,11 +837,11 @@
<div class="md:hidden flex flex-1 justify-end float-right">
<div style="width:120px" class="md:block block">
{% if org.language != "ar" and org.language != "ru" and org.language != "ch" and org.language != "fr" %}
<img src="{{ STATIC_URL }}/img/logos/UNICEF/UNICEF_logo_footer_EN.png"
<img src="{{ STATIC_URL }}img/logos/UNICEF/UNICEF_logo_footer_EN.png"
class="md:-ml-0 -ml-2"
alt="UNICEF logo">
{% else %}
<img src="{{ STATIC_URL }}/img/logos/UNICEF/UNICEF_logo_footer_{{ org.language|upper }}.png"
<img src="{{ STATIC_URL }}img/logos/UNICEF/UNICEF_logo_footer_{{ org.language|upper }}.png"
class="md:-ml-0 -ml-2"
alt="UNICEF logo">
{% endif %}
Expand Down
3 changes: 0 additions & 3 deletions ureport/settings.py.prod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ DEBUG = config('DEBUG', default=False, cast=bool)
THUMBNAIL_DEBUG = DEBUG
TEMPLATE_DEBUG = DEBUG

STATIC_URL = "/sitestatic"
COMPRESS_URL = "/sitestatic"
ADMIN_MEDIA_PREFIX = "/sitestatic/admin"

EMPTY_SUBDOMAIN_HOST = config('EMPTY_SUBDOMAIN_HOST', 'https://ureport.in')
HOSTNAME = config('APP_HOSTNAME', 'ureport.in')
Expand Down

0 comments on commit 5a4bc5c

Please sign in to comment.