Skip to content

Commit 7c54872

Browse files
norkans7norkans7
authored
Merge pull request #1332 from rapidpro/remove-old-branding
Remove old branding
2 parents 49fba87 + ff8c569 commit 7c54872

File tree

15 files changed

+118
-403
lines changed

15 files changed

+118
-403
lines changed

‎templates/base_admin_dashboard.html‎

Lines changed: 22 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@
2828
display: block;
2929
padding-left: 5px;
3030

31-
color: {{ org|config:'dark1_color'|default:'#439932' }};
31+
color: #98DFF9;
3232

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

3636
.row1 a:hover,
3737
.row2 a:hover {
3838
background-color: #E6E7E8;
3939

40-
color: {{ org|config:'dark1_color'|default:'#439932' }};
40+
color: #98DFF9;
4141
}
4242

4343
.row1.inactive a,
@@ -88,24 +88,16 @@
8888
<div class="level-left">
8989
<div style="justify-content: start;" class="level-item square-logo">
9090
<div style="width:360px">
91-
{% if org|config:"has_new_brand" %}
92-
{% if org.subdomain == "drc" %}
93-
<img src="{{ STATIC_URL }}img/logos/UREPORT/U-Report_LOGO_DRC.png" alt="{{ org.name }}" class="logo">
94-
{% elif org.language != "ar" and org.language != "ru" %}
91+
{% if org.subdomain == "drc" %}
92+
<img src="{{ STATIC_URL }}img/logos/UREPORT/U-Report_LOGO_DRC.png" alt="{{ org.name }}" class="logo">
93+
{% elif org.language != "ar" and org.language != "ru" %}
9594
<img src="{{ STATIC_URL }}img/logos/UREPORT/U-Report_Logo_EN.png" alt="{{ org.name }}" class="logo">
96-
{% else %}
97-
<img src="{{ STATIC_URL }}img/logos/UREPORT/U-Report_Logo_{{ org.language|upper }}.png" alt="{{ org.name }}" class="logo">
98-
{% endif %}
9995
{% else %}
100-
{% thumbnail org.get_logo "x180" format="PNG" as im %}
101-
<img src="{{ im.url }}" alt="{{ org.name }}" class="logo">
102-
{% endthumbnail %}
96+
<img src="{{ STATIC_URL }}img/logos/UREPORT/U-Report_Logo_{{ org.language|upper }}.png" alt="{{ org.name }}" class="logo">
10397
{% endif %}
10498
</div>
105-
{% if org|config:"has_new_brand" %}
106-
<div class="flex-1 text-center font-bold flex-center-y mx-4 mt-4"
107-
style="font-family:'Noto Sans', sans-serif">{{ org.name }}</div>
108-
{% endif %}
99+
<div class="flex-1 text-center font-bold flex-center-y mx-4 mt-4"
100+
style="font-family:'Noto Sans', sans-serif">{{ org.name }}</div>
109101
</div>
110102
</div>
111103
{% endif %}
@@ -131,18 +123,12 @@
131123
<div class="level-right">
132124
<div style="justify-content: start; margin-right: 0rem" class="level-item square-logo">
133125
<div style="width:360px">
134-
{% if org|config:"has_new_brand" %}
135-
{% if org.subdomain == "drc" %}
136-
<img src="{{ STATIC_URL }}img/logos/UREPORT/U-Report_LOGO_DRC.png" alt="{{ org.name }}" class="logo">
137-
{% elif org.language != "ar" and org.language != "ru" %}
126+
{% if org.subdomain == "drc" %}
127+
<img src="{{ STATIC_URL }}img/logos/UREPORT/U-Report_LOGO_DRC.png" alt="{{ org.name }}" class="logo">
128+
{% elif org.language != "ar" and org.language != "ru" %}
138129
<img src="{{ STATIC_URL }}img/logos/UREPORT/U-Report_Logo_EN.png" alt="{{ org.name }}" class="logo">
139-
{% else %}
140-
<img src="{{ STATIC_URL }}img/logos/UREPORT/U-Report_Logo_{{ org.language|upper }}.png" alt="{{ org.name }}" class="logo">
141-
{% endif %}
142130
{% else %}
143-
{% thumbnail org.get_logo "x180" format="PNG" as im %}
144-
<img src="{{ im.url }}" alt="{{ org.name }}" class="logo">
145-
{% endthumbnail %}
131+
<img src="{{ STATIC_URL }}img/logos/UREPORT/U-Report_Logo_{{ org.language|upper }}.png" alt="{{ org.name }}" class="logo">
146132
{% endif %}
147133
</div>
148134
</div>
@@ -333,17 +319,9 @@
333319
<!-- footer navbar -->
334320
<div class="md:grid md:grid-cols-3 grid grid-cols-1 gap-4 px-home mt-12 mb-3">
335321
<a href="{% url 'public.index' %}" class="md:block flex-1 text-center mb-2 hidden">
336-
{% if org|config:"has_new_brand" %}
337-
<div style="max-width:220px">
338-
<img src="{{ STATIC_URL }}img/logos/UREPORT/U-Report_Logo_footer.png" alt="{{ org.name }}" class="logo">
339-
</div>
340-
{% else %}
341-
<div style="max-width:360px">
342-
{% thumbnail org.get_logo "x180" format="PNG" as im %}
343-
<img src="{{ im.url }}" alt="{{ org.name }}" class="logo">
344-
{% endthumbnail %}
345-
</div>
346-
{% endif %}
322+
<div style="max-width:220px">
323+
<img src="{{ STATIC_URL }}img/logos/UREPORT/U-Report_Logo_footer.png" alt="{{ org.name }}" class="logo">
324+
</div>
347325
</a>
348326
<div class="md:flex justify-center hidden">
349327
<div style="max-width:150px" class="md:block block">
@@ -358,18 +336,12 @@
358336
</div>
359337
<a href="{% url 'public.index' %}" class="md:hidden flex-1 text-center mb-6 inline-flex">
360338
<div style="width:180px">
361-
{% if org|config:"has_new_brand" %}
362-
{% if org.subdomain == "drc" %}
363-
<img src="{{ STATIC_URL }}img/logos/UREPORT/U-Report_LOGO_DRC.png" alt="{{ org.name }}" class="logo">
364-
{% elif org.language != "ar" and org.language != "ru" %}
365-
<img src="{{ STATIC_URL }}img/logos/UREPORT/U-Report_Logo_EN.png" alt="{{ org.name }}" class="logo">
366-
{% else %}
367-
<img src="{{ STATIC_URL }}img/logos/UREPORT/U-Report_Logo_{{ org.language|upper }}.png" alt="{{ org.name }}" class="logo">
368-
{% endif %}
339+
{% if org.subdomain == "drc" %}
340+
<img src="{{ STATIC_URL }}img/logos/UREPORT/U-Report_LOGO_DRC.png" alt="{{ org.name }}" class="logo">
341+
{% elif org.language != "ar" and org.language != "ru" %}
342+
<img src="{{ STATIC_URL }}img/logos/UREPORT/U-Report_Logo_EN.png" alt="{{ org.name }}" class="logo">
369343
{% else %}
370-
{% thumbnail org.get_logo "x180" format="PNG" as im %}
371-
<img src="{{ im.url }}" alt="{{ org.name }}" class="logo">
372-
{% endthumbnail %}
344+
<img src="{{ STATIC_URL }}img/logos/UREPORT/U-Report_Logo_{{ org.language|upper }}.png" alt="{{ org.name }}" class="logo">
373345
{% endif %}
374346
</div>
375347
<div class="md:hidden flex flex-1 justify-end float-right">
@@ -440,7 +412,7 @@
440412
{% if request.user and request.user.is_authenticated %}
441413
<form method="post" action="{% url 'users.user_logout' %}?go=/">
442414
{% csrf_token %}
443-
<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>
415+
<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>
444416
</form>
445417
{% else %}
446418
<a href="{% org_host_link %}{% url 'users.user_login' %}"

