Merge branch 'main' into fix-jinja-template-err

GSA · Dec 9, 2024 · f39c4ec · f39c4ec
2 parents 4b3ad84 + 394ef18
commit f39c4ec
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -23,8 +23,7 @@ jobs:
           sed -i "s/version='[0-9]\{1,2\}.[0-9]\{1,4\}.[0-9]\{1,4\}',/version='${{github.event.inputs.version_no}}',/g" setup.py
       - name: Create packages
         run: |
-          python setup.py sdist
-          python setup.py bdist_wheel
+          python -m build
       - name: pypi-publish
         uses: pypa/gh-action-pypi-publish@release/v1
         with:

diff --git a/ckanext/datagovtheme/fanstatic_library/styles/datagovtheme.css b/ckanext/datagovtheme/fanstatic_library/styles/datagovtheme.css
@@ -2470,6 +2470,7 @@ article.module.prose h3 {
     height: auto;
     padding: 14px 10px;
     width: 100%;
+    color: #595959
 }
 .search-giant button {
     background: transparent url('/../../base/images/icon-search-27x26.png') no-repeat scroll center center;

diff --git a/ckanext/datagovtheme/templates/package/search.html b/ckanext/datagovtheme/templates/package/search.html
@@ -13,7 +13,7 @@
         {% set search_placeholder = 'Search collection...' if request.args.collection_package_id else 'Search datasets...' %}
         <span class="control-group search-giant">
           <label for="search-big" class="hide">{{ _('Search datasets') }}</label>
-          <input id="search-big" type="text" class="search" name="q" value="{{ c.q }}" autocomplete="off" placeholder="{{ search_placeholder }}" onblur="if(value=='') value = 'Search datasets...'" onfocus="if(value=='Search datasets...') value = ''"/>
+          <input id="search-big" type="text" class="search" name="q" value="{{ c.q }}" autocomplete="off" placeholder="{{ search_placeholder }}" onblur="if(value=='') value = '{{ search_placeholder }}'" onfocus="if(value=='{{ search_placeholder }}') value = ''"/>
           <button type="submit" value="search">{{ _('Submit') }}</button>
         </span>
         {{ h.snippet('snippets/sort_by.html', sort=c.sort_by_selected) }}
@@ -52,11 +52,6 @@
                 {% endif %}
                 {% endfor %}
             </div>
-            {% if request.args and c.page.item_count == 0 %}
-            {% trans %}
-            <p class="extra">Please try another search.</p>
-            {% endtrans %}
-            {% endif %}
         </div>
     </form></div>
 <a class="show-filters btn btn-primary">{{ _('Filter Results') }}</a>
@@ -91,6 +86,11 @@
 
 <section class="module">
     <div class="module-content">
+        {% if request.args and c.page.item_count == 0 %}
+        {% trans %}
+        <p class="extra">Please try another search.</p>
+        {% endtrans %}
+        {% endif %}
         <p>
             <small>
                 {% set api_link = h.link_to(_('API'), h.url_for(controller='api', action='get_api', ver=3)) %}