kobotoolbox · jnm · Mar 11, 2021 · May 21, 2020 · Jul 29, 2020 · Jul 29, 2020
diff --git a/kobocat-template/static/css/kobo-branding.css b/kobocat-template/static/css/kobo-branding.css
@@ -330,7 +330,7 @@ section {
 .single-project__header .container,
 .projects-list__header .container,
 .data-page__header .container {
-  max-width: 984px;
+  max-width: 960px;
 }
 
 .single-project__header .fa-caret-right,
@@ -681,4 +681,4 @@ i.fa-trash-o {
   td.footable-first-column {
     padding-right: 0px !important;
   }
-}
+}
diff --git a/kobocat-template/static/css/kobo-single-project.css b/kobocat-template/static/css/kobo-single-project.css
@@ -189,14 +189,15 @@ button.single-project__button-delete {
 }
 
 .dashboard__left {
-  width: 72%;
+  width: 60%;
   float: left;
   margin-left: 1%;
 }
 
 .dashboard__right {
   width: 25%;
   float: left;
+  margin-left: -13%;
 }
 
 h2.dashboard__group-label {
@@ -205,9 +206,8 @@ h2.dashboard__group-label {
 }
 
 .dashboard__submissions {
-  width: 55%;
+  width: 33%;
   float: left;
-  margin-right: 5%;
   position: relative;
 }
 
@@ -268,7 +268,7 @@ a.dashboard__button-download-data:hover span {
 }
 
 .dashboard__submissions a.dashboard__button {
-  width: 30%;
+  width: 60%;
 }
 
 a.dashboard__button-twoline span {
@@ -351,8 +351,8 @@ a.dashboard__formbutton-refresh {
 
 .dashboard__download__drop {
   position: absolute;
-  right: 22px;
-  bottom: -150px;
+  left: 0;
+  bottom: -128px;
   width: 124px;
   border: 1px solid #E7E8E9;
   background: white;
@@ -629,4 +629,4 @@ span.poshytip {
   .dashboard__download__drop {
     bottom: -190px;
   }
-}
+}
diff --git a/kobocat-template/templates/base.html b/kobocat-template/templates/base.html
@@ -1,97 +1,102 @@
 {% load static %}
 <!DOCTYPE html>
 <html lang="en">
-  <head>
+<head>
     <meta charset="utf-8">
     <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no, width=device-width">
     <title>{% block title %}{{ SITE_NAME }}{% endblock %}</title>
-    <meta name="description" content="{% block meta_description %}KoBoToolbox is a free and open source suite of tools for field data collection for use in challenging environments.{% endblock %}">
+    <meta name="description"
+          content="{% block meta_description %}KoBoToolbox is a free and open source suite of tools for field data collection for use in challenging environments.{% endblock %}">
     <meta name="author" content="">
     {% if GOOGLE_SITE_VERIFICATION %}
-    <meta name="google-site-verification" content="{{ GOOGLE_SITE_VERIFICATION }}" />
+        <meta name="google-site-verification" content="{{ GOOGLE_SITE_VERIFICATION }}"/>
     {% endif %}
 
-    {% if csrf_token %}<meta name="csrf-token" content="{{csrf_token}}">{% endif %}
+    {% if csrf_token %}
+        <meta name="csrf-token" content="{{ csrf_token }}">{% endif %}
 
     <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
     <!--[if lt IE 9]>
-      <script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
+    <script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
     <![endif]-->
 
     <!-- Le styles -->
     {% block styles %}
 
-    <link rel="icon" type="image/x-icon" href="{% static "images/favicon.ico" %}" />
-    <!-- iPhone + iPad icons -->
-    <link rel="apple-touch-icon-precomposed" sizes="114x114" href="{% static "images/apple-touch-icon-114x114.png" %}">
-    <link rel="apple-touch-icon-precomposed" sizes="72x72" href="{% static "images/apple-touch-icon-72x72-precomposed.png" %}">
-    <link rel="apple-touch-icon-precomposed" href="{% static "img/apple-touch-icon-precomposed.png" %}">
-    <link rel="apple-touch-icon" href="{% static "images/apple-touch-icon.png" %}">
-
-    <link href="{% static "css/phaseout/bootstrap.min.css" %}" rel="stylesheet">
-    <link href="{% static "css/screen.css?v=2809679b01" %}" rel="stylesheet">
-    <link href="{% static "css/ona-screen-overrides.css" %}" rel="stylesheet">
-    <link href="{% static "css/font-awesome.min.css" %}" rel="stylesheet">
-    <!--[if lte IE 8]>
+        <link rel="icon" type="image/x-icon" href="{% static "images/favicon.ico" %}"/>
+        <!-- iPhone + iPad icons -->
+        <link rel="apple-touch-icon-precomposed" sizes="114x114"
+              href="{% static "images/apple-touch-icon-114x114.png" %}">
+        <link rel="apple-touch-icon-precomposed" sizes="72x72"
+              href="{% static "images/apple-touch-icon-72x72-precomposed.png" %}">
+        <link rel="apple-touch-icon-precomposed" href="{% static "img/apple-touch-icon-precomposed.png" %}">
+        <link rel="apple-touch-icon" href="{% static "images/apple-touch-icon.png" %}">
+
+        <link href="{% static "css/phaseout/bootstrap.min.css" %}" rel="stylesheet">
+        <link href="{% static "css/screen.css?v=2809679b01" %}" rel="stylesheet">
+        <link href="{% static "css/ona-screen-overrides.css" %}" rel="stylesheet">
+        <link href="{% static "css/font-awesome.min.css" %}" rel="stylesheet">
+        <!--[if lte IE 8]>
       <link href="{% static "css/font-awesome-ie7.css" %}" rel="stylesheet">
     <![endif]-->
-	  <link href="{% static "bootstrap/css/bootstrap-responsive.min.css" %}" rel="stylesheet">
+        <link href="{% static "bootstrap/css/bootstrap-responsive.min.css" %}" rel="stylesheet">
 
-    <link href="{% static "css/kobo-branding.css" %}" rel="stylesheet">
-    <link href="{% static "css/published_forms.css" %}" rel="stylesheet">
-    <link href="{% static "css/data_pages.css" %}" rel="stylesheet">
-    <link href="{% static "css/vex.css" %}" rel="stylesheet">
-    <link href="{% static "css/vex-theme-kobo.css" %}" rel="stylesheet">
+        <link href="{% static "css/kobo-branding.css" %}" rel="stylesheet">
+        <link href="{% static "css/published_forms.css" %}" rel="stylesheet">
+        <link href="{% static "css/data_pages.css" %}" rel="stylesheet">
+        <link href="{% static "css/vex.css" %}" rel="stylesheet">
+        <link href="{% static "css/vex-theme-kobo.css" %}" rel="stylesheet">
 
-    <link href="{% static "css/footable.css" %}" rel="stylesheet">
+        <link href="{% static "css/footable.css" %}" rel="stylesheet">
     {% endblock %}
     <!-- spot to insert stuff for google maps -->
     {% block additional-headers %}{% endblock %}
-  </head>
-
-  {% block body %}
-  {% if not user.is_authenticated %}
-
-  <body>
-    <div class="legacy-warning">
-      <div class="container">
-        We no longer recommend using the legacy interface. Please access all our new features in the <a href="{{ koboform_url }}">new interface</a> (new map, table, reports, labeled data exports, etc.). If you have deployed your project directly in the legacy interface, there is no way to use these new features. <strong>This legacy interface will be removed shortly.</strong>
-      </div>
-    </div>
-
-    <header class="header-bar">
-      <div class="container__wide">
-        <span class="header-bar__top-logo pull-right"></span>
-        <a href="http://support.kobotoolbox.org/" class="header-bar__support pull-right" target="_blank" title="Visit our self-help pages or ask a support question (opens in new tab)">Support</a>
-      </div>
-    </header>
-
-  {% else %}
-
-    <body class='authenticated'>
-		{% include "topbar.html"%}
-
-  {% endif %}
-
-    {% block before-content %}{% endblock %}
-
-    <div class="container-fluid container__wide main {{ request.resolver_match.url_name }}">
-      {% block message %}
+</head>
+
+{% block body %}
+    {% if not user.is_authenticated %}
+
+        <body>
+        <div class="legacy-warning">
+            <div class="container">
+
+                We no longer recommend using the legacy interface. Please access all our new features in the <a
+                    href="{{ koboform_url }}">new interface</a> (new map, table, reports, labeled data exports, etc.).
+            </div>
+        </div>
+
+        <header class="header-bar">
+            <div class="container__wide">
+                <span class="header-bar__top-logo pull-right"></span>
+                <a href="http://support.kobotoolbox.org/" class="header-bar__support pull-right" target="_blank"
+                   title="Visit our self-help pages or ask a support question (opens in new tab)">Support</a>
+            </div>
+        </header>
+
+    {% else %}
+
+        <body class='authenticated'>
+        {% include "topbar.html" %}
+
+    {% endif %}
+
+<div class="container-fluid container__wide main {{ request.resolver_match.url_name }}">
+    {% block message %}
         {% if message or messages or message_list %}
-          {% include "message.html" %}
+            {% include "message.html" %}
         {% endif %}
-      {% endblock %}
-      {% block content %}
+    {% endblock %}
+    {% block content %}
         {% if template %}{% include template %}{% endif %}
         {{ content|safe }}
-      {% endblock %}
-    </div>
+    {% endblock %}
+</div>
 
-    {% include "footer.html" %}
+{% include "footer.html" %}
 
-    {% block below-content %}{% endblock %}
+{% block below-content %}{% endblock %}
 
-    {% block javascript %}
+{% block javascript %}
 
     <!-- Le javascript -->
     <script type="text/javascript" src="{% url "django.views.i18n.javascript_catalog" %}"></script>
@@ -108,25 +113,32 @@
     <!--  -->
     <script src="{% static "js/kobo-branding.js" %}"></script>
 
-    {% endblock %}
+{% endblock %}
 
-    {% block additional-javascript %}{% endblock %}
+{% block additional-javascript %}{% endblock %}
 
-    {% block google-analytics %}
+{% block google-analytics %}
     {% if GOOGLE_ANALYTICS_PROPERTY_ID %}
-    <script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-     (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-       m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-         })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-ga('create', '{{ GOOGLE_ANALYTICS_PROPERTY_ID }}', '{{ GOOGLE_ANALYTICS_DOMAIN }}');
-    ga('send', 'pageview');
-
-    </script>
+        <script>
+            (function (i, s, o, g, r, a, m) {
+                i['GoogleAnalyticsObject'] = r;
+                i[r] = i[r] || function () {
+                    (i[r].q = i[r].q || []).push(arguments)
+                }, i[r].l = 1 * new Date();
+                a = s.createElement(o),
+                    m = s.getElementsByTagName(o)[0];
+                a.async = 1;
+                a.src = g;
+                m.parentNode.insertBefore(a, m)
+            })(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
+
+            ga('create', '{{ GOOGLE_ANALYTICS_PROPERTY_ID }}', '{{ GOOGLE_ANALYTICS_DOMAIN }}');
+            ga('send', 'pageview');
+
+        </script>
     {% endif %}
-    {% endblock %}
+{% endblock %}
 
-  </body>
-  {% endblock %}
+</body>
+{% endblock %}
 </html>
diff --git a/kobocat-template/templates/dashboard.html b/kobocat-template/templates/dashboard.html
@@ -64,12 +64,11 @@ <h1>{% blocktrans %}Publish a Form <small>Upload XLSForm</small>{% endblocktrans
         </div>
         <div class="span8">
             <h3 class="short">
-                <a href="{% url "public_profile" content_user.username %}">{{ content_user.username }}</a>
+                {{ content_user.username }}
                 {% if profile.name %}
                 <span class="name">|&nbsp;{{ profile.name }}</span>
                 {% endif %}
             </h3>
-            <span><a href="{% url "public_profile" content_user.username %}">{% trans "View Profile Page" %}</a></span>
         </div>
         </div>
         <div class="row-fluid">

diff --git a/kobocat-template/templates/data_view.html b/kobocat-template/templates/data_view.html