Skip to content

Codecrew / Moya

Go to a project
Commit de8be004 by Tuukka Kivilahti
Options

ulkoasuistua

1 parent 30fc37b0
Inline Side-by-side
Showing with 133 additions and 3 deletions
code/MoyaUtilities/src/main/java/fi/codecrew/moya/enums/ActionLogMessageState.java
...@@ -8,5 +8,10 @@ public enum ActionLogMessageState { ...@@ -8,5 +8,10 @@ public enum ActionLogMessageState {
public String getKey(){ public String getKey(){
return "actionlog.messagestate." + name(); return "actionlog.messagestate." + name();
} }
public String getName() {
return name();
}
} }
code/MoyaWeb/WebContent/actionlog/messagelist.xhtml
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,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 library="style" name="templates/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">
...@@ -45,8 +45,9 @@ ...@@ -45,8 +45,9 @@
<h2>#{i18n['actionlog.tasklist.header']}</h2> <h2>#{i18n['actionlog.tasklist.header']}</h2>
<div id="actionlog"> <div id="actionlog">
<h:form id="refresh"> <h:form id="refresh">
<p:poll interval="1" update="actionlogtable" onerror="location.reload();" /> <p:poll interval="10" 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: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> <p:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="#{i18n['actionlog.time']}" /> <h:outputText value="#{i18n['actionlog.time']}" />
...@@ -75,6 +76,13 @@ ...@@ -75,6 +76,13 @@
<h:outputText value="#{message.message}" /> <h:outputText value="#{message.message}" />
</p:column> </p:column>
<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"> <h:link rendered="#{!empty message.state}" outcome="taskview">
<f:param name="id" value="#{message.id}" /> <f:param name="id" value="#{message.id}" />
Näytä tehtävä Näytä tehtävä
......
code/MoyaWeb/WebContent/resources/templates/custom_components.css 0 → 100644
/* 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,12 +14,14 @@ ...@@ -14,12 +14,14 @@
<meta name="author" content="CodeCrew ry" /> <meta name="author" content="CodeCrew ry" />
<meta name="viewport" content="width=device-width" /> <meta name="viewport" content="width=device-width" />
<meta http-equiv="Content-Language" content="#{sessionHandler.locale}" /> <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="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/normalize.min.css" />
<link rel="stylesheet" href="#{request.contextPath}/resources/templates/template1/css//main.css" /> <link rel="stylesheet" href="#{request.contextPath}/resources/templates/template1/css//main.css" />
<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/templates/template1/css/style.css" /> <link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/templates/template1/css/style.css" />
<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/templates/template1/css/general.css" /> <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> <script src="#{request.contextPath}/resources/templates/template1/js/modernizr-2.6.2.min.js"></script>
<h:outputStylesheet> <h:outputStylesheet>
.bgColor1 { .bgColor1 {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!