From 9049043f0b71d3f557a71119ea9ba0266b240595 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <4533074+alexAubin@users.noreply.github.com>
Date: Sun, 12 May 2024 18:20:29 +0200
Subject: [PATCH] store/dash: cosmetics (#2328)

---
 store/assets/tailwind-local.css   |  2 +-
 store/templates/app.html          |  2 +-
 store/templates/dash.html         | 16 ++++++++++++----
 store/templates/wishlist_add.html |  8 ++++----
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/store/assets/tailwind-local.css b/store/assets/tailwind-local.css
index e08dab0c..8a2758ae 100644
--- a/store/assets/tailwind-local.css
+++ b/store/assets/tailwind-local.css
@@ -4,7 +4,7 @@
 
 @layer utilities {
   input, textarea, select {
-      @apply !rounded-md shadow-sm border-gray-200 !bg-neutral-50;
+      @apply !rounded-md shadow-sm !border-gray-200 !bg-neutral-50;
   }
   .btn {
       @apply text-sm font-medium rounded-md px-4 py-2 transition;
diff --git a/store/templates/app.html b/store/templates/app.html
index a9998238..8f2d7561 100644
--- a/store/templates/app.html
+++ b/store/templates/app.html
@@ -82,7 +82,7 @@
               <span class="inline sm:hidden">{{ _("Demo") }}</span>
             </a>
             {% endif %}
-            <a aria-label="{{ _('Install with YunoHost') }}" title="{{ _('Install with YunoHost') }}" class="h-9.5 inline-block rounded-md border p-0 bg-gray-900 dark:bg-dark text-white " href="https://install-app.yunohost.org/?app={{ app_id }}">
+            <a aria-label="{{ _('Install with YunoHost') }}" title="{{ _('Install with YunoHost') }}" class="h-9.5 inline-block rounded-md border border-gray-300 p-0 bg-gray-900 dark:bg-gray-50 text-white dark:text-black" href="https://install-app.yunohost.org/?app={{ app_id }}">
                 <span class="inline-block text-[11px] leading-3 text-center py-1.5 pl-2">Install<br/>with</span>
                 <span class="inline-block pr-2 pt-1 dark:invert"><img alt="YunoHost" src="{{ url_for('static', filename='horizontal-yunohost.svg') }}"></span>
             </a>
diff --git a/store/templates/dash.html b/store/templates/dash.html
index e98eadbf..af1ea54a 100644
--- a/store/templates/dash.html
+++ b/store/templates/dash.html
@@ -106,8 +106,12 @@
             </a>
         </td>
         <td>
-            <a class="{% if infos["ci_results"]["main"]["timestamp"] | days_ago > 30 %}opacity-50{% endif %}" href="https://ci-apps.yunohost.org/ci/apps/{{ app }}/">
-                {{ infos["ci_results"]["main"]["level"] }}
+            <a class="{% if infos["public_level"] == infos["ci_results"]["main"]["level"] or infos["ci_results"]["main"]["timestamp"] | days_ago > 30 %}opacity-50{% endif %}" href="https://ci-apps.yunohost.org/ci/apps/{{ app }}/">
+                {% if infos["public_level"] == infos["ci_results"]["main"]["level"] %}
+                    =
+                {% else %}
+                    {{ infos["ci_results"]["main"]["level"] }}
+                {% endif %}
                 {% if infos["ci_results"]["main"]["timestamp"] | days_ago > 30 %}
                 <i class="fa fa-hourglass-o" title="{{ _("Outdated test (%(days)s days ago)", days=infos["ci_results"]["main"]["timestamp"] | days_ago) }}"></i>
                 {% endif %}
@@ -120,9 +124,13 @@
             </a>
         </td>
         <td>
-            <a class="{% if infos["ci_results"]["nextdebian"] and infos["ci_results"]["nextdebian"]["timestamp"] | days_ago > 30 %}opacity-50{% endif %}" href="https://ci-apps-bookworm.yunohost.org/ci/apps/{{ app }}/">
+            <a class="{% if infos["ci_results"]["nextdebian"] and ((infos["public_level"] == infos["ci_results"]["nextdebian"]["level"]) or (infos["ci_results"]["nextdebian"]["timestamp"] | days_ago) > 30) %}opacity-50{% endif %}" href="https://ci-apps-bookworm.yunohost.org/ci/apps/{{ app }}/">
                 {% if infos["ci_results"]["nextdebian"] %}
-                    {{ infos["ci_results"]["nextdebian"]["level"] }}
+                    {% if infos["public_level"] == infos["ci_results"]["nextdebian"]["level"] %}
+                        =
+                    {% else %}
+                        {{ infos["ci_results"]["nextdebian"]["level"] }}
+                    {% endif %}
                     {% if infos["ci_results"]["nextdebian"]["timestamp"] | days_ago > 30 %}
                     <i class="fa fa-hourglass-o" title="{{ _("Outdated test (%(days)s days ago)", days=infos["ci_results"]["nextdebian"]["timestamp"] | days_ago) }}"></i>
                     {% endif %}
diff --git a/store/templates/wishlist_add.html b/store/templates/wishlist_add.html
index f9de62c7..6fea0f8a 100644
--- a/store/templates/wishlist_add.html
+++ b/store/templates/wishlist_add.html
@@ -59,21 +59,21 @@
       <input name="csrf_token" type="text" class="hidden" value="{{ csrf_token }}" >
 
       <label for="name" class="mt-5 block font-bold text-gray-700">{{ _("Name") }}</label>
-      <input name="name" type="text" class="w-full mt-1 rounded-md border-gray-200 text-gray-700 shadow-sm" maxlength="30" required onkeyup="this.value = this.value.replace(/[^a-zA-Z0-9.-\\(\\)\\ ]/, '')" >
+      <input name="name" type="text" class="w-full mt-1" maxlength="30" required onkeyup="this.value = this.value.replace(/[^a-zA-Z0-9.-\\(\\)\\ ]/, '')" >
 
       <label for="description" class="mt-5 block font-bold text-gray-700">{{ _("App's description") }}</label>
       <textarea name="description" type="text" class="w-full mt-1 rounded-md border-gray-200 text-gray-700 shadow-sm" required rows='3' maxlength='100'></textarea>
       <span class="text-xs text-gray-600"><span class="font-bold">{{ _("Please be concise and focus on what the app does.") }}</span> {{ _("No need to repeat '[App] is …'. No need to state that it is free/open-source or self-hosted (otherwise it wouldn't be packaged for YunoHost). Avoid marketing stuff like 'the most', or vague properties like 'easy', 'simple', 'lightweight'.") }}</span>
 
       <label for="upstream" class="mt-5 block font-bold text-gray-700">{{ _("Project code repository") }}</label>
-      <input name="upstream" type="url" class="w-full mt-1 rounded-md border-gray-200 text-gray-700 shadow-sm"  maxlength="150" required >
+      <input name="upstream" type="url" class="w-full mt-1"  maxlength="150" required >
 
       <label for="license" class="mt-5 block font-bold text-gray-700">{{ _("Link to the project's LICENSE") }}</label>
-      <input name="license" type="url" class="w-full mt-1 rounded-md border-gray-200 text-gray-700 shadow-sm" required maxlength="250"></input>
+      <input name="license" type="url" class="w-full mt-1" required maxlength="250"></input>
   <span class="text-xs text-gray-600 font-bold">{{ _("The YunoHost project will only package free/open-source software (with possible case-by-case exceptions for apps which are not-totally-free)") }}</span>
 
       <label for="website" class="mt-5 block font-bold text-gray-700">{{ _("Project website") }}</label>
-      <input name="website" type="url" class="w-full mt-1 rounded-md border-gray-200 text-gray-700 shadow-sm"  maxlength="150" >
+      <input name="website" type="url" class="w-full mt-1"  maxlength="150" >
       <span class="text-xs text-gray-600">{{ _("Please *do not* just copy-paste the code repository URL. If the project has no proper website, then leave the field empty.") }}</span>
 
       <button