Merge branch 'main' into eval_htmx_button

zms-publishing · Sep 6, 2024 · 96bc298 · 96bc298
2 parents 793c623 + 76a0c18
commit 96bc298
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/Products/zms/plugins/www/zmi.core.css b/Products/zms/plugins/www/zmi.core.css
@@ -2387,17 +2387,21 @@ body.lazy_select_form footer .controls {
 	border:1px dotted #607D8B;
 }
 .zmi.config.users .list_users table.show_lastlogin tr.userName td:before {
-	content:attr(data-lastlogin);
-	display:block;
+	content: "0000-00-00";
+	display: inline-block;
 	right:0;
 	color:white;
 	font-family:monospace;
-	float:right;
 	font-size:11px;
 	position:absolute;
-	background:#333333;
-	padding:.1rem .5rem;;
+	background: #4950573d;
+	padding:.1rem .5rem;
 	margin-top:-.5rem;
+	margin-top:-.5rem;
+}
+.zmi.config.users .list_users table.show_lastlogin tr.userName td[data-lastlogin]:before {
+	background:#333333;
+	content:attr(data-lastlogin);
 }
 /* ZMSLinkElement */
 .zmi #tr_attr_ref #tr_attr_ref_type select#attr_type {

diff --git a/Products/zms/zpt/common/zmi_html_head.zpt b/Products/zms/zpt/common/zmi_html_head.zpt
@@ -38,7 +38,7 @@
 			added_js_zmi_href python:added_js_zmi.replace('$ZMS_HOME/',ZMS_HOME).replace('$ZMS_THEME/',ZMS_THEME);"
 		tal:condition="python:added_js_zmi.find('.js')>-1"
 		tal:attributes="src added_js_zmi_href"></script>
-	<tal:block tal:condition="python:not standard.get_session_value(here,'did_update_userdata')">
+	<tal:block tal:condition="python:not standard.get_session_value(here,'did_update_userdata') and 'Manager' not in request.get('AUTHENTICATED_USER').getRoles()">
 		<tal:block tal:condition="python:here.getUserAttr(request['AUTHENTICATED_USER'],'forceChangePassword',0)==1">
 			<script type="text/javascript">$(function(){$ZMI.forceChangePassword()});</script>
 		</tal:block>