Code style fixes in templates

Author: codedmonkey

templates/dashboard/index.html.twig

@@ -3,7 +3,7 @@
 {% block page_title %}{{ ea.dashboardTitle }}{% endblock %}
 
 {% block search_wrapper %}
-  {% include 'dashboard/packages/_search_box.html.twig' %}
+  {{ include('dashboard/packages/_search_box.html.twig', with_context: false) }}
 {% endblock %}
 
 {% block page_content %}

templates/dashboard/packages/_package_header.html.twig

@@ -1,20 +1,22 @@
 {% set currentPage = currentPage|default(null) %}
+{% set attrActive = 'class="nav-link active" aria-current="page"' %}
+{% set attr = 'class="nav-link text-primary"' %}
 
 <ul class="nav nav-pills nav-justified d-grid d-md-flex gap-1 pb-3 mb-3 border-bottom">
   <li class="nav-item">
     {% set packageInfoUrl = path('dashboard_packages_info', {packageName: package.name}) %}
-    <a {% if currentPage == 'info' %}class="nav-link active" aria-current="page"{% else %}class="nav-link text-primary"{% endif%} href="{{ packageInfoUrl }}">{{ 'Info'|trans }}</a>
+    <a {{ currentPage == 'info' ? attrActive : attr }} href="{{ packageInfoUrl }}">{{ 'Info'|trans }}</a>
   </li>
   <li class="nav-item">
     {% set packageVersionsUrl = path('dashboard_packages_versions', {packageName: package.name}) %}
-    <a {% if currentPage == 'versions' %}class="nav-link active" aria-current="page"{% else %}class="nav-link text-primary"{% endif%} href="{{ packageVersionsUrl }}">{{ 'Versions'|trans }}</a>
+    <a {{ currentPage == 'versions' ? attrActive : attr }} href="{{ packageVersionsUrl }}">{{ 'Versions'|trans }}</a>
   </li>
   <li class="nav-item">
     {% set packageDependentsUrl = path('dashboard_packages_dependents', {packageName: package.name}) %}
-    <a {% if currentPage == 'dependents' %}class="nav-link active" aria-current="page"{% else %}class="nav-link text-primary"{% endif%} href="{{ packageDependentsUrl }}">{{ 'Dependents'|trans }}</a>
+    <a {{ currentPage == 'dependents' ? attrActive : attr }} href="{{ packageDependentsUrl }}">{{ 'Dependents'|trans }}</a>
   </li>
   <li class="nav-item">
     {% set packageStatisticsUrl = path('dashboard_packages_statistics', {packageName: package.name}) %}
-    <a {% if currentPage == 'statistics' %}class="nav-link active" aria-current="page"{% else %}class="nav-link text-primary"{% endif%} href="{{ packageStatisticsUrl }}">{{ 'Statistics'|trans }}</a>
+    <a {{ currentPage == 'statistics' ? attrActive : attr }} href="{{ packageStatisticsUrl }}">{{ 'Statistics'|trans }}</a>
   </li>
 </ul>

templates/dashboard/packages/_search_box.html.twig

@@ -4,7 +4,7 @@
       <div class="form-widget">
         <i class="fas fa-search content-search-icon"></i>
 
-        <label class="content-search-label" data-value="{{ app.request.get('query') }}">
+        <label class="content-search-label">
           <input
             name="query"
             class="form-control {{ app.request.get('query') is null ? 'is-blank' }}"
@@ -13,7 +13,7 @@
             placeholder="{{ 'Search packages'|trans }}"
             spellcheck="false"
             autocorrect="off"
-            {% if not searchAutofocus is defined or searchAutofocus %}autofocus="autofocus"{% endif %}
+            {% if autofocus ?? true %}autofocus="autofocus"{% endif %}
           >
         </label>
 

templates/dashboard/packages/list.html.twig

@@ -3,7 +3,7 @@
 {% block page_title %}Packages{% endblock %}
 
 {% block search_wrapper %}
-  {% include 'dashboard/packages/_search_box.html.twig' %}
+  {{ include('dashboard/packages/_search_box.html.twig', with_context: false) }}
 {% endblock %}
 
 {% block page_actions %}

templates/dashboard/packages/package_base.html.twig

@@ -1,7 +1,7 @@
 {% extends '@EasyAdmin/page/content.html.twig' %}
 
 {% block search_wrapper %}
-  {% include 'dashboard/packages/_search_box.html.twig' with {searchAutofocus: false} %}
+  {{ include('dashboard/packages/_search_box.html.twig', {autofocus: false}, with_context: false) }}
 {% endblock %}
 
 {% block page_actions %}

templates/dashboard/packages/package_edit.html.twig

@@ -3,7 +3,7 @@
 {% block page_title %}Edit Package{% endblock %}
 
 {% block search_wrapper %}
-  {% include 'dashboard/packages/_search_box.html.twig' with {searchAutofocus: false} %}
+  {{ include('dashboard/packages/_search_box.html.twig', {autofocus: false}, with_context: false) }}
 {% endblock %}
 
 {% block page_actions %}

templates/dashboard/packages/package_info.html.twig

@@ -13,7 +13,7 @@
 {% endblock %}
 
 {% block page_content %}
-  {% include 'dashboard/packages/_package_header.html.twig' with {currentPage: 'info'} %}
+  {{ include('dashboard/packages/_package_header.html.twig', {currentPage: 'info'}) }}
 
   <div class="row mb-3">
     <div class="col-md-8">

templates/dashboard/packages/package_links.html.twig

@@ -3,7 +3,7 @@
 {% block page_title %}{{ package.name }} <small>{{ title|trans }}</small>{% endblock %}
 
 {% block page_content %}
-  {% include 'dashboard/packages/_package_header.html.twig' with {currentPage: title|lower} %}
+  {{ include('dashboard/packages/_package_header.html.twig', {currentPage: title|lower}) }}
 
   {{ include('dashboard/packages/_package_list.html.twig', {packages: packageLinks|map(packageLink => packageLink.package), paginator: paginator}, with_context: false) }}
 {% endblock %}

templates/dashboard/packages/package_statistics.html.twig

@@ -3,7 +3,7 @@
 {% block page_title %}{{ package.name }} <small>{{ 'Statistics'|trans }}</small>{% endblock %}
 
 {% block page_content %}
-  {% include 'dashboard/packages/_package_header.html.twig' with {currentPage: 'statistics'} %}
+  {{ include('dashboard/packages/_package_header.html.twig', {currentPage: 'statistics'}) }}
 
   <div class="mb-3">
     <h2>{{ 'Installations'|trans }}</h2>

templates/dashboard/packages/package_versions.html.twig

@@ -3,7 +3,7 @@
 {% block page_title %}{{ package.name }} <small>{{ 'Versions'|trans }}</small>{% endblock %}
 
 {% block page_content %}
-  {% include 'dashboard/packages/_package_header.html.twig' with {currentPage: 'versions'} %}
+  {{ include('dashboard/packages/_package_header.html.twig', {currentPage: 'versions'}) }}
 
   <div class="list-group list-group-flush mb-3">
     {% for version in versions %}