‎templates/frame.html‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,10 @@
2020
<![endif]-->
2121
<!-- Mobile viewport optimized: j.mp/bplateviewport -->
2222
<meta name="viewport" content="width=device-width, initial-scale=1.0">
23-
{% if org|config:"has_new_brand" %}
24-
<link rel="icon"
25-
type="image/x-icon"
26-
href="{{ STATIC_URL }}img/favicon-v2024.png">
27-
{% elif org.subdomain %}
28-
<link rel="icon"
29-
type="image/x-icon"
30-
href="{{ STATIC_URL }}img/favicos/flag_{{ org.subdomain }}.png">
31-
{% else %}
32-
<link rel="icon" type="image/x-icon" href="{{ STATIC_URL }}img/favicon.png">
33-
{% endif %}
23+
<!-- Favicon -->
24+
<link rel="icon"
25+
type="image/x-icon"
26+
href="{{ STATIC_URL }}img/favicon-v2024.png">
3427
<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">
3528
<link rel="stylesheet" href="{{ STATIC_URL }}css/leaflet.css">
3629
<link type="text/css"

‎templates/public/index.html‎

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
<!-- latest poll if we have it -->
66
{% if latest_poll and latest_poll.get_first_question %}
77
<div class="max-w-page mx-auto bg-white mt-6">
8-
<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 %}">
9-
<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">
8+
<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 ">
9+
<div class="bg-dark1-v2024 text-white flex-1 self-stretch p-home self-center">
1010
<div class="text-l mb-10">{% trans "LATEST OPINION" %}</div>
1111
<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">
1212
{% edit_content 'polls.poll_update' latest_poll.pk "#id_title" "-m-8" "dark" %}
1313
{{ latest_poll.title }}
1414
</div>
15-
<div class="{% if latest_poll.get_first_question.get_border_color_choice %} border-{{ latest_poll.get_first_question.get_border_color_choice }} {% else %}border-{{ border_color }}{% endif %} font-alt font-bold italic left-border mt-8 hover-parent">
15+
<div class="border-{{ border_color }} font-alt font-bold italic left-border mt-8 hover-parent">
1616
{% edit_content 'polls.poll_questions' latest_poll.pk "#id_ruleset_"|add:latest_poll.get_first_question.flow_result.result_uuid|add:"_title" "-m-8" "dark" %}
1717
{{ latest_poll.get_first_question.title }}
1818
</div>
@@ -30,20 +30,20 @@
3030
<div style="min-height:20rem;" class="relative w-full">
3131
<div data-question="{{ latest_poll.get_first_question.id }}"
3232
data-segment="all"
33-
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 %}"
33+
data-bar-color="#00aeef"
3434
class="w-full h-full absolute poll-chart block"
3535
id="chart-{{ latest_poll.get_first_question.id }}"></div>
3636
</div>
3737
<div class="md:mb-0 mb-6 text-center">
3838
<a href="{% url 'public.opinion_read' latest_poll.pk %}"
39-
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>
39+
class="btn hover-dark hover:bg-gray-700 bg-black text-white">{% trans "VIEW FULL RESULTS" %}</a>
4040
</div>
4141
</div>
4242
</div>
4343
</div>
4444
{% endif %}
4545
<!-- ureporters graph -->
46-
<div class="bg-black text-light1-v2024 {% if not org|config:"has_new_brand" %}bg-white-u{% endif %}">
46+
<div class="bg-black text-light1-v2024">
4747
<div class="md:flex max-w-page mx-auto p-home">
4848
<div class="md:w-1/2 md:mt-0 md:p-0 flex-center-y mt-4 p-8">
4949
<div class="font-bold text-l">
@@ -74,7 +74,7 @@
7474
{{ age_stats|json_script:"age_stats" }}
7575
<div data-aos="fade"
7676
data-graph-type="age-chart"
77-
data-bar-color="{% if org|config:"has_new_brand" %}#00aeef{% else %}{{ org|config:'light1_color'|default:'#FFD100' }}{% endif %}"
77+
data-bar-color="#00aeef"
7878
data-label-color="#FFF"
7979
data-label-position="top"
8080
data-stats="age_stats"
@@ -177,14 +177,10 @@
177177
<div style="min-height:349px" class="flex justify-content">
178178
<div class="inline-block mx-auto my-auto text-center">
179179
<div class="w-64">
180-
{% if org|config:"has_new_brand" %}
181-
{% if org.language != "ar" and org.language != "ru" %}
182-
<img src="{{ STATIC_URL }}img/logos/UREPORT/U-Report_Logo_invert_EN.png" alt="{{ org.name }}" class="logo">
183-
{% else %}
184-
<img src="{{ STATIC_URL }}img/logos/UREPORT/U-Report_Logo_invert_{{ org.language|upper }}.png" alt="{{ org.name }}" class="logo">
185-
{% endif %}
180+
{% if org.language != "ar" and org.language != "ru" %}
181+
<img src="{{ STATIC_URL }}img/logos/UREPORT/U-Report_Logo_invert_EN.png" alt="{{ org.name }}" class="logo">
186182
{% else %}
187-
<img src="{{ STATIC_URL }}img/u-report-global-logo-white.png" alt="">
183+
<img src="{{ STATIC_URL }}img/logos/UREPORT/U-Report_Logo_invert_{{ org.language|upper }}.png" alt="{{ org.name }}" class="logo">
188184
{% endif %}
189185
</div>
190186
</div>
@@ -261,13 +257,13 @@
261257
<div class="flex">
262258
<div class="flex-1 h-10"></div>
263259
<div class="flex-1 bg-dark1-v2024">
264-
<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>
260+
<div class="rtl:mr-20 rtl:ml-10 ltr:ml-20 ltr:mr-10 bg-black h-10">&nbsp;</div>
265261
</div>
266262
</div>
267263
<div>
268264
{% for story in main_stories|slice:"1" %}
269265
<div class="{% if is_rtl_org %}border-l-25rem{% else %}border-r-25rem{% endif %} border-solid border-dark1-v2024">
270-
<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">
266+
<div class="{% if is_rtl_org %}border-l-25rem{% else %}border-r-25rem{% endif %} border-solid border-black flex">
271267
<div class="w-1/3 rtl:pr-10 ltr:pl-10 pl-10 flex flex-col justify-center">
272268
<div class="block">
273269
<div class="font-bold mb-4">{% trans "FEATURED STORY" %}</div>
@@ -299,7 +295,7 @@
299295
<div class="flex">
300296
<div class="flex-1 h-10"></div>
301297
<div class="flex-1 bg-dark1-v2024">
302-
<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>
298+
<div class="rtl:mr-20 rtl:ml-10 ltr:ml-20 ltr:mr-10 bg-black h-10"></div>
303299
</div>
304300
</div>
305301
<div class="flex">
@@ -332,11 +328,7 @@
332328
<div class="bg-black text-white">
333329
<div class="md:flex rtl:pl-10 ltr:pr-10 max-w-page mx-auto bg-black p-home">
334330
<div class="md:w-3/5 flex flex-center-y my-4">
335-
{% if org|config:"has_new_brand" %}
336-
<img src="{{ STATIC_URL }}img/homemap_bg-v2024.png" alt="">
337-
{% else %}
338-
<img src="{{ STATIC_URL }}img/homemap_bg.png" alt="">
339-
{% endif %}
331+
<img src="{{ STATIC_URL }}img/homemap_bg-v2024.png" alt="">
340332
</div>
341333
<div class="md:w-2/5 flex flex-center-y">
342334
<div class="rtl:pr-10 ltr:pl-10">

0 commit comments

Comments
 (0)