Skip to content

Commit 80b21a5

Browse files
authored
extract package details header to its own directory (#5662)
1 parent 0b2eed1 commit 80b21a5

6 files changed

Lines changed: 9 additions & 11 deletions

File tree

File renamed without changes.

templates/store/_package_header.html renamed to templates/store/package_header/_package_header.html

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
{% from "store/snap-details/_package_heading_data.html" import package_header_data, package_icon %}
2-
31
{#
4-
Context variables needed:
2+
Context variables needed for `package_header`:
53

64
Snap data:
75
snap_title: Title of the snap
@@ -20,12 +18,15 @@
2018
VERIFIED_PUBLISHER: const (value of developer_validation)
2119
STAR_DEVELOPER: const (value of developer_validation)
2220
#}
21+
22+
{%- from 'store/package_header/_package_header_data.html' import package_header_data, package_icon -%}
23+
2324
{%- macro package_header() -%}
2425
{%- set buttons_content = caller('buttons') -%}
2526
{%- set has_buttons_content = buttons_content|trim|length > 0 -%}
2627
<div class="grid-row">
2728
<div class="grid-col-2 grid-col-medium-1 grid-col-small-1">
28-
{{ package_icon(icon_url, image) }}
29+
{{ package_icon(icon_url, image) }}
2930
</div>
3031
<div class="grid-col-6 grid-col-medium-3 grid-col-small-3">
3132
{{ package_header_data(package_title=snap_title,

templates/store/snap-details/_package_heading_data.html renamed to templates/store/package_header/_package_header_data.html

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
{%- from 'store/_developer_info.html' import developer_info -%}
2-
{%- from 'store/_publisher_info.html' import publisher_info -%}
1+
{%- from 'store/package_header/_developer_info.html' import developer_info -%}
2+
{%- from 'store/package_header/_publisher_info.html' import publisher_info -%}
33

44
{%- macro package_icon(
55
icon_url,
@@ -40,9 +40,6 @@
4040
VERIFIED_PUBLISHER) -%}
4141
<div class="p-section--shallow">
4242
<h1 class="u-sv-1" data-live="title">{{ package_title }}</h1>
43-
{# TODO:
44-
Extract the section below as own slot, to avoid dependency on a lot of publisher data?
45-
#}
4643
<div class="u-hide--medium u-hide--large">
4744
{% if developer %}
4845
{{ developer_info(name=developer[0], url=developer[1]) }}
File renamed without changes.

templates/store/snap-details.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% extends "_layout.html" %}
2-
{% from "store/_package_header.html" import package_header with context %}
2+
{% from "store/package_header/_package_header.html" import package_header with context %}
33

44
{% block meta_copydoc %}{% endblock %}
55

templates/store/snap-distro-install.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% extends "_layout.html" %}
2-
{% from "store/_package_header.html" import package_header with context %}
2+
{% from "store/package_header/_package_header.html" import package_header with context %}
33

44
{% block meta_copydoc %}{% endblock %}
55

0 commit comments

Comments
 (0)