From e63d6a529bf701430d501c2a99c675c9165e2db5 Mon Sep 17 00:00:00 2001 From: Norbert Glanc Date: Tue, 8 Jul 2025 11:07:59 +0200 Subject: [PATCH 1/3] Fix admin panel after upgrade to Sylius 2.0 --- .DS_Store | Bin 0 -> 6148 bytes src/.DS_Store | Bin 0 -> 6148 bytes src/Resources/.DS_Store | Bin 0 -> 6148 bytes src/Resources/config/app/config.yaml | 1 + src/Resources/config/routing/admin.yaml | 2 +- .../config/twig_hooks/feed/show.yaml | 38 ++++++ src/Resources/views/.DS_Store | Bin 0 -> 6148 bytes src/Resources/views/Admin/.DS_Store | Bin 0 -> 6148 bytes src/Resources/views/Admin/Feed/.DS_Store | Bin 0 -> 6148 bytes src/Resources/views/Admin/Feed/Show/.DS_Store | Bin 0 -> 6148 bytes .../Admin/Feed/Show/_breadcrumb.html.twig | 10 -- .../views/Admin/Feed/Show/content/.DS_Store | Bin 0 -> 6148 bytes .../Admin/Feed/Show/content/header/.DS_Store | Bin 0 -> 6148 bytes .../header/title_block/actions.html.twig | 10 ++ .../header/title_block/actions/edit.html.twig | 4 + .../actions/generate_feed.html.twig | 4 + .../header/title_block/title.html.twig} | 14 ++- .../Feed/Show/content/sections.html.twig | 5 + .../Show/content/sections/details.html.twig | 68 +++++++++++ .../Show/content/sections/general.html.twig | 7 ++ .../content/sections/state_info.html.twig | 22 ++++ .../views/Admin/Feed/Show/scripts.html.twig | 26 +++++ src/Resources/views/Admin/Feed/show.html.twig | 108 ------------------ 23 files changed, 194 insertions(+), 125 deletions(-) create mode 100644 .DS_Store create mode 100644 src/.DS_Store create mode 100644 src/Resources/.DS_Store create mode 100644 src/Resources/config/twig_hooks/feed/show.yaml create mode 100644 src/Resources/views/.DS_Store create mode 100644 src/Resources/views/Admin/.DS_Store create mode 100644 src/Resources/views/Admin/Feed/.DS_Store create mode 100644 src/Resources/views/Admin/Feed/Show/.DS_Store delete mode 100644 src/Resources/views/Admin/Feed/Show/_breadcrumb.html.twig create mode 100644 src/Resources/views/Admin/Feed/Show/content/.DS_Store create mode 100644 src/Resources/views/Admin/Feed/Show/content/header/.DS_Store create mode 100644 src/Resources/views/Admin/Feed/Show/content/header/title_block/actions.html.twig create mode 100644 src/Resources/views/Admin/Feed/Show/content/header/title_block/actions/edit.html.twig create mode 100644 src/Resources/views/Admin/Feed/Show/content/header/title_block/actions/generate_feed.html.twig rename src/Resources/views/Admin/Feed/Show/{_header.html.twig => content/header/title_block/title.html.twig} (63%) create mode 100644 src/Resources/views/Admin/Feed/Show/content/sections.html.twig create mode 100644 src/Resources/views/Admin/Feed/Show/content/sections/details.html.twig create mode 100644 src/Resources/views/Admin/Feed/Show/content/sections/general.html.twig create mode 100644 src/Resources/views/Admin/Feed/Show/content/sections/state_info.html.twig create mode 100644 src/Resources/views/Admin/Feed/Show/scripts.html.twig delete mode 100644 src/Resources/views/Admin/Feed/show.html.twig diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..e664197e78cad263452b20d1c63ed6d267a4c743 GIT binary patch literal 6148 zcmeHK-AcnS6i&A3CPV0jg5XWS+li|(9e7jfd;u$Zp)y-Lv{;+bcJ^Wn`U3hwzK74_ zIY|l*doAM5f#f^CN%KMT!x-c4EVLQ37-Jo1h#Zv~L3eGaVUiI!j*(4+SO#Ey1XC0H z>ww?hWEo4@Lr{GG{y56=e*cpeq;stTfT0x7rGQ4-3+m9r$wRIR528z5tAcRt^@2X?Q4!=z8BY(Ms zEMkBd_-738*2o*Vuqbo3{#YKKwF25bG!)D$Q2_yc=@I}2?jt)YsN({4$a4&q8gUf# Rt8zfP2q;3RBL;qffiJK1N+AFM literal 0 HcmV?d00001 diff --git a/src/.DS_Store b/src/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..baf13b46cc6177271de19de545f785cca266d3e5 GIT binary patch literal 6148 zcmeHK%}N6?5T3NvwiKZU1;I`uD4`PO%GfLs@{=w|&RPhC{>BJ~a0h)z z{P99G8~!2#w0C9b(4K*UFZ-7a{7Cueee(xVn56akyU67WYwJanO7X^fP-8FcrK6

Vz=pW61So7zb+HQlmIXbgpL{Wt47pXENDy z8cw|?o#xTBCMV9pp;ME`jplS(E^Y1ZpLDv9(NnBm45I>nJ}ny-XYh)hC5wCZhH<3g zd-TpSXBmvl05iZ0tONu0@GDhTVzs2s?EoKJMgCa~SqDd9@i6Kln+NF(iEoKHyItV>8e#g!%>PX5d#D_yF|DP67Y` literal 0 HcmV?d00001 diff --git a/src/Resources/.DS_Store b/src/Resources/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..6052866c4fd7f199eb5769818fffc9a5d4f04251 GIT binary patch literal 6148 zcmeHK%}T>S5Z>*NZ7D(z3WApfuN51mTJRELeE}nSP^k$C8jRV}w9TOu@&fuozK74_ z%`n$QqADkXyEQdh+UBXTuI>SyWLkELHS z&EGWPx7XR6MJ!|)TmAkIe;h~YwAcIOm1?cN)c|QX9^7Y{xl?aCOC4`=hofsLW53Wn z|0W8vQD^5uCQ~m;!ih?Vf)GOPZ=)oTnImUOkg8l)J6a&4&i-O?X!WgLS6GA7Wmhb$ z;}feZ&iaGpven!@I6A)?y~MAHeA8TVAYI9}!2;evSt)AnPLfzAPhc%Fibz6YfEXYK zh=C1cz#In6_6F8YB@+Y0z|Rce{ve>0lQo&Ni59)ai_?m0=#Ua`AZKYIU#+70$S=k$Pf)7+7bZs)rps|1aT} zDShOxr_hKPAO`*!1H3kLhYl2F&em_`;aMx7JwijlxEvJ_(AO>jFu;9ePdT+;pbl}i X!CWKGf_9Y-NEZP`2zA83FEH>0g=R~z literal 0 HcmV?d00001 diff --git a/src/Resources/config/app/config.yaml b/src/Resources/config/app/config.yaml index c5a034db..a28de2bb 100644 --- a/src/Resources/config/app/config.yaml +++ b/src/Resources/config/app/config.yaml @@ -1,6 +1,7 @@ imports: - { resource: "@SetonoSyliusFeedPlugin/Resources/config/grids/setono_sylius_feed_admin_feed.yaml" } - { resource: "@SetonoSyliusFeedPlugin/Resources/config/grids/setono_sylius_feed_admin_violation.yaml" } + - { resource: "@SetonoSyliusFeedPlugin/Resources/config/twig_hooks/*/*.yaml" } flysystem: storages: diff --git a/src/Resources/config/routing/admin.yaml b/src/Resources/config/routing/admin.yaml index bf9fa8d7..d66f8695 100644 --- a/src/Resources/config/routing/admin.yaml +++ b/src/Resources/config/routing/admin.yaml @@ -21,7 +21,7 @@ setono_sylius_feed_admin_feed_show: _sylius: section: admin permission: true - template: "@SetonoSyliusFeedPlugin/Admin/Feed/show.html.twig" + template: "@SyliusAdmin/shared/crud/show.html.twig" setono_sylius_feed_admin_feed_process: path: /feeds/{id}/process diff --git a/src/Resources/config/twig_hooks/feed/show.yaml b/src/Resources/config/twig_hooks/feed/show.yaml new file mode 100644 index 00000000..1aa5be26 --- /dev/null +++ b/src/Resources/config/twig_hooks/feed/show.yaml @@ -0,0 +1,38 @@ +sylius_twig_hooks: + hooks: + sylius_admin.feed.show.content: + sections: + template: '@SetonoSyliusFeedPlugin/Admin/feed/Show/content/sections.html.twig' + priority: 0 + + 'sylius_admin.feed.show.content.header': + breadcrumbs: + template: '@SyliusAdmin/shared/crud/show/content/header/breadcrumbs.html.twig' + priority: 0 + + sylius_admin.feed.show.content.header.title_block: + actions: + template: '@SetonoSyliusFeedPlugin/Admin/Feed/Show/content/header/title_block/actions.html.twig' + priority: 0 + + 'sylius_admin.feed.show.content.header.title_block.actions': + generate_feed: + template: '@SetonoSyliusFeedPlugin/Admin/Feed/Show/content/header/title_block/actions/generate_feed.html.twig' + priority: 200 + edit: + template: '@SetonoSyliusFeedPlugin/Admin/Feed/Show/content/header/title_block/actions/edit.html.twig' + priority: 100 + + sylius_admin.feed.show.content.sections: + state_info: + template: '@SetonoSyliusFeedPlugin/Admin/Feed/Show/content/sections/state_info.html.twig' + priority: 100 + details: + template: '@SetonoSyliusFeedPlugin/Admin/Feed/Show/content/sections/details.html.twig' + priority: 0 + + sylius_admin.feed.show#javascripts: + scripts: + template: '@SetonoSyliusFeedPlugin/Admin/Feed/Show/scripts.html.twig' + priority: 0 + diff --git a/src/Resources/views/.DS_Store b/src/Resources/views/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..a29db277aa07a2768c5ab4d4aecfa93d2973c0df GIT binary patch literal 6148 zcmeHK%}T>S5Z<+|Z7D(y3WApfuN51mTJREMeE}nSP^k$i8cegLY0aS&@&fuozK74_ z%# z2RG3$8(7;HGMV~OGMuP{C>%n_{cV(lGIQlD2~(BpX-5-eVC~K42X@!)w1wR}S+vF6 zK03DB;NSX%2H9U-Xw`-@&wi*qlhFV28aP- zfEZXq2Fzj5Xsu!GR5CF@4E)Rh?hgVQqGK@EsJ0I1@cNAYDk2K#_?AEv1|5UBM(}`e zoeHQ^xp`u6oep+k;v9pyMxD;MS{ddsD;JL!u2u)TP~nU_8mT7+h=ElGDtc()`F{z& zOz9(kHHAjR05R~-7~s{u*LR^PbGCjf56@Zw?GYLZ#^tDhfWC4GfC26!yUMBk0(FRU X4CWef7PPB$K)MJhLZ~AKeu056>4Qrl literal 0 HcmV?d00001 diff --git a/src/Resources/views/Admin/.DS_Store b/src/Resources/views/Admin/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..8ac7370d3c20b4e09b44cbbecc6a79776eb6b66c GIT binary patch literal 6148 zcmeHK-AcnS6i!@q8$;-Yg5XWS+li|(9e7jf^Z~5sh01Jc(PC}Jy4i~{=nLoz`5r!x z=On2(oVOzGoRNIzH)%dtei&oin?w#{He;*-4Uwa=K+wG~v|^GGIgSw)`7lgn2=<$a z{dK@^x7Znr;TL`V{&1Kk`MA@0=PNa9b*&E4s^9t#vhc^jc#?a;=o+mHDbujhgYYtm zi-EmyBC~OjWbsH9BvA}0H&;m($-TVt^PR28e+r zWxyN=jnAfV4(0>Hq1WJ?8gT%ZnluEA0x Uj)Hzw4oDXPMF@4oz%MZH0mKPPf&c&j literal 0 HcmV?d00001 diff --git a/src/Resources/views/Admin/Feed/.DS_Store b/src/Resources/views/Admin/Feed/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..4689eaf1fdff25e9fa1529027687e2ce46f14e2a GIT binary patch literal 6148 zcmeHK%}T>S5Z<-XwiF=;1;NXL*NTl&EqDpBzJL)usMLfM8;se~q~=fxc>#SP-^1r| zW_KeN>s7?g!0tD*GqaodAp64@Rw7?I-~VUdl)M229$ z8Q)(A{C11^Y{VohzJ7l=PU0-@bl&+|&0626gS6^*{zw*n9^})^3nn*cT}qjRl^%pw z@vs=!TW2!OgE$>dR6-mLA>{TtP9s@(a+*e&%JsFQ2{N#EXS02$>vY<}=^fA8V&)tk zIc;&$?ak-S#`fO9>BZnNc}nGr=9B~FN;VBv@CwRjNzeWyO=S82V^w?=M@S411H=F^ zu%Zl@1EJAc(fX-uVt^R;ek%{pS^@1I8VbghsDOaJa0vhd_mLgt)P8|F#JL7b VjW`RAt8_rR2q;3RBL;qffe){kO56Yd literal 0 HcmV?d00001 diff --git a/src/Resources/views/Admin/Feed/Show/.DS_Store b/src/Resources/views/Admin/Feed/Show/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..04a1e1b5b5b82f734a04806b216feff29473a83d GIT binary patch literal 6148 zcmeHK%}T>S5Z<-bwiF=;1;NXL*NTl&EqDpBzJL)usMN#+4aRI~Q*$VVynw!t@8R<} zv%3MSId~GWGqCw)=Vy24gX|AujJwm&X3S!YHK8GLR4N3`m97;NjL6j(5ldMXp8}C8pUgl@hiR+KAuy-zH z5|p|hT*Og6v^Gv;n)z`Wja5P%Mi6p+8K)&=-tpP+F?mYmi)NDp@k-VWmhcM7m%^UCahk~V9z11M8BItG z5Cg;jF|b4om_wl1UZR?*RAPV__!$GZKL}`uj=@5s+B)Ea*Jt$C5m7+Lw*;av=olU74{%rK6bxqQ5EH9Oda3TNEWNMB-r7+7SWrn?rN z|EKWFR6g<-Q>aG_5Ci{=0bUF$egg(T;FEH={C#y|S literal 0 HcmV?d00001 diff --git a/src/Resources/views/Admin/Feed/Show/_breadcrumb.html.twig b/src/Resources/views/Admin/Feed/Show/_breadcrumb.html.twig deleted file mode 100644 index 076a72ce..00000000 --- a/src/Resources/views/Admin/Feed/Show/_breadcrumb.html.twig +++ /dev/null @@ -1,10 +0,0 @@ -{% import '@SyliusAdmin/shared/helper/breadcrumbs.html.twig' as breadcrumb %} - -{% set breadcrumbs = [ - { name: 'sylius.ui.administration'|trans, url: path('sylius_admin_dashboard') }, - { name: 'setono_sylius_feed.ui.feeds'|trans, url: path('setono_sylius_feed_admin_feed_index') }, - { name: '#'~feed.id } -] -%} - -{{ breadcrumb.breadcrumbs(breadcrumbs) }} diff --git a/src/Resources/views/Admin/Feed/Show/content/.DS_Store b/src/Resources/views/Admin/Feed/Show/content/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..f6510777c033193b0aa90257e7ae7dc558aa4dea GIT binary patch literal 6148 zcmeHK!AiqG5S?wSO({YT3WApfuN51mTJRET{Q)C-P^pOtHW;&|N$sH&@&o!q{)gY= z%y>`cPEEISzhVC`XG1JnS(LM1Fza9AR=Pr4ulZ7Cr#`HT<-{wVGH zvG5nXjo~*kK;Ld1dJuvK0gkiZ@6GSWQJOUx@2pTPt*w_)s^wd^Cq{1OWy7@X4X$Z* zAw=v?=bnEVg`;k5^He067bW3921G%KE;mSD9 zw~i)tKDG}I?K(ehwkDH`wY9r{a^8K6pAzw+xMX*<_d8Kg{e?P70Psr!BjZfx%P83<_c9fFx`AG{br^+ z6eiz}&*#z|n4{2)h5^ICJOf3wtWo_x`@a954>BvmfMMWYF~CY4x6{UybZuQoj%qDO ty+b7-zg*#G2u@@vMqet$+o)2|&S`?^Xv`I&1;zXbNE*yw82C{JJ^+?fjGF)e literal 0 HcmV?d00001 diff --git a/src/Resources/views/Admin/Feed/Show/content/header/.DS_Store b/src/Resources/views/Admin/Feed/Show/content/header/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..73db0cb3ecfbd86856d4f77304c9441b60e3ce19 GIT binary patch literal 6148 zcmeHK!AiqG5S?wSZ7D(z3WApfuN51mDtHO8{(uoZsMN$34UO5-ruI+@`2qbQ|HJQb zW_Kf&+KUH~G6S=3c6KJqyo8-B00?i~bpYxBP(dXuRB`x0Xq|LH3f4m?^fP+Ufe>O) z@URfgj{nF2y}KHu5TVBK{r&aB$!HM9D#VEQa1ckMwAuU+g<@%Ky^K;T-}z5!;-^76 z9(lp=hGv&a#bIs-;Z@X|bn2UDDoKMV=?!&4)a_x&?RAuN)x=Zdq&w2NzFDZEbm}|P z>7LVanhoik9L*YX>Kq(84SC!;na!$|t=;|8i%vg&PSmSmRp1AxWy4|)Z)hwj@Wme{ zu}U5>BG1mV7?}ZPfEie62JE3%sjYOCTpTmN4E%-xIv*q|p=&WSsE-aD==YJ;f#_Py459~xe*`oQJTL=)%D^XFNKX*} literal 0 HcmV?d00001 diff --git a/src/Resources/views/Admin/Feed/Show/content/header/title_block/actions.html.twig b/src/Resources/views/Admin/Feed/Show/content/header/title_block/actions.html.twig new file mode 100644 index 00000000..f50fa764 --- /dev/null +++ b/src/Resources/views/Admin/Feed/Show/content/header/title_block/actions.html.twig @@ -0,0 +1,10 @@ +

+
+ +
+ {% hook 'actions' %} +
+
+
diff --git a/src/Resources/views/Admin/Feed/Show/content/header/title_block/actions/edit.html.twig b/src/Resources/views/Admin/Feed/Show/content/header/title_block/actions/edit.html.twig new file mode 100644 index 00000000..1ee802d7 --- /dev/null +++ b/src/Resources/views/Admin/Feed/Show/content/header/title_block/actions/edit.html.twig @@ -0,0 +1,4 @@ + + {{ ux_icon('tabler:pencil', {'class': 'icon dropdown-item-icon'}) }} + {{ 'sylius.ui.edit'|trans }} + diff --git a/src/Resources/views/Admin/Feed/Show/content/header/title_block/actions/generate_feed.html.twig b/src/Resources/views/Admin/Feed/Show/content/header/title_block/actions/generate_feed.html.twig new file mode 100644 index 00000000..0683d795 --- /dev/null +++ b/src/Resources/views/Admin/Feed/Show/content/header/title_block/actions/generate_feed.html.twig @@ -0,0 +1,4 @@ + + {{ ux_icon('tabler:reload', {'class': 'icon dropdown-item-icon'}) }} + {{ 'setono_sylius_feed.ui.generate_feed'|trans }} + diff --git a/src/Resources/views/Admin/Feed/Show/_header.html.twig b/src/Resources/views/Admin/Feed/Show/content/header/title_block/title.html.twig similarity index 63% rename from src/Resources/views/Admin/Feed/Show/_header.html.twig rename to src/Resources/views/Admin/Feed/Show/content/header/title_block/title.html.twig index cce09349..0b2abcdf 100644 --- a/src/Resources/views/Admin/Feed/Show/_header.html.twig +++ b/src/Resources/views/Admin/Feed/Show/content/header/title_block/title.html.twig @@ -1,13 +1,15 @@ -{# @var \Setono\SyliusFeedPlugin\Model\FeedInterface feed #} +{% import '@SyliusAdmin/shared/helper/header.html.twig' as header %} -

- -
+{% set feed = hookable_metadata.context.feed %} + +
+
{{ 'setono_sylius_feed.ui.feed'|trans }} {{ feed.name }} +
- {{ 'setono_sylius_feed.ui.feed_type'|trans ~ ': ' ~ feed.feedType }} {# todo output the label of the feed type #} + {{ 'setono_sylius_feed.ui.feed_type'|trans ~ ': ' ~ feed.feedType }}
{{ ('setono_sylius_feed.ui.' ~ feed.state)|trans }}
@@ -15,4 +17,4 @@
-

+ diff --git a/src/Resources/views/Admin/Feed/Show/content/sections.html.twig b/src/Resources/views/Admin/Feed/Show/content/sections.html.twig new file mode 100644 index 00000000..5e9221a8 --- /dev/null +++ b/src/Resources/views/Admin/Feed/Show/content/sections.html.twig @@ -0,0 +1,5 @@ +
+
+ {% hook 'sections' with { feed: hookable_metadata.context.resource.feed|default(null) } %} +
+
diff --git a/src/Resources/views/Admin/Feed/Show/content/sections/details.html.twig b/src/Resources/views/Admin/Feed/Show/content/sections/details.html.twig new file mode 100644 index 00000000..9815b6ab --- /dev/null +++ b/src/Resources/views/Admin/Feed/Show/content/sections/details.html.twig @@ -0,0 +1,68 @@ +{% set feed = hookable_metadata.context.resource %} + +{% if workflow_has_marked_place(feed, constant('Setono\\SyliusFeedPlugin\\Workflow\\FeedGraph::STATE_READY')) or workflow_has_marked_place(feed, constant('Setono\\SyliusFeedPlugin\\Workflow\\FeedGraph::STATE_PROCESSING')) %} +
+ + + + + + + + + + {% for channel in feed.channels %} + {% for locale in channel.locales %} + + + + + + {% endfor %} + {% endfor %} + +
{{ 'sylius.ui.channel'|trans }}{{ 'sylius.ui.locale'|trans }}{{ 'setono_sylius_feed.ui.link'|trans }}
+
+ {{ channel.name }} +
+ 		+
+ {{ locale.name }} +
+ 		+
+ + + + {{ ux_icon('tabler:copy', {'class': 'icon', 'style': 'vertical-align: text-top;'}) }} + +
+
+
+{% else %} +
+
{{ 'setono_sylius_feed.ui.unprocessed_feed_header'|trans }}
+
{{ 'setono_sylius_feed.ui.unprocessed_feed_body'|trans }}
+
+{% endif %} + +{% if feed.violations|length > 0 %} +
+
+

{{ 'setono_sylius_feed.ui.violation_summary'|trans }}

+ +

{{ 'setono_sylius_feed.ui.view_all_violations'|trans({'%path%' : path('setono_sylius_feed_admin_feed_violations_index', {'id' : feed.id})})|raw }}

+ + {{ render(controller('setono_sylius_feed.controller.action.admin.severity_count', {'feed': feed.id})) }} +
+
+{% endif %} diff --git a/src/Resources/views/Admin/Feed/Show/content/sections/general.html.twig b/src/Resources/views/Admin/Feed/Show/content/sections/general.html.twig new file mode 100644 index 00000000..8a0cca58 --- /dev/null +++ b/src/Resources/views/Admin/Feed/Show/content/sections/general.html.twig @@ -0,0 +1,7 @@ +
+
+
+ {% hook 'general' with { feed: hookable_metadata.context.resource } %} +
+
+
diff --git a/src/Resources/views/Admin/Feed/Show/content/sections/state_info.html.twig b/src/Resources/views/Admin/Feed/Show/content/sections/state_info.html.twig new file mode 100644 index 00000000..ee2b19ae --- /dev/null +++ b/src/Resources/views/Admin/Feed/Show/content/sections/state_info.html.twig @@ -0,0 +1,22 @@ +{% set feed = hookable_metadata.context.resource %} + +
+
+
+
+
{{ 'setono_sylius_feed.ui.feed'|trans }}
+
{{ feed.name }}
+
+ +
+
{{ 'setono_sylius_feed.ui.feed_type'|trans }}
+
{{ feed.feedType }}
+
+ +
+
{{ 'setono_sylius_feed.ui.state'|trans }}
+
{{ ('setono_sylius_feed.ui.' ~ feed.state)|trans }}
+
+
+
+
diff --git a/src/Resources/views/Admin/Feed/Show/scripts.html.twig b/src/Resources/views/Admin/Feed/Show/scripts.html.twig new file mode 100644 index 00000000..e2ac89dd --- /dev/null +++ b/src/Resources/views/Admin/Feed/Show/scripts.html.twig @@ -0,0 +1,26 @@ + + diff --git a/src/Resources/views/Admin/Feed/show.html.twig b/src/Resources/views/Admin/Feed/show.html.twig deleted file mode 100644 index 6620759c..00000000 --- a/src/Resources/views/Admin/Feed/show.html.twig +++ /dev/null @@ -1,108 +0,0 @@ -{% extends '@SyliusAdmin/shared/layout/base.html.twig' %} - -{# @var \Setono\SyliusFeedPlugin\Model\FeedInterface feed #} - -{% block title %}{{ 'setono_sylius_feed.ui.feed'|trans ~' '~ feed.name }} {{ parent() }}{% endblock %} - -{% block body %} - {% hook 'add_admin.custom' %} -
-
-
- {% include '@SetonoSyliusFeedPlugin/Admin/Feed/Show/_header.html.twig' %} -
- - {% set menu = knp_menu_get('setono_sylius_feed.admin.feed.show', [], {'feed': feed}) %} - {{ knp_menu_render(menu, {'template': '@SyliusAdmin/shared/crud/common/navbar/menu.html.twig'}) }} -
- - - {% include '@SetonoSyliusFeedPlugin/Admin/Feed/Show/_breadcrumb.html.twig' %} - - {% if workflow_has_marked_place(feed, constant('Setono\\SyliusFeedPlugin\\Workflow\\FeedGraph::STATE_READY')) or workflow_has_marked_place(feed, constant('Setono\\SyliusFeedPlugin\\Workflow\\FeedGraph::STATE_PROCESSING')) %} -
- - - - - - - - - - {% for channel in feed.channels %} - {% for locale in channel.locales %} - - - - - - {% endfor %} - {% endfor %} - -
{{ 'sylius.ui.channel'|trans }}{{ 'sylius.ui.locale'|trans }}{{ 'setono_sylius_feed.ui.link'|trans }}
{{ channel.name }}{{ locale.name }} -
- - - -
-
-
- {% else %} -
-
-
- {{ 'setono_sylius_feed.ui.unprocessed_feed_header'|trans }} -
-

{{ 'setono_sylius_feed.ui.unprocessed_feed_body'|trans }}

-
-
- {% endif %} - {% if feed.violations|length > 0 %} -

{{ 'setono_sylius_feed.ui.violation_summary'|trans }}

- -

{{ 'setono_sylius_feed.ui.view_all_violations'|trans({'%path%' : path('setono_sylius_feed_admin_feed_violations_index', {'id' : feed.id})})|raw }}

- - {{ render(controller('setono_sylius_feed.controller.action.admin.severity_count', {'feed': feed.id})) }} - {% endif %} -
-{% endblock %} - -{% block javascripts %} - {{ parent() }} - - -{% endblock %} From a463fcd0fe5c66ba568195c9fc02eb0466c5ad9b Mon Sep 17 00:00:00 2001 From: Norbert Glanc Date: Tue, 8 Jul 2025 12:07:15 +0200 Subject: [PATCH 2/3] Add stylesheets file, remove .ds_store files --- .DS_Store | Bin 6148 -> 0 bytes src/.DS_Store | Bin 6148 -> 0 bytes src/Resources/.DS_Store | Bin 6148 -> 0 bytes .../config/twig_hooks/feed/show.yaml | 4 ++ src/Resources/views/.DS_Store | Bin 6148 -> 0 bytes src/Resources/views/Admin/.DS_Store | Bin 6148 -> 0 bytes src/Resources/views/Admin/Feed/.DS_Store | Bin 6148 -> 0 bytes src/Resources/views/Admin/Feed/Show/.DS_Store | Bin 6148 -> 0 bytes .../views/Admin/Feed/Show/content/.DS_Store | Bin 6148 -> 0 bytes .../Admin/Feed/Show/content/header/.DS_Store | Bin 6148 -> 0 bytes .../Show/content/sections/details.html.twig | 9 ++--- .../views/Admin/Feed/Show/scripts.html.twig | 35 ++++++++-------- .../Admin/Feed/Show/stylesheets.html.twig | 38 ++++++++++++++++++ 13 files changed, 63 insertions(+), 23 deletions(-) delete mode 100644 .DS_Store delete mode 100644 src/.DS_Store delete mode 100644 src/Resources/.DS_Store delete mode 100644 src/Resources/views/.DS_Store delete mode 100644 src/Resources/views/Admin/.DS_Store delete mode 100644 src/Resources/views/Admin/Feed/.DS_Store delete mode 100644 src/Resources/views/Admin/Feed/Show/.DS_Store delete mode 100644 src/Resources/views/Admin/Feed/Show/content/.DS_Store delete mode 100644 src/Resources/views/Admin/Feed/Show/content/header/.DS_Store create mode 100644 src/Resources/views/Admin/Feed/Show/stylesheets.html.twig diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index e664197e78cad263452b20d1c63ed6d267a4c743..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK-AcnS6i&A3CPV0jg5XWS+li|(9e7jfd;u$Zp)y-Lv{;+bcJ^Wn`U3hwzK74_ zIY|l*doAM5f#f^CN%KMT!x-c4EVLQ37-Jo1h#Zv~L3eGaVUiI!j*(4+SO#Ey1XC0H z>ww?hWEo4@Lr{GG{y56=e*cpeq;stTfT0x7rGQ4-3+m9r$wRIR528z5tAcRt^@2X?Q4!=z8BY(Ms zEMkBd_-738*2o*Vuqbo3{#YKKwF25bG!)D$Q2_yc=@I}2?jt)YsN({4$a4&q8gUf# Rt8zfP2q;3RBL;qffiJK1N+AFM diff --git a/src/.DS_Store b/src/.DS_Store deleted file mode 100644 index baf13b46cc6177271de19de545f785cca266d3e5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK%}N6?5T3NvwiKZU1;I`uD4`PO%GfLs@{=w|&RPhC{>BJ~a0h)z z{P99G8~!2#w0C9b(4K*UFZ-7a{7Cueee(xVn56akyU67WYwJanO7X^fP-8FcrK6

Vz=pW61So7zb+HQlmIXbgpL{Wt47pXENDy z8cw|?o#xTBCMV9pp;ME`jplS(E^Y1ZpLDv9(NnBm45I>nJ}ny-XYh)hC5wCZhH<3g zd-TpSXBmvl05iZ0tONu0@GDhTVzs2s?EoKJMgCa~SqDd9@i6Kln+NF(iEoKHyItV>8e#g!%>PX5d#D_yF|DP67Y` diff --git a/src/Resources/.DS_Store b/src/Resources/.DS_Store deleted file mode 100644 index 6052866c4fd7f199eb5769818fffc9a5d4f04251..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK%}T>S5Z>*NZ7D(z3WApfuN51mTJRELeE}nSP^k$C8jRV}w9TOu@&fuozK74_ z%`n$QqADkXyEQdh+UBXTuI>SyWLkELHS z&EGWPx7XR6MJ!|)TmAkIe;h~YwAcIOm1?cN)c|QX9^7Y{xl?aCOC4`=hofsLW53Wn z|0W8vQD^5uCQ~m;!ih?Vf)GOPZ=)oTnImUOkg8l)J6a&4&i-O?X!WgLS6GA7Wmhb$ z;}feZ&iaGpven!@I6A)?y~MAHeA8TVAYI9}!2;evSt)AnPLfzAPhc%Fibz6YfEXYK zh=C1cz#In6_6F8YB@+Y0z|Rce{ve>0lQo&Ni59)ai_?m0=#Ua`AZKYIU#+70$S=k$Pf)7+7bZs)rps|1aT} zDShOxr_hKPAO`*!1H3kLhYl2F&em_`;aMx7JwijlxEvJ_(AO>jFu;9ePdT+;pbl}i X!CWKGf_9Y-NEZP`2zA83FEH>0g=R~z diff --git a/src/Resources/config/twig_hooks/feed/show.yaml b/src/Resources/config/twig_hooks/feed/show.yaml index 1aa5be26..ece053cf 100644 --- a/src/Resources/config/twig_hooks/feed/show.yaml +++ b/src/Resources/config/twig_hooks/feed/show.yaml @@ -36,3 +36,7 @@ sylius_twig_hooks: template: '@SetonoSyliusFeedPlugin/Admin/Feed/Show/scripts.html.twig' priority: 0 + sylius_admin.feed.show#stylesheets: + seo: + template: '@SetonoSyliusFeedPlugin/Admin/Feed/Show/stylesheets.html.twig' + priority: 0 diff --git a/src/Resources/views/.DS_Store b/src/Resources/views/.DS_Store deleted file mode 100644 index a29db277aa07a2768c5ab4d4aecfa93d2973c0df..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK%}T>S5Z<+|Z7D(y3WApfuN51mTJREMeE}nSP^k$i8cegLY0aS&@&fuozK74_ z%# z2RG3$8(7;HGMV~OGMuP{C>%n_{cV(lGIQlD2~(BpX-5-eVC~K42X@!)w1wR}S+vF6 zK03DB;NSX%2H9U-Xw`-@&wi*qlhFV28aP- zfEZXq2Fzj5Xsu!GR5CF@4E)Rh?hgVQqGK@EsJ0I1@cNAYDk2K#_?AEv1|5UBM(}`e zoeHQ^xp`u6oep+k;v9pyMxD;MS{ddsD;JL!u2u)TP~nU_8mT7+h=ElGDtc()`F{z& zOz9(kHHAjR05R~-7~s{u*LR^PbGCjf56@Zw?GYLZ#^tDhfWC4GfC26!yUMBk0(FRU X4CWef7PPB$K)MJhLZ~AKeu056>4Qrl diff --git a/src/Resources/views/Admin/.DS_Store b/src/Resources/views/Admin/.DS_Store deleted file mode 100644 index 8ac7370d3c20b4e09b44cbbecc6a79776eb6b66c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK-AcnS6i!@q8$;-Yg5XWS+li|(9e7jf^Z~5sh01Jc(PC}Jy4i~{=nLoz`5r!x z=On2(oVOzGoRNIzH)%dtei&oin?w#{He;*-4Uwa=K+wG~v|^GGIgSw)`7lgn2=<$a z{dK@^x7Znr;TL`V{&1Kk`MA@0=PNa9b*&E4s^9t#vhc^jc#?a;=o+mHDbujhgYYtm zi-EmyBC~OjWbsH9BvA}0H&;m($-TVt^PR28e+r zWxyN=jnAfV4(0>Hq1WJ?8gT%ZnluEA0x Uj)Hzw4oDXPMF@4oz%MZH0mKPPf&c&j diff --git a/src/Resources/views/Admin/Feed/.DS_Store b/src/Resources/views/Admin/Feed/.DS_Store deleted file mode 100644 index 4689eaf1fdff25e9fa1529027687e2ce46f14e2a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK%}T>S5Z<-XwiF=;1;NXL*NTl&EqDpBzJL)usMLfM8;se~q~=fxc>#SP-^1r| zW_KeN>s7?g!0tD*GqaodAp64@Rw7?I-~VUdl)M229$ z8Q)(A{C11^Y{VohzJ7l=PU0-@bl&+|&0626gS6^*{zw*n9^})^3nn*cT}qjRl^%pw z@vs=!TW2!OgE$>dR6-mLA>{TtP9s@(a+*e&%JsFQ2{N#EXS02$>vY<}=^fA8V&)tk zIc;&$?ak-S#`fO9>BZnNc}nGr=9B~FN;VBv@CwRjNzeWyO=S82V^w?=M@S411H=F^ zu%Zl@1EJAc(fX-uVt^R;ek%{pS^@1I8VbghsDOaJa0vhd_mLgt)P8|F#JL7b VjW`RAt8_rR2q;3RBL;qffe){kO56Yd diff --git a/src/Resources/views/Admin/Feed/Show/.DS_Store b/src/Resources/views/Admin/Feed/Show/.DS_Store deleted file mode 100644 index 04a1e1b5b5b82f734a04806b216feff29473a83d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK%}T>S5Z<-bwiF=;1;NXL*NTl&EqDpBzJL)usMN#+4aRI~Q*$VVynw!t@8R<} zv%3MSId~GWGqCw)=Vy24gX|AujJwm&X3S!YHK8GLR4N3`m97;NjL6j(5ldMXp8}C8pUgl@hiR+KAuy-zH z5|p|hT*Og6v^Gv;n)z`Wja5P%Mi6p+8K)&=-tpP+F?mYmi)NDp@k-VWmhcM7m%^UCahk~V9z11M8BItG z5Cg;jF|b4om_wl1UZR?*RAPV__!$GZKL}`uj=@5s+B)Ea*Jt$C5m7+Lw*;av=olU74{%rK6bxqQ5EH9Oda3TNEWNMB-r7+7SWrn?rN z|EKWFR6g<-Q>aG_5Ci{=0bUF$egg(T;FEH={C#y|S diff --git a/src/Resources/views/Admin/Feed/Show/content/.DS_Store b/src/Resources/views/Admin/Feed/Show/content/.DS_Store deleted file mode 100644 index f6510777c033193b0aa90257e7ae7dc558aa4dea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK!AiqG5S?wSO({YT3WApfuN51mTJRET{Q)C-P^pOtHW;&|N$sH&@&o!q{)gY= z%y>`cPEEISzhVC`XG1JnS(LM1Fza9AR=Pr4ulZ7Cr#`HT<-{wVGH zvG5nXjo~*kK;Ld1dJuvK0gkiZ@6GSWQJOUx@2pTPt*w_)s^wd^Cq{1OWy7@X4X$Z* zAw=v?=bnEVg`;k5^He067bW3921G%KE;mSD9 zw~i)tKDG}I?K(ehwkDH`wY9r{a^8K6pAzw+xMX*<_d8Kg{e?P70Psr!BjZfx%P83<_c9fFx`AG{br^+ z6eiz}&*#z|n4{2)h5^ICJOf3wtWo_x`@a954>BvmfMMWYF~CY4x6{UybZuQoj%qDO ty+b7-zg*#G2u@@vMqet$+o)2|&S`?^Xv`I&1;zXbNE*yw82C{JJ^+?fjGF)e diff --git a/src/Resources/views/Admin/Feed/Show/content/header/.DS_Store b/src/Resources/views/Admin/Feed/Show/content/header/.DS_Store deleted file mode 100644 index 73db0cb3ecfbd86856d4f77304c9441b60e3ce19..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK!AiqG5S?wSZ7D(z3WApfuN51mDtHO8{(uoZsMN$34UO5-ruI+@`2qbQ|HJQb zW_Kf&+KUH~G6S=3c6KJqyo8-B00?i~bpYxBP(dXuRB`x0Xq|LH3f4m?^fP+Ufe>O) z@URfgj{nF2y}KHu5TVBK{r&aB$!HM9D#VEQa1ckMwAuU+g<@%Ky^K;T-}z5!;-^76 z9(lp=hGv&a#bIs-;Z@X|bn2UDDoKMV=?!&4)a_x&?RAuN)x=Zdq&w2NzFDZEbm}|P z>7LVanhoik9L*YX>Kq(84SC!;na!$|t=;|8i%vg&PSmSmRp1AxWy4|)Z)hwj@Wme{ zu}U5>BG1mV7?}ZPfEie62JE3%sjYOCTpTmN4E%-xIv*q|p=&WSsE-aD==YJ;f#_Py459~xe*`oQJTL=)%D^XFNKX*} diff --git a/src/Resources/views/Admin/Feed/Show/content/sections/details.html.twig b/src/Resources/views/Admin/Feed/Show/content/sections/details.html.twig index 9815b6ab..d120246f 100644 --- a/src/Resources/views/Admin/Feed/Show/content/sections/details.html.twig +++ b/src/Resources/views/Admin/Feed/Show/content/sections/details.html.twig @@ -26,18 +26,17 @@

- - + + data-position="top right"> {{ ux_icon('tabler:copy', {'class': 'icon', 'style': 'vertical-align: text-top;'}) }}
diff --git a/src/Resources/views/Admin/Feed/Show/scripts.html.twig b/src/Resources/views/Admin/Feed/Show/scripts.html.twig index e2ac89dd..0e79a2b1 100644 --- a/src/Resources/views/Admin/Feed/Show/scripts.html.twig +++ b/src/Resources/views/Admin/Feed/Show/scripts.html.twig @@ -1,26 +1,25 @@ - diff --git a/src/Resources/views/Admin/Feed/Show/stylesheets.html.twig b/src/Resources/views/Admin/Feed/Show/stylesheets.html.twig new file mode 100644 index 00000000..d7c0ec97 --- /dev/null +++ b/src/Resources/views/Admin/Feed/Show/stylesheets.html.twig @@ -0,0 +1,38 @@ + From 90ec3e97e19b9a229f15bc334e28944a7d3c9c9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Kukli=C5=84ski?= Date: Fri, 1 Aug 2025 12:44:46 +0200 Subject: [PATCH 3/3] Update show.yaml --- src/Resources/config/twig_hooks/feed/show.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Resources/config/twig_hooks/feed/show.yaml b/src/Resources/config/twig_hooks/feed/show.yaml index ece053cf..5ad9f3fe 100644 --- a/src/Resources/config/twig_hooks/feed/show.yaml +++ b/src/Resources/config/twig_hooks/feed/show.yaml @@ -2,7 +2,7 @@ sylius_twig_hooks: hooks: sylius_admin.feed.show.content: sections: - template: '@SetonoSyliusFeedPlugin/Admin/feed/Show/content/sections.html.twig' + template: '@SetonoSyliusFeedPlugin/Admin/Feed/Show/content/sections.html.twig' priority: 0 'sylius_admin.feed.show.content.header':