Improve package page templates

codedmonkey · Dec 31, 2024 · 0005346 · 0005346
1 parent 27e3492
commit 0005346
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 39 deletions.
diff --git a/templates/dashboard/packages/package_base.html.twig b/templates/dashboard/packages/package_base.html.twig
@@ -0,0 +1,23 @@
+{% extends '@EasyAdmin/page/content.html.twig' %}
+
+{% block search_wrapper %}
+  {% include 'dashboard/packages/search_box.html.twig' with {searchAutofocus: false} %}
+{% endblock %}
+
+{% block page_actions %}
+  {% if is_granted('ROLE_ADMIN') %}
+    <div class="global-actions">
+      <div class="dropdown">
+        <button class="btn btn-secondary" type="button" data-bs-toggle="dropdown" aria-expanded="false">
+          <span class="fa-solid fa-ellipsis-h" aria-hidden="true"></span>
+        </button>
+        <ul class="dropdown-menu">
+          <li><a class="dropdown-item" href="{{ dashboard_path('dashboard_packages_update', {packageName: package.name}) }}">Update package</a></li>
+          <li><div class="dropdown-divider"></div></li>
+          <li><a class="dropdown-item" href="{{ dashboard_path('dashboard_packages_edit', {packageName: package.name}) }}">Edit package</a></li>
+          <li><a class="dropdown-item" href="{{ dashboard_path('dashboard_packages_delete', {packageName: package.name}) }}">Delete package</a></li>
+        </ul>
+      </div>
+    </div>
+  {% endif %}
+{% endblock %}
diff --git a/templates/dashboard/packages/package_header.html.twig b/templates/dashboard/packages/package_header.html.twig
@@ -4,19 +4,19 @@
   <li class="nav-item">
     {% set packageInfoUrl = ea_url()
       .setRoute('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</a>
+    <a {% if currentPage == 'info' %}class="nav-link active" aria-current="page"{% else %}class="nav-link text-primary"{% endif%} href="{{ packageInfoUrl }}">{{ 'Info'|trans }}</a>
   </li>
   <li class="nav-item">
     {% set packageVersionsUrl = ea_url()
       .setRoute('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</a>
+    <a {% if currentPage == 'versions' %}class="nav-link active" aria-current="page"{% else %}class="nav-link text-primary"{% endif%} href="{{ packageVersionsUrl }}">{{ 'Versions'|trans }}</a>
   </li>
   <li class="nav-item">
-    <span class="nav-link disabled">Dependants</span>
+    <span class="nav-link disabled">{{ 'Dependants'|trans }}</span>
   </li>
   <li class="nav-item">
     {% set packageVersionsUrl = ea_url()
       .setRoute('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="{{ packageVersionsUrl }}">Statistics</a>
+    <a {% if currentPage == 'statistics' %}class="nav-link active" aria-current="page"{% else %}class="nav-link text-primary"{% endif%} href="{{ packageVersionsUrl }}">{{ 'Statistics'|trans }}</a>
   </li>
 </ul>
diff --git a/templates/dashboard/packages/package_info.html.twig b/templates/dashboard/packages/package_info.html.twig
@@ -1,4 +1,4 @@
-{% extends '@EasyAdmin/page/content.html.twig' %}
+{% extends 'dashboard/packages/package_base.html.twig' %}
 
 {% block page_title %}
   {%- apply spaceless -%}
@@ -12,28 +12,6 @@
   {%- endapply -%}
 {% endblock %}
 
-{% block search_wrapper %}
-  {% include 'dashboard/packages/search_box.html.twig' with {searchAutofocus: false} %}
-{% endblock %}
-
-{% block page_actions %}
-  {% if is_granted('ROLE_ADMIN') %}
-    <div class="global-actions">
-      <div class="dropdown">
-        <button class="btn btn-secondary" type="button" data-bs-toggle="dropdown" aria-expanded="false">
-          <span class="fa-solid fa-ellipsis-h" aria-hidden="true"></span>
-        </button>
-        <ul class="dropdown-menu">
-          <li><a class="dropdown-item" href="{{ dashboard_path('dashboard_packages_update', {packageName: package.name}) }}">Update package</a></li>
-          <li><div class="dropdown-divider"></div></li>
-          <li><a class="dropdown-item" href="{{ dashboard_path('dashboard_packages_edit', {packageName: package.name}) }}">Edit package</a></li>
-          <li><a class="dropdown-item" href="{{ dashboard_path('dashboard_packages_delete', {packageName: package.name}) }}">Delete package</a></li>
-        </ul>
-      </div>
-    </div>
-  {% endif %}
-{% endblock %}
-
 {% block page_content %}
   {% include 'dashboard/packages/package_header.html.twig' with {currentPage: 'info'} %}
 

diff --git a/templates/dashboard/packages/package_statistics.html.twig b/templates/dashboard/packages/package_statistics.html.twig
@@ -1,10 +1,6 @@
-{% extends '@EasyAdmin/page/content.html.twig' %}
+{% extends 'dashboard/packages/package_base.html.twig' %}
 
-{% block page_title %}{{ package.name }}{% endblock %}
-
-{% block search_wrapper %}
-  {% include 'dashboard/packages/search_box.html.twig' with {searchAutofocus: false} %}
-{% endblock %}
+{% block page_title %}{{ package.name }} <small>{{ 'Statistics'|trans }}</small>{% endblock %}
 
 {% block page_content %}
   {% include 'dashboard/packages/package_header.html.twig' with {currentPage: 'statistics'} %}

diff --git a/templates/dashboard/packages/package_versions.html.twig b/templates/dashboard/packages/package_versions.html.twig
@@ -1,10 +1,6 @@
-{% extends '@EasyAdmin/page/content.html.twig' %}
+{% extends 'dashboard/packages/package_base.html.twig' %}
 
-{% block page_title %}{{ package.name }}{% endblock %}
-
-{% block search_wrapper %}
-  {% include 'dashboard/packages/search_box.html.twig' with {searchAutofocus: false} %}
-{% endblock %}
+{% block page_title %}{{ package.name }} <small>{{ 'Versions'|trans }}</small>{% endblock %}
 
 {% block page_content %}
   {% include 'dashboard/packages/package_header.html.twig' with {currentPage: 'versions'} %}

diff --git a/translations/messages.en.yaml b/translations/messages.en.yaml
@@ -2,10 +2,13 @@ Account: Account
 Administration: Administration
 Credits: Credits
 Dashboard: Dashboard
+Dependants: Dependants
 Documentation: Documentation
+Info: Info
 Packages: Packages
 Personal: Personal
 Sign out: Sign out
+Statistics: Statistics
 Usage: Usage
 
 Access token: Access token
@@ -15,6 +18,7 @@ Registry: Registry
 Registries: Registries
 User: User
 Users: Users
+Versions: Versions
 
 Current password: Current password
 Description: Description