Skip to content

Remove old branding #1332

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.

Sign up for GitHub

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

Merged
norkans7 merged 3 commits into from
Jan 19, 2026
Merged

Remove old branding #1332

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c3e36b5
Remove has_new_brand config flag use, and make the new branding the d…
norkans7 Jan 15, 2026
8842d1a
Remove color config, and keep the default branding colors set
norkans7 Jan 15, 2026
ff8c569
Cleanup the question color choices, no longer used
norkans7 Jan 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 22 additions & 50 deletions templates/base_admin_dashboard.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@
display: block;
padding-left: 5px;

color: {{ org|config:'dark1_color'|default:'#439932' }};
color: #98DFF9;

border-left: 5px solid {{ org|config:'dark1_color'|default:'#439932' }};
border-left: 5px solid #98DFF9;
}

.row1 a:hover,
.row2 a:hover {
background-color: #E6E7E8;

color: {{ org|config:'dark1_color'|default:'#439932' }};
color: #98DFF9;
}

.row1.inactive a,
Expand Down Expand Up @@ -88,24 +88,16 @@
<div class="level-left">
<div style="justify-content: start;" class="level-item square-logo">
<div style="width:360px">
{% if org|config:"has_new_brand" %}
{% if org.subdomain == "drc" %}
<img src="{{ STATIC_URL }}img/logos/UREPORT/U-Report_LOGO_DRC.png" alt="{{ org.name }}" class="logo">
{% elif org.language != "ar" and org.language != "ru" %}
{% if org.subdomain == "drc" %}
<img src="{{ STATIC_URL }}img/logos/UREPORT/U-Report_LOGO_DRC.png" alt="{{ org.name }}" class="logo">
{% elif 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">
{% endthumbnail %}
<img src="{{ STATIC_URL }}img/logos/UREPORT/U-Report_Logo_{{ org.language|upper }}.png" alt="{{ org.name }}" class="logo">
{% endif %}
</div>
{% if org|config:"has_new_brand" %}
<div class="flex-1 text-center font-bold flex-center-y mx-4 mt-4"
style="font-family:'Noto Sans', sans-serif">{{ org.name }}</div>
{% endif %}
<div class="flex-1 text-center font-bold flex-center-y mx-4 mt-4"
style="font-family:'Noto Sans', sans-serif">{{ org.name }}</div>
</div>
</div>
{% endif %}
Expand All @@ -131,18 +123,12 @@
<div class="level-right">
<div style="justify-content: start; margin-right: 0rem" class="level-item square-logo">
<div style="width:360px">
{% if org|config:"has_new_brand" %}
{% if org.subdomain == "drc" %}
<img src="{{ STATIC_URL }}img/logos/UREPORT/U-Report_LOGO_DRC.png" alt="{{ org.name }}" class="logo">
{% elif org.language != "ar" and org.language != "ru" %}
{% if org.subdomain == "drc" %}
<img src="{{ STATIC_URL }}img/logos/UREPORT/U-Report_LOGO_DRC.png" alt="{{ org.name }}" class="logo">
{% elif 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">
{% endthumbnail %}
<img src="{{ STATIC_URL }}img/logos/UREPORT/U-Report_Logo_{{ org.language|upper }}.png" alt="{{ org.name }}" class="logo">
{% endif %}
</div>
</div>
Expand Down Expand Up @@ -333,17 +319,9 @@
<!-- footer navbar -->
<div class="md:grid md:grid-cols-3 grid grid-cols-1 gap-4 px-home mt-12 mb-3">
<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">
</div>
{% else %}
<div style="max-width:360px">
{% thumbnail org.get_logo "x180" format="PNG" as im %}
<img src="{{ im.url }}" alt="{{ org.name }}" class="logo">
{% endthumbnail %}
</div>
{% endif %}
<div style="max-width:220px">
<img src="{{ STATIC_URL }}img/logos/UREPORT/U-Report_Logo_footer.png" alt="{{ org.name }}" class="logo">
</div>
</a>
<div class="md:flex justify-center hidden">
<div style="max-width:150px" class="md:block block">
Expand All @@ -358,18 +336,12 @@
</div>
<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" %}
{% if org.subdomain == "drc" %}
<img src="{{ STATIC_URL }}img/logos/UREPORT/U-Report_LOGO_DRC.png" alt="{{ org.name }}" class="logo">
{% elif 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 %}
{% if org.subdomain == "drc" %}
<img src="{{ STATIC_URL }}img/logos/UREPORT/U-Report_LOGO_DRC.png" alt="{{ org.name }}" class="logo">
{% elif 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 %}
{% thumbnail org.get_logo "x180" format="PNG" as im %}
<img src="{{ im.url }}" alt="{{ org.name }}" class="logo">
{% endthumbnail %}
<img src="{{ STATIC_URL }}img/logos/UREPORT/U-Report_Logo_{{ org.language|upper }}.png" alt="{{ org.name }}" class="logo">
{% endif %}
</div>
<div class="md:hidden flex flex-1 justify-end float-right">
Expand Down Expand Up @@ -440,7 +412,7 @@
{% if request.user and request.user.is_authenticated %}
<form method="post" action="{% url 'users.user_logout' %}?go=/">
{% csrf_token %}
<button type="submit" class="{% if is_rtl_org %}mr-4{% else %}ml-4{% endif %} hover:text-gray-750 flex-initial py-menu font-bold">{% trans "Logout" %}</i></button>
<button type="submit" class="{% if is_rtl_org %}mr-4{% else %}ml-4{% endif %} hover:text-gray-750 flex-initial py-menu font-bold">{% trans "Logout" %}</button>
</form>
{% else %}
<a href="{% org_host_link %}{% url 'users.user_login' %}"
Expand Down
15 changes: 4 additions & 11 deletions templates/frame.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,10 @@
<![endif]-->
<!-- Mobile viewport optimized: j.mp/bplateviewport -->
<meta name="viewport" content="width=device-width, initial-scale=1.0">
{% if org|config:"has_new_brand" %}
<link rel="icon"
type="image/x-icon"
href="{{ STATIC_URL }}img/favicon-v2024.png">
{% elif org.subdomain %}
<link rel="icon"
type="image/x-icon"
href="{{ STATIC_URL }}img/favicos/flag_{{ org.subdomain }}.png">
{% else %}
<link rel="icon" type="image/x-icon" href="{{ STATIC_URL }}img/favicon.png">
{% endif %}
<!-- Favicon -->
Copy link

Copilot AI Jan 15, 2026

Choose a reason for hiding this comment

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

While adding a comment for the favicon is good practice, this formatting change adds extra lines where the original code was more compact. Consider maintaining consistency with the rest of the codebase's formatting style.

Copilot uses AI. Check for mistakes.
<link rel="icon"
type="image/x-icon"
href="{{ STATIC_URL }}img/favicon-v2024.png">
<link href="https://fonts.googleapis.com/css2?family=Livvic:wght@300;400;700&family=Noto+Sans:wght@400;700&family=Roboto+Condensed:wght@500&family=Roboto:wght@500&display=swap" rel="stylesheet">
<link rel="stylesheet" href="{{ STATIC_URL }}css/leaflet.css">
<link type="text/css"
Expand Down
34 changes: 13 additions & 21 deletions templates/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<!-- latest poll if we have it -->
{% if latest_poll and latest_poll.get_first_question %}
<div class="max-w-page mx-auto bg-white mt-6">
<div class="md:flex {% if is_rtl_org %}md:-mr-12 vertical-angle-right-side md:pr-12{% else %}vertical-angle-left-side md:pl-12 md:-ml-12{% endif %} {% if org|config:"has_new_brand" %} bg-dark1-v2024 text-white {% else %} {% if latest_poll.get_first_question.get_color_choice_css %} {{ latest_poll.get_first_question.get_color_choice_css }} {% else %}bg-dark1-v2024 text-white{% endif %}{% endif %}">
<div class="{% if org|config:"has_new_brand" %} bg-dark1-v2024 text-white {% else %} {% if latest_poll.get_first_question.get_color_choice_css %} {{ latest_poll.get_first_question.get_color_choice_css }} {% else %}bg-dark1-v2024 text-white{% endif %} {% endif %} flex-1 self-stretch p-home self-center">
<div class="md:flex {% if is_rtl_org %}md:-mr-12 vertical-angle-right-side md:pr-12{% else %}vertical-angle-left-side md:pl-12 md:-ml-12{% endif %} bg-dark1-v2024 text-white ">
<div class="bg-dark1-v2024 text-white flex-1 self-stretch p-home self-center">
<div class="text-l mb-10">{% trans "LATEST OPINION" %}</div>
<div class="{% if latest_poll.title|length < 50 %}text-4xl{% elif latest_poll.title|length < 120 %}text-3xl leading-tight{% else %}text-2xl leading-tight{% endif %} font-bold mt-2 hover-parent">
{% edit_content 'polls.poll_update' latest_poll.pk "#id_title" "-m-8" "dark" %}
Expand All @@ -30,20 +30,20 @@
<div style="min-height:20rem;" class="relative w-full">
<div data-question="{{ latest_poll.get_first_question.id }}"
data-segment="all"
data-bar-color="{% if org|config:"has_new_brand" %}#00aeef{% else %}{% if latest_poll.get_first_question.get_bg_color_choice %} {{ latest_poll.get_first_question.get_bg_color_choice }} {% else %}{{ org|config:'dark1_color'|default:'#439932' }}{% endif %}{% endif %}"
data-bar-color="#00aeef"
class="w-full h-full absolute poll-chart block"
id="chart-{{ latest_poll.get_first_question.id }}"></div>
</div>
<div class="md:mb-0 mb-6 text-center">
<a href="{% url 'public.opinion_read' latest_poll.pk %}"
class="btn hover-dark {% if org|config:"has_new_brand" %}hover:bg-gray-700 bg-black text-white{% else %}bg-light1-v2024 text-black{% endif %}">{% trans "VIEW FULL RESULTS" %}</a>
class="btn hover-dark hover:bg-gray-700 bg-black text-white">{% trans "VIEW FULL RESULTS" %}</a>
</div>
</div>
</div>
</div>
{% endif %}
<!-- ureporters graph -->
<div class="bg-black text-light1-v2024 {% if not org|config:"has_new_brand" %}bg-white-u{% endif %}">
<div class="bg-black text-light1-v2024">
<div class="md:flex max-w-page mx-auto p-home">
<div class="md:w-1/2 md:mt-0 md:p-0 flex-center-y mt-4 p-8">
<div class="font-bold text-l">
Expand Down Expand Up @@ -74,7 +74,7 @@
{{ age_stats|json_script:"age_stats" }}
<div data-aos="fade"
data-graph-type="age-chart"
data-bar-color="{% if org|config:"has_new_brand" %}#00aeef{% else %}{{ org|config:'light1_color'|default:'#FFD100' }}{% endif %}"
data-bar-color="#00aeef"
data-label-color="#FFF"
data-label-position="top"
data-stats="age_stats"
Expand Down Expand Up @@ -177,14 +177,10 @@
<div style="min-height:349px" class="flex justify-content">
<div class="inline-block mx-auto my-auto text-center">
<div class="w-64">
{% if org|config:"has_new_brand" %}
{% 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 %}
{% 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/u-report-global-logo-white.png" alt="">
<img src="{{ STATIC_URL }}img/logos/UREPORT/U-Report_Logo_invert_{{ org.language|upper }}.png" alt="{{ org.name }}" class="logo">
{% endif %}
</div>
</div>
Expand Down Expand Up @@ -261,13 +257,13 @@
<div class="flex">
<div class="flex-1 h-10"></div>
<div class="flex-1 bg-dark1-v2024">
<div class="rtl:mr-20 rtl:ml-10 ltr:ml-20 ltr:mr-10 {% if org|config:"has_new_brand" %} bg-black {% else %}bg-dark2-v2024{% endif %} h-10">&nbsp;</div>
<div class="rtl:mr-20 rtl:ml-10 ltr:ml-20 ltr:mr-10 bg-black h-10">&nbsp;</div>
</div>
</div>
<div>
{% for story in main_stories|slice:"1" %}
<div class="{% if is_rtl_org %}border-l-25rem{% else %}border-r-25rem{% endif %} border-solid border-dark1-v2024">
<div class="{% if is_rtl_org %}border-l-25rem{% else %}border-r-25rem{% endif %} border-solid {% if org|config:"has_new_brand" %} border-black {% else %}border-light1-v2024{% endif %} flex">
<div class="{% if is_rtl_org %}border-l-25rem{% else %}border-r-25rem{% endif %} border-solid border-black flex">
<div class="w-1/3 rtl:pr-10 ltr:pl-10 pl-10 flex flex-col justify-center">
<div class="block">
<div class="font-bold mb-4">{% trans "FEATURED STORY" %}</div>
Expand Down Expand Up @@ -299,7 +295,7 @@
<div class="flex">
<div class="flex-1 h-10"></div>
<div class="flex-1 bg-dark1-v2024">
<div class="rtl:mr-20 rtl:ml-10 ltr:ml-20 ltr:mr-10 {% if org|config:"has_new_brand" %} bg-black {% else %}bg-dark2-v2024{% endif %} h-10"></div>
<div class="rtl:mr-20 rtl:ml-10 ltr:ml-20 ltr:mr-10 bg-black h-10"></div>
</div>
</div>
<div class="flex">
Expand Down Expand Up @@ -332,11 +328,7 @@
<div class="bg-black text-white">
<div class="md:flex rtl:pl-10 ltr:pr-10 max-w-page mx-auto bg-black p-home">
<div class="md:w-3/5 flex flex-center-y my-4">
{% if org|config:"has_new_brand" %}
<img src="{{ STATIC_URL }}img/homemap_bg-v2024.png" alt="">
{% else %}
<img src="{{ STATIC_URL }}img/homemap_bg.png" alt="">
{% endif %}
<img src="{{ STATIC_URL }}img/homemap_bg-v2024.png" alt="">
</div>
<div class="md:w-2/5 flex flex-center-y">
<div class="rtl:pr-10 ltr:pl-10">
Expand Down
6 changes: 3 additions & 3 deletions templates/public/join_engage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<div class="md:md:w-1/2 flex-1">
<div class="text-3xl font-bold flex border-b border-black pb-4 mb-4">
<div class="flex-none flex-center-y">
<div class="bg-circle {% if org|config:"has_new_brand" %}bg-white text-black {% else %} bg-black text-white {% endif %}">1</div>
<div class="bg-circle bg-white text-black">1</div>
</div>
<div class="pl-4 pr-12 flex-center-y">{% trans "How would you like to join?" %}</div>
</div>
Expand Down Expand Up @@ -138,12 +138,12 @@
</div>
</div>
{% for join_step in join_steps %}
<div class="{% if org|config:"has_new_brand" %}{% cycle 'bg-black text-white' 'bg-dark1-v2024 text-black' %}{% else %}{% cycle 'bg-dark1 text-white' 'bg-dark2 text-white' 'bg-dark3 text-white' 'bg-light1 text-black' %}{% endif %} py-12">
<div class="{% cycle 'bg-black text-white' 'bg-dark1-v2024 text-black' %} py-12">
<div class="md:flex max-w-page mx-auto p-home" id="{% if forloop.first %}text{% endif %}">
<div class="flex-1">
<div class="{% cycle 'border-white' 'border-white' 'border-white' 'border-black' %} text-3xl font-bold flex border-b pb-4 mb-4">
<div class="flex-none flex-center-y">
<div class="bg-circle {% if org|config:"has_new_brand" %}{% cycle 'bg-dark1-v2024 text-white' 'bg-white text-black' %}{% else %} bg-black text-white {% endif %} ">{{ forloop.counter|add:1 }}</div>
<div class="bg-circle {% cycle 'bg-dark1-v2024 text-white' 'bg-white text-black' %} ">{{ forloop.counter|add:1 }}</div>
</div>
<div class="pl-4 pr-12 flex-center-y hover-parent">
{% if forloop.counter|divisibleby:'4' %}
Expand Down
Loading
Loading