Merge branch 'main' into eval_htmx_button

Products/zms/zpt/common/zmi_tabs.zpt

@@ -1,19 +1,28 @@
 <div xmlns:hx-on="https://htmx.org/" class="collapse navbar-collapse row" id="tabs_items">
 	<ul class="nav nav-tabs" tal:define="global
-			current python:request['URL'].split('/')[-1];
-			options options/options;
-			actions python:[x.get('alias',x['action']) for x in options];
-			active python:[
-				(x==current and not here.id+'/'+current in actions) or
-				(x==here.id+'/'+current) or
-				(current not in actions and current.startswith(x)) for x in actions];
-				noactive python:len([x for x in active if x])<1;
-		"><tal:block tal:repeat="i python:range(len(options))"
+		current python:request['URL'].split('/')[-1];
+		options options/options;
+		actions python:[x.get('alias',x['action']) for x in options];
+		active python:[
+			(x==current and not here.id+'/'+current in actions) or
+			(x==here.id+'/'+current) or
+			(current not in actions and current.startswith(x)) for x in actions];
+		noactive python:len([x for x in active if x])<1;"
+		><tal:block tal:repeat="i python:range(len(options))"
 			><tal:block tal:define="option python:options[i]"
-				><li class="nav-item" hx-target="body" hx-push-url="true" 
-					tal:attributes="data-action option/action; hx-get python:here.url_append_params('%s/%s?lang=%s'%(here.getSelf().absolute_url(),option['action'],request['lang']),option.get('params',{}),sep='&');"
-					><a tal:attributes="class python:' '.join(['nav-link']+[['','active'][int(active[i] or (i==0 and noactive))]])"
-					tal:content="structure python:here.getZMILangStr(option['label'])">label</a>
+				><li class="nav-item" tal:attributes="data-action option/action;"
+					><a class="nav-link"
+						tal:define="
+							url python:here.url_append_params('%s/%s?lang=%s'%(here.getSelf().absolute_url(),option['action'],request['lang']),option.get('params',{}),sep='&');
+							css_class python:' '.join(['nav-link']+[['','active'][int(active[i] or (i==0 and noactive))]]);
+							label python:here.getZMILangStr(option['label']);"
+						hx-target="body" 
+						hx-push-url="true" 
+						hx-trigger="click"
+						tal:attributes="href url; hx-get url;class css_class;"
+						tal:content="structure label">
+						label
+					</a>
 				</li>
 			</tal:block>
 		</tal:block>