Commit 7c3c245
chore(templates): resolve merge conflict keeping class-based panels and main features
Merge origin/main into simpler-template. Two conflicted paths;
everything else merged cleanly and is staged as-is.
Context of each side:
- This PR (simpler-template) de-inlines presentation from the knowledge
panel template: templates/web/panels/panel.tt.html no longer carries
style="..." attributes; the corresponding rules were moved into
scss/_product-page.scss as reusable classes (.panel_small,
.panel_margin_small/.panel_margin_large, .panel_title_small,
.panel_icon very_small/small/large, .small-panel, .small-subtitle,
.text-icon, .text-container, .valign-middle, .custom-class,
.custom-container, .image_source, .hidden).
- main kept the inline styles but functionally extended the same areas
of panel.tt.html: panels without elements now render an inactive
accordion item (new has_elements variable, accordion-navigation-inactive
class, <a> switched to <div> via IF has_elements); new title fallbacks
(title -> name) plus new value_string / value (with percent type)
subtitle branches; image imgid lookup and nutripatrol_url parameter;
actions wrapped in <div>; table_id renamed to element.id; map block
rewritten as an ES module import.
scss/_product-page.scss:
- Conflict was two independent additions at the end of the file.
Resolution keeps both blocks verbatim: first the knowledge panel
classes from this PR (required by the refactored template - dropping
them would leave every panel size/icon/text rule undefined), then
main's SVG barcode responsive rules (#barcode_div_code/#barcode_div_svg
inline-block, hidden under 600px). No selector or declaration was
modified; only the three conflict marker lines were removed.
templates/web/panels/panel.tt.html:
- wrapper_for_other_types header: applied main's functional changes on
top of the PR's class-based markup. The <ul> keeps the
panel_margin_[small|large] class instead of main's inline margins;
the <li> gains main's accordion-navigation-inactive when
has_elements is false; the title tag uses main's <a>/<div> switch
while keeping the PR's panel_title_small class instead of main's
inline padding style.
- subtitle block: kept the PR's class-based span for the existing
subtitle branch, and grafted main's new value_string / value /
percent branches onto it. Their inline style="font-size:0.9rem;"
were expressed through the PR's equivalent small-subtitle class so
that new content introduced by main follows this PR's stated goal
(no inline styles in templates). Trailing whitespace from main's
line was dropped.
- Everything outside the conflict regions is the auto-merge result:
main's has_elements logic, name/title fallback, value_string/value
branches, image handling, action wrappers, table id and module-based
map are all retained unchanged.
Verification: no conflict markers remain; Template::Toolkit directive
counts of the resolved file (opens 65 / ends 67) match main's side
exactly, with the same pre-existing +2 comment-banner offset already
present in both parents, so no block was broken by the resolution.
Merge conflict resolved by Ox Alpha Free (Unlimited), running via
OpenCode Zen.
Co-authored-by: hangy <hangy@hangy.de>5,106 files changed
Lines changed: 2915417 additions & 1052551 deletions
File tree
- .devcontainer
- .gemini
- .github
- ISSUE_TEMPLATE
- scripts
- workflows
- .sonarlint
- .test_groups_cache
- .vscode
- cgi
- conf
- apache-2.4
- sites-available
- apache2-docker
- etc-default
- logrotate
- mongodb
- nginx-docker
- nginx
- conf.d
- sites-available
- snippets
- pro-platform
- systemd
- apache2.service.d
- apache2@.service.d
- nginx.service.d
- well-known
- docker
- docs
- api
- ref
- examples
- parameters
- redocly
- requestBodies
- responses
- response-status
- schemas
- knowledge_panels
- elements
- packagings
- tags
- taxonomies
- tutorials
- assets
- dev
- events
- messages
- env
- external-data
- ecoscore/agribalyse
- environmental_score
- agribalyse
- data
- forest-footprint/2026
- ifct
- howmuchsugar
- en
- fr
- html
- .well-known
- donate
- images
- attributes/src
- favicon
- obf
- off
- opff
- opf
- icons/packaging-shapes
- lang
- da/labels
- de/labels
- en/labels
- es
- categories
- labels
- fi/labels
- fr/labels
- nl
- sv/labels
- logos
- misc
- app-landing-page/mobile-app-preview
- banners
- donation-banners
- f-droid/svg
- nutriscore
- playstore/img/latest
- panels
- divinfood
- fr-impact-co2
- recommendations/fr
- report_problem
- secondhand
- partner_logos
- producers
- svg
- js
- resources/files
- icons
- material
- lib
- ProductOpener
- madenearme
- overrides
- packager-codes
- po
- common
- openbeautyfacts
- openfoodfacts
- openpetfoodfacts
- openproductsfacts
- tags
- projects/foodture
- scripts
- benchmarks
- deploy
- images
- imports
- alnatura
- carrefour
- csv2product_opener
- fdc
- config
- data
- script
- stats
- config
- scripts
- test
- integration
- unit
- script
- folksonomy_engine
- indice_reparabilite_france
- intermarche
- nestledeutschland
- systemeu
- migrations
- obsolete
- imports
- fleary_michon
- migrations
- taxonomies-wikidata
- packager-codes
- common
- non-eu
- tests
- common
- test_files
- snippets
- sync-s3-images
- taxonomies
- generators
- google_product_taxonomy_data
- usda-import
- scss
- sveetoy
- taxonomies
- beauty
- food
- old
- off
- additives_classes
- additives
- nutritional-substances
- petfood
- product
- unused
- templates
- api/knowledge-panels
- environment
- ecoscore
- environmental_score
- health
- ingredients
- nutriscore
- nutrition
- product
- recommendations
- from_taxonomies
- health
- fr
- world
- report_problem
- secondhand
- emails
- en
- fr
- web
- common
- includes
- pages
- change_password
- countries_map
- dashboard
- export_products
- import_file_process
- import_file_select_format
- import_file_upload
- import_product_categories_process
- import_product_categories
- org_form
- product_edit
- products_map
- product
- includes
- recipes
- remove_products
- reset_password
- robots
- search_form
- search_results
- session
- tags_map
- tag
- test_ingredients
- top_translators
- user_form
- user_profile
- panels
- tests
- data/categories_stats
- integration
- expected_test_results
- api_attribute_groups
- api_cgi_nutrients
- api_cgi_suggest
- api_current_user_permissions
- api_v2_product_read
- t
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Binary file not shown.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
| 3 | + | |
3 | 4 | | |
4 | 5 | | |
5 | 6 | | |
| 7 | + | |
6 | 8 | | |
7 | 9 | | |
8 | | - | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
9 | 13 | | |
10 | 14 | | |
11 | 15 | | |
| |||
16 | 20 | | |
17 | 21 | | |
18 | 22 | | |
19 | | - | |
20 | 23 | | |
21 | 24 | | |
22 | 25 | | |
23 | 26 | | |
24 | | - | |
| 27 | + | |
| 28 | + | |
25 | 29 | | |
26 | 30 | | |
27 | 31 | | |
| |||
36 | 40 | | |
37 | 41 | | |
38 | 42 | | |
39 | | - | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
40 | 46 | | |
41 | 47 | | |
42 | 48 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
| 2 | + | |
2 | 3 | | |
3 | 4 | | |
4 | 5 | | |
| |||
7 | 8 | | |
8 | 9 | | |
9 | 10 | | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
10 | 15 | | |
11 | 16 | | |
12 | 17 | | |
| |||
36 | 41 | | |
37 | 42 | | |
38 | 43 | | |
39 | | - | |
| 44 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
6 | | - | |
| 6 | + | |
7 | 7 | | |
8 | 8 | | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
9 | 12 | | |
10 | 13 | | |
11 | 14 | | |
| |||
25 | 28 | | |
26 | 29 | | |
27 | 30 | | |
| 31 | + | |
28 | 32 | | |
29 | 33 | | |
30 | 34 | | |
| |||
45 | 49 | | |
46 | 50 | | |
47 | 51 | | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
48 | 56 | | |
49 | 57 | | |
| 58 | + | |
50 | 59 | | |
51 | 60 | | |
52 | 61 | | |
53 | 62 | | |
54 | 63 | | |
55 | | - | |
56 | | - | |
| 64 | + | |
| 65 | + | |
57 | 66 | | |
58 | 67 | | |
59 | 68 | | |
| |||
63 | 72 | | |
64 | 73 | | |
65 | 74 | | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
66 | 118 | | |
67 | | - | |
| 119 | + | |
| 120 | + | |
This file was deleted.
0 commit comments