Author: billyxie
Date: 2009-10-21 10:12:00 +0200 (Wed, 21 Oct 2009)
New Revision: 39271
Modified:
CMSContainer/trunk/CMSContainer_Modules/workflow/resources/cmsc-workflow_nl.properties
CMSContainer/trunk/CMSContainer_Modules/workflow/src/webapp/editors/css/workflow.css
CMSContainer/trunk/CMSContainer_Modules/workflow/src/webapp/editors/workflow/workflow.jsp
Log:
CMSC-1562 - Workflow-screen is ugly when builders have long names
Modified:
CMSContainer/trunk/CMSContainer_Modules/workflow/resources/cmsc-workflow_nl.properties
===================================================================
---
CMSContainer/trunk/CMSContainer_Modules/workflow/resources/cmsc-workflow_nl.properties
2009-10-21 08:09:58 UTC (rev 39270)
+++
CMSContainer/trunk/CMSContainer_Modules/workflow/resources/cmsc-workflow_nl.properties
2009-10-21 08:12:00 UTC (rev 39271)
@@ -16,7 +16,7 @@
workflow.status.finished=Voltooid
workflow.status.approved=Goed-<br/>gekeurd
workflow.status.published=In<br/>publicatie<br/>wachtrij
-workflow.status.allcontent=All content
+workflow.status.allcontent=Alle content
workflow.status.content=Content
workflow.status.content.article=Artikel
workflow.status.content.banners=Banner
Modified:
CMSContainer/trunk/CMSContainer_Modules/workflow/src/webapp/editors/css/workflow.css
===================================================================
---
CMSContainer/trunk/CMSContainer_Modules/workflow/src/webapp/editors/css/workflow.css
2009-10-21 08:09:58 UTC (rev 39270)
+++
CMSContainer/trunk/CMSContainer_Modules/workflow/src/webapp/editors/css/workflow.css
2009-10-21 08:12:00 UTC (rev 39271)
@@ -6,17 +6,34 @@
}
table.centerData td {
text-align: center;
- padding:0;
- width:50px
+ padding:0px;
+ width:50px;
}
+table.centerData th {
+ text-align: center;
+ padding:0px;
+ width:50px;
+}
table.centerData td.leftData {
text-align: left;
- width:56px;
+ width:73px;
}
+table.centerData td.leftData2 {
+ text-align: left;
+ width:68px;
+}
table.centerData td.indent {
+ width:14px;
+}
+table.centerData td.indent2 {
width:19px;
}
-
+#tree-page table{
+ height:18px;
+}
+#tree-link table {
+ height:18px;
+}
a.sortup {
background: url( ../gfx/icons/sort_up.gif ) no-repeat right !important;
padding-right: 20px;
Modified:
CMSContainer/trunk/CMSContainer_Modules/workflow/src/webapp/editors/workflow/workflow.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer_Modules/workflow/src/webapp/editors/workflow/workflow.jsp
2009-10-21 08:09:58 UTC (rev 39270)
+++
CMSContainer/trunk/CMSContainer_Modules/workflow/src/webapp/editors/workflow/workflow.jsp
2009-10-21 08:12:00 UTC (rev 39271)
@@ -63,7 +63,7 @@
<div id="tree">
<div id="tree-head">
- <table class="centerData">
+ <table class="centerData" cellspacing="0" cellpadding="0">
<tbody>
<tr>
<td class="indent" />
@@ -81,7 +81,7 @@
</table>
</div>
<div id="tree-allcontent">
- <table class="centerData">
+ <table class="centerData" cellspacing="0" cellpadding="0">
<tbody>
<tr>
<td class="indent"><img
id="tree-allcontent-plus"
@@ -104,7 +104,7 @@
</div>
<div id="tree-allcontent-cont" <c:if
test="${treeStatus.allcontent eq 0}">style="display:none"</c:if> >
<div id="tree-content">
- <table class="centerData">
+ <table class="centerData" cellspacing="0" cellpadding="0">
<tbody>
<%-- <c:if test="${ statusInfo.contentDraft != 0 ||
statusInfo.contentFinished != 0 || statusInfo.contentApproved != 0 ||
statusInfo.contentPublished != 0}">
--%>
@@ -130,7 +130,7 @@
</table>
</div>
<div id="tree-content-cont" <c:if test="${treeStatus.content eq
0}">style="display:none"</c:if>>
- <table class="centerData">
+ <table class="centerData" cellspacing="0" cellpadding="0">
<tbody>
<c:forEach var="contentType"
items="${statusInfo.contentChildTypes}" varStatus="itemStatus">
<c:if test="${
statusInfo.contentChildrenDraft[contentType.value] != 0 ||
statusInfo.contentChildrenFinished[contentType.value] != 0
@@ -144,7 +144,14 @@
<c:if test="${itemStatus.last}">
<td class="indent"><img
src="../utils/ajaxtree/images/L.png" /></td>
</c:if>
- <td
class="leftData">${contentType.label}</td>
+ <td class="leftData2">
+ <c:if test="${(fn:indexOf(contentType.label, ' ') >
-1) or (fn:length(contentType.label) <= 11)}" >
+ ${contentType.label}
+ </c:if>
+ <c:if test="${ (fn:indexOf(contentType.label, ' ') ==
-1) and (fn:length(contentType.label) > 11) }" >
+ ${fn:substring(contentType.label,0,11)}...
+ </c:if>
+ </td>
<td><a
href="ContentWorkflowAction.do?workflowNodetype=${contentType.value}&status=draft">${statusInfo.contentChildrenDraft[contentType.value]}</a></td>
<td><a
@@ -162,7 +169,7 @@
</table>
</div>
<div id="tree-asset">
- <table class="centerData">
+ <table class="centerData" cellspacing="0" cellpadding="0">
<tbody>
<%-- <c:if test="${ statusInfo.assetDraft != 0 ||
statusInfo.assetFinished != 0 || statusInfo.assetApproved != 0 ||
statusInfo.assetPublished != 0}">
--%>
@@ -187,21 +194,28 @@
</table>
</div>
<div id="tree-asset-cont" <c:if test="${treeStatus.asset eq
0}">style="display:none"</c:if> >
- <table class="centerData">
+ <table class="centerData" cellspacing="0" cellpadding="0">
<tbody>
<c:forEach var="assetType" items="${statusInfo.assetChildTypes}"
varStatus="itemStatus">
<c:if test="${ statusInfo.assetChildrenDraft[assetType.value]
!= 0 || statusInfo.assetChildrenFinished[assetType.value] != 0
||
statusInfo.assetChildrenApproved[assetType.value]!=0 ||
statusInfo.assetChildrenPublished[assetType.value] != 0}">
<tr>
<td class="indent"/>
- <td class="indent" />
+ <td class="indent2" />
<c:if test="${not itemStatus.last}">
<td class="indent"><img
src="../utils/ajaxtree/images/T.png" /></td>
</c:if>
<c:if test="${itemStatus.last}">
<td class="indent"><img
src="../utils/ajaxtree/images/L.png" /></td>
</c:if>
- <td class="leftData">${assetType.label}</td>
+ <td class="leftData2">
+ <c:if test="${(fn:indexOf(assetType.label, ' ') > -1)
or (fn:length(assetType.label) <= 11)}" >
+ ${assetType.label}
+ </c:if>
+ <c:if test="${ (fn:indexOf(assetType.label, ' ') ==
-1) and (fn:length(assetType.label) > 11) }" >
+ ${fn:substring(assetType.label,0,11)}...
+ </c:if>
+ </td>
<td><a
href="AssetWorkflowAction.do?workflowNodetype=${assetType.value}&status=draft">${statusInfo.assetChildrenDraft[assetType.value]}</a></td>
<td><a
@@ -220,7 +234,7 @@
</div>
</div>
<div id="tree-page">
- <table class="centerData">
+ <table class="centerData" cellspacing="0" cellpadding="0">
<tbody>
<%-- <c:if test="${statusInfo.pageDraft != 0 ||
statusInfo.pageFinished != 0 || statusInfo.pageApproved != 0 ||
statusInfo.pagePublished != 0}">
--%>
@@ -228,7 +242,7 @@
<td
class="leftData"><fmt:message key="workflow.status.page" /></td>
<td class="indent" />
<td class="indent" />
- <td class="indent" />
+ <td class="indent2" />
<td><a
href="PageWorkflowAction.do?status=draft">${statusInfo.pageDraft}</a></td>
<td><a
href="PageWorkflowAction.do?status=finished">${statusInfo.pageFinished}</a></td>
<c:if test="${acceptedEnabled}">
@@ -242,7 +256,7 @@
</table>
</div>
<div id="tree-link">
- <table class="centerData">
+ <table class="centerData" cellspacing="0" cellpadding="0">
<tbody>
<%-- <c:if test="${ statusInfo.linkFinished != 0 ||
statusInfo.linkApproved != 0 || statusInfo.linkPublished != 0}">
--%>
@@ -250,7 +264,7 @@
<td
class="leftData"><fmt:message key="workflow.status.link" /></td>
<td class="indent" />
<td class="indent" />
- <td class="indent" />
+ <td class="indent2" />
<td></td>
<td><a
href="LinkWorkflowAction.do?status=finished">${statusInfo.linkFinished}</a></td>
<c:if test="${acceptedEnabled}">
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
