Skip to content

Antti Väyrynen / Moya

Go to a project
Commit f2ae3181 by Juho
Options

Merge branch 'master' of juhosa@dev.insomnia.fi:/data/bortal.git

2 parents 0bb30637 b2c13f47
Inline Side-by-side
Showing with 2 additions and 4 deletions
code/LanBortalWeb/WebContent/actionlog/messagelist.xhtml
...@@ -4,8 +4,7 @@ ...@@ -4,8 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html" xmlns:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:h="http://java.sun.com/jsf/html" xmlns:users="http://java.sun.com/jsf/composite/cditools/user"
xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:f="http://java.sun.com/jsf/core" xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:f="http://java.sun.com/jsf/core"
xmlns:p="http://primefaces.org/ui" xmlns:p="http://primefaces.org/ui">
>
<h:body> <h:body>
<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml"> <ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
...@@ -13,7 +12,7 @@ ...@@ -13,7 +12,7 @@
<!-- f:event type="preRenderView" listener="#{newsListView.initView}" /--> <!-- f:event type="preRenderView" listener="#{newsListView.initView}" /-->
</f:metadata> </f:metadata>
<ui:define name="content"> <ui:define name="content">
<h:outputStylesheet library="style" name="insomnia2/css/actionlog.css"></h:outputStylesheet> <h:outputStylesheet library="style" name="insomnia2/css/actionlog.css" />
<h1>#{i18n['actionlog.messagelist.header']}</h1> <h1>#{i18n['actionlog.messagelist.header']}</h1>
<p>#{i18n['actionlog.messagelist.description']}</p> <p>#{i18n['actionlog.messagelist.description']}</p>
<h:form id="actionlog_create"> <h:form id="actionlog_create">
...@@ -84,7 +83,6 @@ ...@@ -84,7 +83,6 @@
</h:column> </h:column>
</h:dataTable> </h:dataTable>
</h:form> </h:form>
</div> </div>
</ui:define> </ui:define>
</ui:composition> </ui:composition>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!