Skip to content

Riina Antikainen / Moya

Go to a project
Commit 76382d04 by Antti Tonkyra
Options

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

2 parents 4a0d4c8d ca6d414f
Expand all
Inline Side-by-side
Showing with 93 additions and 3 deletions
code/LanBortalWeb/WebContent/actionlog/messagelist.xhtml
......@@ -47,7 +47,7 @@
</h:form>
<div class="clearfix"></div>
<h2>#{i18n['actionlog.tasklist.header']}</h2>
<div id="actionlog">
<div id="actionlog">
<h:form id="refresh">
<p:poll interval="1" update="actionlogtable" />
<h:dataTable styleClass="bordertable" rowClasses="roweven,rowodd" id="actionlogtable" value="#{actionLogMessageView.messages}" var="message">
......@@ -79,10 +79,12 @@
<h:outputText value="#{message.message}" />
</h:column>
<h:column>
x
<h:link rendered="#{!empty message.state}" >
Näytä tehtävä
</h:link>
</h:column>
</h:dataTable>
</h:form>
</h:form>
</div>
</ui:define>
</ui:composition>
......
code/LanBortalWeb/WebContent/actionlog/taskview.xhtml 0 → 100644
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<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:tools="http://java.sun.com/jsf/composite/cditools" xmlns:f="http://java.sun.com/jsf/core"
>
<h:body>
<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
<f:metadata>
<!-- f:event type="preRenderView" listener="#{newsListView.initView}" /-->
</f:metadata>
<ui:define name="content">
<h:outputStylesheet library="style" name="insomnia2/css/actionlog.css"></h:outputStylesheet>
<h1>Task: insert id<!-- #{i18n['actionlog.messagelist.header']} --></h1>
<!-- <p>Mo #{i18n['actionlog.messagelist.description']} </p> -->
<table>
<tr>
<td><h:outputText class="taskHeader" value="Submit time/date: " /></td>
<td><h:outputText value="21.12.2012" /></td>
</tr>
<tr>
<td><h:outputText class="taskHeader" value="Submitter: " /></td>
<td><h:outputText value="infopoika69" /></td>
</tr>
<tr>
<td><h:outputText class="taskHeader" value="Target crew: " /></td>
<td><h:outputText value="net" /></td>
</tr>
<tr>
<td><h:outputText class="taskHeader" value="State: " /></td>
<td><h:outputText value="odottaa nappaamista" /></td>
</tr>
<tr>
<td><h:outputText class="taskHeader" value="Message: " /></td>
<td><h:outputText value="verkko ei toimi." /></td>
</tr>
</table>
<div class="clearfix"></div>
<div id="actionlog">
</div>
</ui:define>
</ui:composition>
</h:body>
</html>
\ No newline at end of file
code/LanBortalWeb/WebContent/resources/style/insomnia2/css/actionlog.css
......@@ -77,4 +77,10 @@
#actionlog tr.rowodd {
background-color: #9a9a9a;
}
.taskHeader {
color: #7DAC0C;
font-size: 120%;
font-weight: bold;
}
\ No newline at end of file
code/LanBortalWeb/src/fi/insomnia/bortal/web/converter/ActionlogTaskTypeConverter.java 0 → 100644
package fi.insomnia.bortal.web.converter;
import javax.enterprise.context.RequestScoped;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.convert.Converter;
import javax.inject.Named;
@Named("taskTypeConverter")
@RequestScoped
public class ActionlogTaskTypeConverter implements Converter {
@Override
public Object getAsObject(FacesContext context, UIComponent component,
String value) {
// TODO Auto-generated method stub
return null;
}
@Override
public String getAsString(FacesContext context, UIComponent component,
Object value) {
if(value == null) {
return "";
}
else {
return "x";
}
}
}
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!