ulkoasuistua

code/MoyaUtilities/src/main/java/fi/codecrew/moya/enums/ActionLogMessageState.java

@@ -9,4 +9,9 @@ public enum ActionLogMessageState {
 		return "actionlog.messagestate." + name();
 	}
 	
+	public String getName() {
+		return name();
+	}
+	
+
 }

code/MoyaWeb/WebContent/actionlog/messagelist.xhtml

@@ -10,7 +10,7 @@
 			<!-- f:event type="preRenderView" listener="#{newsListView.initView}" /-->
 		</f:metadata>
 		<ui:define name="content">
-			<h:outputStylesheet library="style" name="insomnia2/css/actionlog.css" />
+			<h:outputStylesheet library="style" name="templates/insomnia2/css/actionlog.css" />
 			<h1>#{i18n['actionlog.messagelist.header']}</h1>
 			<p>#{i18n['actionlog.messagelist.description']}</p>
 			<h:form id="actionlog_create">
@@ -45,8 +45,9 @@
 			<h2>#{i18n['actionlog.tasklist.header']}</h2>
 			<div id="actionlog">
 				<h:form id="refresh">
-					<p:poll interval="1" update="actionlogtable" onerror="location.reload();" />
-					<p:dataTable styleClass="bordertable" id="actionlogtable" value="#{actionLogMessageView.messages}" var="message" paginator="true" rows="30" paginatorTemplate="{CurrentPageReport}  {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}" rowsPerPageTemplate="10,20,30,50,100" >
+					<p:poll interval="10" update="actionlogtable" onerror="location.reload();" />
+					<p:dataTable styleClass="bordertable" rowStyleClass="#{message.state.name}"
+					 id="actionlogtable" value="#{actionLogMessageView.messages}" var="message" paginator="true" rows="30" paginatorTemplate="{CurrentPageReport}  {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}" rowsPerPageTemplate="30,50,100" >
 						<p:column>
 							<f:facet name="header">
 								<h:outputText value="#{i18n['actionlog.time']}" />
@@ -75,6 +76,13 @@
 							<h:outputText value="#{message.message}" />
 						</p:column>
 						<p:column>
+
+							<f:facet name="header">
+								<h:outputText value="#{i18n['actionlog.state']}" />
+							</f:facet>
+							<h:outputText value="#{i18n[message.state.key]}" />
+						</p:column>
+						<p:column>
 							<h:link rendered="#{!empty message.state}" outcome="taskview">
 								<f:param name="id" value="#{message.id}" />
 								Näytä tehtävä

code/MoyaWeb/WebContent/resources/templates/custom_components.css

+/* Actionlog */
+
+
+#actionlog_create .row {
+	display: block;
+	clear: both;
+}
+
+#actionlog_create div, #actionlog_create h3 {
+	display: block;
+	float: left;
+}
+
+#actionlog_create h3 {
+	margin-bottom: 2px;
+}
+
+#actionlog_create .header {
+	font-weight: bold;
+}
+
+#actionlog_create .actionlog_create_role {
+	width: 100px;
+}
+
+#actionlog_create .actionlog_create_role select {
+	width: 100%;
+	margin: 0;
+	padding: 0;
+	border: 1px solid #aaa;
+}
+
+#actionlog_create .actionlog_create_message {
+	margin-left: 10px;
+	width: 420px;
+}
+
+#actionlog_create .actionlog_create_message input {
+	width: 100%;
+	margin: 0;
+	border: 1px solid #aaa;
+}
+
+#actionlog_create .actionlog_create_istask {
+	margin-left: 10px;
+	width: 60px;
+}
+
+#actionlog_create .actionlog_create_istask input {
+	display: block;
+	margin-left: auto;
+	margin-right: auto;
+}
+
+#actionlog_create input.sendbutton {
+	border: 1px solid #aaa;
+	margin-left: 10px;
+}
+
+#actionlog {
+	
+}
+
+#actionlog table {
+	width: 100%;
+	border-collapse:collapse;
+}
+
+#actionlog tr {
+}
+
+#actionlog td {
+}
+
+#actionlog tr.roweven {
+	background-color: #aeaeae;
+}
+
+#actionlog tr.rowodd {
+	background-color: #9a9a9a;
+}
+
+.taskHeader {
+	color: #7DAC0C;
+	font-size: 120%;
+	font-weight: bold;
+}
+
+.sendbutton2 {
+	border: 1px solid #aaa;
+	margin-left: 10px;
+}
+/* End of actionlog */
+
+
+#actionlog .DONE {
+	color: #006600;
+}
+
+#actionlog .NEW {
+	color: #660000;
+}
+
+#actionlog .PENDING {
+	color: #666600;
+}
+
+.expired {
+	color: #c0c0c0;
+}
+
+.paid {
+	color: #006600;
+}
\ No newline at end of file

code/MoyaWeb/WebContent/resources/templates/template1/template.xhtml

@@ -14,6 +14,7 @@
 		<meta name="author" content="CodeCrew ry" />
 		<meta name="viewport" content="width=device-width" />
 		<meta http-equiv="Content-Language" content="#{sessionHandler.locale}" />
+		<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/templates/custom_components.css" />
 		<link rel="icon" href="#{request.contextPath}/favicon.ico" type="image/x-icon" />
 		<link rel="stylesheet" href="#{request.contextPath}/resources/templates/template1/css/normalize.min.css" />
 		<link rel="stylesheet" href="#{request.contextPath}/resources/templates/template1/css//main.css" />
@@ -21,6 +22,7 @@
 		<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/templates/template1/css/general.css" />
 		<script src="#{request.contextPath}/resources/templates/template1/js/modernizr-2.6.2.min.js"></script>
 		
+
 		<h:outputStylesheet>
 		.bgColor1 {
 			background-color: #{layoutView.getLayoutProperty1('#68A3C2')};