Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
issue #598
  • Loading branch information
rsoika committed Sep 4, 2024
1 parent 71ef92a commit 05105b8
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 30 deletions.
34 changes: 17 additions & 17 deletions imixs-office-workflow-app/src/main/webapp/error.xhtml
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
template="/layout/template.xhtml">

<ui:define name="content">
<!-- Display only if error messages available -->
<h:panelGroup styleClass="ui-widget">
<div class="ui-state-error ui-corner-all"
style="padding: .7em; margin-bottom: .7em;">
<div class="ui-state-error ui-corner-all" style="padding: .7em; margin-bottom: .7em;">
<h3>
<span class="typcn typcn-weather-partly-sunny"></span>
#{message.error_message_general_title}
</h3>
<p>#{message.error_message_general}</p>
<strong><h:outputText value="#{session.lastAccessedTime}">
<f:convertDateTime pattern="#{message.dateTimePatternLong}" timeZone="#{message.timeZone}"
type="date" />
</h:outputText> :</strong> <br />
<strong>Local Client Time: <span id="datetime"></span></strong>
<br />
<!-- display exception details -->
<h:panelGroup layout="block"
style="background: #EEE; padding: 10px; margin: 5px 0 20px 0;border: 1px solid #999;"
rendered="#{! empty requestScope['jakarta.servlet.error.exception']}">
<h:outputText
value="#{requestScope['jakarta.servlet.error.exception']}" />
</h:panelGroup>
<h:outputText value="#{requestScope['jakarta.servlet.error.exception']}" />
</h:panelGroup>
</div>
<h:form>
<h:commandButton action="home" value="#{message.close}"
immediate="true" />
<h:commandButton action="home" value="#{message.close}" immediate="true" />
</h:form>

</h:panelGroup>

<script type="text/javascript">
/*<![CDATA[*/
const now = new Date();
const currentDateTime = now.toUTCString();
document.querySelector('#datetime').textContent = currentDateTime;
/*]]>*/
</script>
</ui:define>
</ui:composition>
</ui:composition>
17 changes: 4 additions & 13 deletions imixs-office-workflow-app/src/main/webapp/loginerror.xhtml
Original file line number Diff line number Diff line change
@@ -1,31 +1,22 @@
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
xmlns:h="http://xmlns.jcp.org/jsf/html"
template="/layout/template.xhtml">


<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:f="http://xmlns.jcp.org/jsf/core" xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
xmlns:h="http://xmlns.jcp.org/jsf/html" template="/layout/template.xhtml">

<ui:define name="content">

<h:form id="logoutform">

<div class="imixs-form">
<div class="imixs-header">
<h1>#{message['login.login_error']}</h1>
</div>
<div class="imixs-body">
<div class="imixs-form-panel">

<p>
#{message['login.login_error_help']}<br /> <br /> <br />
</p>
<h:commandButton value="#{message.continue}" action="login" />
</div>
</div>
</div>

</h:form>
</ui:define>
</ui:composition>
</ui:composition>

0 comments on commit 05105b8

Please sign in to comment.