From 67bbb02a2ff6156639c2097c171270bed8f6f1c0 Mon Sep 17 00:00:00 2001 From: pvincent Date: Tue, 29 Nov 2022 10:29:03 +0400 Subject: [PATCH] footer reuse --- lang/master/tpl/design.mtt | 56 +----------------- lang/master/tpl/footer.mtt | 55 ++++++++++++++++++ lang/master/tpl/group/view.mtt | 101 ++++++++++++++++----------------- 3 files changed, 106 insertions(+), 106 deletions(-) create mode 100644 lang/master/tpl/footer.mtt diff --git a/lang/master/tpl/design.mtt b/lang/master/tpl/design.mtt index e7894e7..4e7dcaf 100644 --- a/lang/master/tpl/design.mtt +++ b/lang/master/tpl/design.mtt @@ -123,60 +123,8 @@ --> - - -
-

- version cagettepei-::VERSION:: -

- ::if BANDEAU_REGION:: - bandeau Région Réunion - ::end:: - -
+ ::use 'footer.mtt':: + ::end:: -
-
- - - ::foreach r sqlLog:: - - - - - - - - ::end:: -
::r.t::ms::r.length::ExpStack::r.sql::
-
-
::end:: diff --git a/lang/master/tpl/footer.mtt b/lang/master/tpl/footer.mtt new file mode 100644 index 0000000..0f1dd46 --- /dev/null +++ b/lang/master/tpl/footer.mtt @@ -0,0 +1,55 @@ + + +
+

+ version cagettepei-::VERSION:: +

+ ::if BANDEAU_REGION:: + bandeau Région Réunion + ::end:: + +
+ +
+
+ + + ::foreach r sqlLog:: + + + + + + + + ::end:: +
::r.t::ms::r.length::ExpStack::r.sql::
+
+
diff --git a/lang/master/tpl/group/view.mtt b/lang/master/tpl/group/view.mtt index 1edf17f..1208f3b 100644 --- a/lang/master/tpl/group/view.mtt +++ b/lang/master/tpl/group/view.mtt @@ -1,6 +1,6 @@ ::use 'base.mtt':: - +
@@ -13,19 +13,19 @@ ::else:: ::end:: - - ::raw notification.text:: + + ::raw notification.text::
::end:: - + - +
- +

- + ::if group._image!=null:: ::if group.extUrl!=null && group.extUrl!="":: @@ -36,21 +36,21 @@ ::end::

- +

- + ::if isMember:: ::_("Go to my account"):: - + ::else:: - +

Inscriptions :

::switch group._regOption:: - + ::case::

::_("Contact the person in charge in order to subscribe to this group and get to know membership conditions."):: @@ -71,7 +71,7 @@ ::_("Subscription on waiting list")::

- + ::case::

@@ -84,12 +84,12 @@ ::_("This group is full and do not accept any more subscription.")::

::end:: - + ::end:: - - + +

- + ::if user==null::

::_("Already member? Log in:")::

@@ -97,26 +97,26 @@ ::_("Log in")::
::end:: - +
- +

::group.name::

- +

::if group.txtIntro!=null && group.txtIntro!="":: ::raw nl2br(group.txtIntro):: ::end::

- - + +

::_("Next deliveries")::

- + ::foreach d group.getDeliveries(4):: - +
::set s = getDate( d.date ):: ::if isToday(d.date):: @@ -125,15 +125,15 @@ $$date(::s.dow::,::s.d::,::s.m::,::s.y::,::d._place::) ::end::
- + ::end::

- +
- +

::_("Contact")::

- + ::group._contact.firstName:: ::group._contact.lastName::
@@ -144,52 +144,49 @@ ::group._contact.phone::

- +
- +

::_("Suppliers and products")::

::_("Non-complete extract of available products:")::

- + ::foreach c contracts::

::c.name::
::c._vendor.name::, $$nullSafe(::c._vendor.zipCode::) $$nullSafe(::c._vendor.city::)

::foreach p c.getProductsPreview(6):: -
-
+
+
- ::end:: + ::end::
-

+

::end:: - +

- +
- - - - - + + + + +
- +
- - -
-
- -
- - +
+ + ::use 'footer.mtt':: + ::end:: + ::end::