Merge pull request #885 from kobotoolbox/kobotoolbox/kpi#4475-shrink-…

…kobocat Remove deprecated legacy UI
kobotoolbox · Aug 30, 2023 · ace93da · ace93da
2 parents 5a0d890 + 7cb02a2
commit ace93da
Show file tree

Hide file tree

Showing 65 changed files with 640 additions and 4,043 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -14,11 +14,12 @@ build:
   before_script:
     - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.gitlab.com
   script:
-    - docker pull $CI_REGISTRY_IMAGE:${CI_COMMIT_REF_NAME//\//-} || true
-    - docker build --cache-from $CI_REGISTRY_IMAGE:${CI_COMMIT_REF_NAME//\//-} --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA --tag $CI_REGISTRY_IMAGE:${CI_COMMIT_REF_NAME//\//-} .
+    - CI_COMMIT_REF_NAME_SANITIZED=${CI_COMMIT_REF_NAME/\#/-}
+    - CI_COMMIT_REF_NAME_SANITIZED=${CI_COMMIT_REF_NAME_SANITIZED//\//-}
+    - docker pull $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME_SANITIZED || true
+    - docker build --cache-from $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME_SANITIZED --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME_SANITIZED .
     - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA
-    - docker push $CI_REGISTRY_IMAGE:${CI_COMMIT_REF_NAME//\//-}
-
+    - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME_SANITIZED
 test:
   stage: build_test
   image: python:3.10

diff --git a/kobocat-template/templates/404_xls_analyzer_error.html b/kobocat-template/templates/404_xls_analyzer_error.html
diff --git a/kobocat-template/templates/dashboard.html b/kobocat-template/templates/dashboard.html
diff --git a/kobocat-template/templates/export_list.html b/kobocat-template/templates/export_list.html
@@ -5,12 +5,6 @@
 {% block before-content %}
 {% load i18n %}
 
-<div class="sub-header-bar">
-  <div class="container__wide">
-    <a class="sub-header__back" href="{% url "show_form" xform.user.username xform.id_string %}"><i class="fa fa-chevron-left"></i> {% trans "Return to" %} {{ xform.title }}</a>
-  </div>
-</div>
-
 <header class="data-page__header">
     <hgroup class="container">
       <h1>{{ export_type_name|upper }} {% blocktrans %}Exports{% endblocktrans %}</h1>

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