Merge pull request #185 from Ilhasoft/update/1.2.101

Update/1.2.101
Ilhasoft · Mar 19, 2024 · 4dd8960 · 4dd8960
2 parents 5a4bc5c + ce21d54
commit 4dd8960
Show file tree

Hide file tree

Showing 18 changed files with 94 additions and 27 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,36 @@
+v1.2.101 (2024-03-05)
+-------------------------
+ * Merge pull request #1193 from rapidpro/polls-cyan
+ * Use cyan, black and white colors for new brand on polls page
+ * Merge pull request #1191 from rapidpro/dependabot/pip/jinja2-3.1.3
+ * Merge pull request #1192 from rapidpro/dependabot/pip/django-4.2.10
+ * Bump django from 4.2.7 to 4.2.10
+ * Bump jinja2 from 3.1.2 to 3.1.3
+
+v1.2.100 (2024-02-28)
+-------------------------
+ * Merge pull request #1190 from rapidpro/fix-drc-logo
+
+v1.2.99 (2024-02-28)
+-------------------------
+ * Merge pull request #1189 from rapidpro/drc-logo
+ * Quick workaround custom DRC logo
+ * Merge pull request #1188 from rapidpro/drc-logo
+ * Quick workaround custom DRC logo
+
+v1.2.98 (2024-02-26)
+-------------------------
+ * Merge pull request #1187 from rapidpro/logo-lang
+
+v1.2.96 (2024-02-08)
+-------------------------
+ * Fix tab title
+
+v1.2.95 (2024-02-07)
+-------------------------
+ * Merge pull request #1186 from rapidpro/links-updates
+ * Update VOY links
+
 v1.2.94 (2024-02-05)
 -------------------------
  * Merge pull request #1185 from rapidpro/fix-org-name-spacing

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,13 +1,13 @@
 [tool.poetry]
 name = "ureport"
-version = "1.2.94"
+version = "1.2.101"
 description = "U-Report dashboard built on data collected by RapidPro"
 authors = ["Nyaruka Ltd <code@nyaruka.com>"]
 readme = "README.md"
 
 [tool.poetry.dependencies]
 python = "^3.10"
-Django = "^4.2.7"
+Django = "^4.2.10"
 smartmin = "^4.2.5"
 rapidpro-dash = "^1.14.3"
 colorama = "^0.4.3"

diff --git a/static/img/logos/UNICEF/UNICEF_logo_footer_SL.png b/static/img/logos/UNICEF/UNICEF_logo_footer_SL.png
diff --git a/static/img/logos/UREPORT/U-Report_LOGO_DRC.png b/static/img/logos/UREPORT/U-Report_LOGO_DRC.png
diff --git a/static/img/logos/UREPORT/U-Report_Logo.png b/static/img/logos/UREPORT/U-Report_Logo.png
diff --git a/static/img/logos/UREPORT/U-Report_Logo_AR.png b/static/img/logos/UREPORT/U-Report_Logo_AR.png
diff --git a/static/img/logos/UREPORT/U-Report_Logo_EN.png b/static/img/logos/UREPORT/U-Report_Logo_EN.png
diff --git a/static/img/logos/UREPORT/U-Report_Logo_RU.png b/static/img/logos/UREPORT/U-Report_Logo_RU.png
diff --git a/static/img/logos/UREPORT/U-Report_Logo_invert.png b/static/img/logos/UREPORT/U-Report_Logo_invert.png
diff --git a/static/img/logos/UREPORT/U-Report_Logo_invert_AR.png b/static/img/logos/UREPORT/U-Report_Logo_invert_AR.png
diff --git a/static/img/logos/UREPORT/U-Report_Logo_invert_EN.png b/static/img/logos/UREPORT/U-Report_Logo_invert_EN.png
diff --git a/static/img/logos/UREPORT/U-Report_Logo_invert_RU.png b/static/img/logos/UREPORT/U-Report_Logo_invert_RU.png
diff --git a/templates/base_admin_dashboard.html b/templates/base_admin_dashboard.html
@@ -89,7 +89,13 @@
                             <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.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">
@@ -328,7 +334,7 @@
                     </a>
                     <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" %}
+                            {% if org.language != "ar" and org.language != "ru" and org.language != "ch" and org.language != "fr" and org.language != "sl" %}
                                 <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"
@@ -340,7 +346,13 @@
                     <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.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">
@@ -349,7 +361,7 @@
                         </div>
                         <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" %}
+                                {% if org.language != "ar" and org.language != "ru" and org.language != "ch" and org.language != "fr" and org.language != "sl" %}
                                     <img src="{{ STATIC_URL }}img/logos/UNICEF/UNICEF_logo_footer_EN.png"
                                          class="md:-ml-0 -ml-2"
                                          alt="UNICEF logo">

diff --git a/templates/frame.html b/templates/frame.html
@@ -549,7 +549,7 @@
     {% endif %}
     <script src="{{ STATIC_URL }}js/uikit.js"></script>
     <script src="{{ STATIC_URL }}js/uikit-icons.js"></script>
-    <script src="{{ STATIC_URL }}/js/leaflet.js"></script>
+    <script src="{{ STATIC_URL }}js/leaflet.js"></script>
     <script src="https://code.highcharts.com/highcharts.js"></script>
     <script type="text/javascript" src="{{ STATIC_URL }}js/gradientfactory.js"></script>
     <script type="text/javascript" src="https://www.gstatic.com/charts/loader.js"></script>

diff --git a/templates/public/index.html b/templates/public/index.html
@@ -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 %}

diff --git a/templates/public/polls.html b/templates/public/polls.html
@@ -188,7 +188,7 @@
                                 {{ age_stats|json_script:"age_stats" }}
                                 <div data-aos="fade"
                                      data-graph-type="age-chart"
-                                     data-bar-color="{{ org|config:'dark1_color' }}"
+                                     data-bar-color="{% if org|config:'has_new_brand' %}#00aeef {% else %}{{ org|config:'dark1_color' }}{% endif %}"
                                      data-label-color="black"
                                      data-stats="age_stats"
                                      data-label-weight="400"
@@ -238,10 +238,10 @@
                  data-aos="fade"
                  data-aos-anchor-placement="center-bottom"
                  style="min-height:30rem"
-                 data-bar-color="{% cycle org|config:'dark1_color'|default:'#439932'  org|config:'light1_color'|default:'#FFD100' org|config:'dark2_color'|default:'#1751af' org|config:'dark3_color'|default:'#5eb3e0' as bar_color silent %}{% if question.get_bg_color_choice %} {{ question.get_bg_color_choice }} {% else %}{{ bar_color }}{% endif %}"
+                 data-bar-color="{% cycle org|config:'dark1_color'|default:'#439932'  org|config:'light1_color'|default:'#FFD100' org|config:'dark2_color'|default:'#1751af' org|config:'dark3_color'|default:'#5eb3e0' as bar_color silent %}{% if org|config:"has_new_brand" %}#00aeef {% else %}{% if question.get_bg_color_choice %} {{ question.get_bg_color_choice }} {% else %}{{ bar_color }}{% endif %}{% endif %}"
                  class="md:flex {% cycle '' 'md:flex-row-reverse' %} block"
                  id="question-block-{{ question.id }}">
-                <div class="{% cycle 'bg-dark1 text-white' 'bg-light1 text-black' 'bg-dark2 text-white' 'bg-dark3 text-black' as bg silent %}{% if question.get_color_choice_css %} {{ question.get_color_choice_css }} {% else %}{{ bg }}{% endif %} flex-1">
+                <div class="{% cycle 'bg-dark1 text-white' 'bg-light1 text-black' 'bg-dark2 text-white' 'bg-dark3 text-black' as bg silent %}{% if org|config:"has_new_brand" %} bg-dark1-v2024 text-white {% else %} {% if question.get_color_choice_css %} {{ question.get_color_choice_css }} {% else %}{{ bg }}{% endif %}{% endif %} flex-1">
                     <div class="md:py-24 p-home h-full flex-center-y">
                         <div class="{% cycle '' 'md:flex-row-reverse' as reverse %} flex">
                             <div data-html2canvas-ignore

diff --git a/templates/public_base.html b/templates/public_base.html
@@ -10,7 +10,9 @@
         <meta http-equiv="X-UA-Compatible" content="ie=edge">
         <title>
             {% trans "U-Report" %}
+            {% if org.subdomain %}
             {{ org.name }}
+            {% endif %}
         </title>
         <meta name="description" content="">
         <meta name="keywords" content="">
@@ -333,10 +335,10 @@
         <a href="{% url 'public.stories' %}" class="hover:text-gray-600 block mt-4 font-bold">{% trans "Stories" %}</a>
         {% if org|config:"has_new_brand" %}
             {% if org|config:"is_global" and org.subdomain == "" %}
-                <a href="https://www.voicesofyouth.org/" class="hover:text-gray-600 block mt-4 font-bold">{% trans "Co-Create" %}</a>
+                <a href="https://www.voicesofyouth.org/voices-youth-co-creation-opportunities-young-people" class="hover:text-gray-600 block mt-4 font-bold">{% trans "Co-Create" %}</a>
             {% endif %}
         {% endif %}
-        <a href="{% url 'public.about' %}" class="hover:text-gray-600 block mt-8">{% trans "About" %}</a>
+        <a href="{% if org|config:"is_global" and org.subdomain == "" %}https://www.voicesofyouth.org/aboutureport{% else %}{% url 'public.about' %}{% endif %}" class="hover:text-gray-600 block mt-8">{% trans "About" %}</a>
         <a href="{% url 'public.ureporters' %}" class="hover:text-gray-600 block mt-4">{% trans "Engagement" %}</a>
         {% if show_bots_link %}
             <a href="{% url 'public.bots' %}" class="hover:text-gray-600 block mt-4">{% trans "Bots" %}</a>
@@ -422,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 %}
@@ -560,7 +566,7 @@
             </div>
             <div class="md:justify-end li flex-grow flex">
                 <a href="{% url 'public.ureporters' %}" class="md:ml-4 hover:text-gray-750 flex-initial py-menu">{% trans "Engagement" %}</a>
-                <a href="{% url 'public.about' %}" class="hover:text-gray-750 flex-initial ml-4 py-menu">{% trans "About" %}</a>
+                <a href="{% if org|config:"is_global" and org.subdomain == "" %}https://www.voicesofyouth.org/aboutureport{% else %}{% url 'public.about' %}{% endif %}" class="hover:text-gray-750 flex-initial ml-4 py-menu">{% trans "About" %}</a>
                 {% if show_bots_link %}
                     <a href="{% url 'public.bots' %}" class="hover:text-gray-750 flex-initial ml-4 py-menu">{% trans "Bots" %}</a>
                 {% endif %}
@@ -641,7 +647,13 @@
             <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.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 %}
                     </div>
                 </a>
                 <div class="flex-1 font-bold text-2xl mt-16" style="font-family:'Noto Sans', sans-serif;">
@@ -665,7 +677,7 @@
                     {% if org|config:"is_global" and org.subdomain == "" %}
                         <div class="flex-1 text-center font-bold text-xl flex-center-y">
                             <div>
-                                <a href="https://www.voicesofyouth.org/"
+                                <a href="https://www.voicesofyouth.org/voices-youth-co-creation-opportunities-young-people"
                                    class="hover:text-gray-750 hover:border-dark1-v2024 pb-2 border-b-2 border-black">{% trans "Co-Create" %}</a>
                             </div>
                         </div>
@@ -703,7 +715,13 @@
                 <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.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" alt="">
@@ -815,7 +833,7 @@
         </a>
         <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" %}
+                {% if org.language != "ar" and org.language != "ru" and org.language != "ch" and org.language != "fr" and org.language != "sl" %}
                     <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"
@@ -836,7 +854,7 @@
             </div>
             <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" %}
+                    {% if org.language != "ar" and org.language != "ru" and org.language != "ch" and org.language != "fr" and org.language != "sl" %}
                         <img src="{{ STATIC_URL }}img/logos/UNICEF/UNICEF_logo_footer_EN.png"
                              class="md:-ml-0 -ml-2"
                              alt="UNICEF logo">