mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Humongous merge. It is incomplete, however; faces-config-navigation.xml and ClientConfigElement
were both beyond me, and are just the raw conflict merge data. If Kev can't figure out how they should go together by tomorrow AM (for me) I'll dig back in. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4306 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
@@ -43,52 +43,41 @@
|
||||
</f:facet>
|
||||
<h:outputText id="col3-txt" value="#{r['bpm:taskId']}" />
|
||||
</a:column>
|
||||
|
||||
<%-- Source column --%>
|
||||
<a:column id="col4" style="padding:2px;text-align:left">
|
||||
<f:facet name="header">
|
||||
<a:sortLink id="col4-sort" label="#{msg.source}" value="sourceSpaceName" styleClass="header"/>
|
||||
</f:facet>
|
||||
<a:actionLink id="col4-act1" value="#{r.sourceSpaceName}"
|
||||
actionListener="#{BrowseBean.clickSpace}" action="browse">
|
||||
<f:param name="id" value="#{r.sourceSpaceId}" />
|
||||
</a:actionLink>
|
||||
</a:column>
|
||||
|
||||
<%-- Created Date column --%>
|
||||
<a:column id="col5" style="padding:2px;text-align:left">
|
||||
<a:column id="col4" style="padding:2px;text-align:left">
|
||||
<f:facet name="header">
|
||||
<a:sortLink id="col5-sort" label="#{msg.created}" value="created" styleClass="header"/>
|
||||
<a:sortLink id="col4-sort" label="#{msg.created}" value="created" styleClass="header"/>
|
||||
</f:facet>
|
||||
<h:outputText id="col5-txt" value="#{r.created}">
|
||||
<h:outputText id="col4-txt" value="#{r.created}">
|
||||
<a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" />
|
||||
</h:outputText>
|
||||
</a:column>
|
||||
|
||||
<%-- Completed date column --%>
|
||||
<a:column id="col6" style="padding:2px;text-align:left">
|
||||
<a:column id="col5" style="padding:2px;text-align:left">
|
||||
<f:facet name="header">
|
||||
<a:sortLink id="col6-sort" label="#{msg.completed_on}" value="bpm:completionDate" styleClass="header"/>
|
||||
<a:sortLink id="col5-sort" label="#{msg.completed_on}" value="bpm:completionDate" styleClass="header"/>
|
||||
</f:facet>
|
||||
<h:outputText id="col6-txt" value="#{r['bpm:completionDate']}">
|
||||
<h:outputText id="col5-txt" value="#{r['bpm:completionDate']}">
|
||||
<a:convertXMLDate type="both" pattern="#{msg.date_pattern}" />
|
||||
</h:outputText>
|
||||
</a:column>
|
||||
|
||||
<%-- Outcome column --%>
|
||||
<a:column id="col7" style="padding:2px;text-align:left">
|
||||
<a:column id="col6" style="padding:2px;text-align:left">
|
||||
<f:facet name="header">
|
||||
<a:sortLink id="col7-sort" label="#{msg.outcome}" value="outcome" styleClass="header"/>
|
||||
<a:sortLink id="col6-sort" label="#{msg.outcome}" value="outcome" styleClass="header"/>
|
||||
</f:facet>
|
||||
<h:outputText id="col7-txt" value="#{r.outcome}" />
|
||||
<h:outputText id="col6-txt" value="#{r.outcome}" />
|
||||
</a:column>
|
||||
|
||||
<%-- Actions column --%>
|
||||
<a:column id="col8" actions="true" style="padding:2px;text-align:left">
|
||||
<a:column id="col7" actions="true" style="padding:2px;text-align:left">
|
||||
<f:facet name="header">
|
||||
<h:outputText id="col8-txt" value="#{msg.actions}"/>
|
||||
<h:outputText id="col7-txt" value="#{msg.actions}"/>
|
||||
</f:facet>
|
||||
<r:actions id="col8-actions" value="dashlet_completed_actions" context="#{r}" showLink="false"
|
||||
<r:actions id="col7-actions" value="dashlet_completed_actions" context="#{r}" showLink="false"
|
||||
styleClass="inlineAction" />
|
||||
</a:column>
|
||||
|
||||
|
||||
@@ -44,59 +44,48 @@
|
||||
<h:outputText id="col3-txt" value="#{r['bpm:taskId']}" />
|
||||
</a:column>
|
||||
|
||||
<%-- Source column --%>
|
||||
<%-- Created Date column --%>
|
||||
<a:column id="col4" style="padding:2px;text-align:left">
|
||||
<f:facet name="header">
|
||||
<a:sortLink id="col4-sort" label="#{msg.source}" value="sourceSpaceName" styleClass="header"/>
|
||||
<a:sortLink id="col4-sort" label="#{msg.created}" value="created" styleClass="header"/>
|
||||
</f:facet>
|
||||
<a:actionLink id="col4-act1" value="#{r.sourceSpaceName}"
|
||||
actionListener="#{BrowseBean.clickSpace}" action="browse">
|
||||
<f:param name="id" value="#{r.sourceSpaceId}" />
|
||||
</a:actionLink>
|
||||
</a:column>
|
||||
|
||||
<%-- Created Date column --%>
|
||||
<a:column id="col5" style="padding:2px;text-align:left">
|
||||
<f:facet name="header">
|
||||
<a:sortLink id="col5-sort" label="#{msg.created}" value="created" styleClass="header"/>
|
||||
</f:facet>
|
||||
<h:outputText id="col5-txt" value="#{r.created}">
|
||||
<h:outputText id="col4-txt" value="#{r.created}">
|
||||
<a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" />
|
||||
</h:outputText>
|
||||
</a:column>
|
||||
|
||||
<%-- Due date column --%>
|
||||
<a:column id="col6" style="padding:2px;text-align:left">
|
||||
<a:column id="col5" style="padding:2px;text-align:left">
|
||||
<f:facet name="header">
|
||||
<a:sortLink id="col6-sort" label="#{msg.due_date}" value="bpm:dueDate" styleClass="header"/>
|
||||
<a:sortLink id="col5-sort" label="#{msg.due_date}" value="bpm:dueDate" styleClass="header"/>
|
||||
</f:facet>
|
||||
<h:outputText id="col6-txt" value="#{r['bpm:dueDate']}">
|
||||
<h:outputText id="col5-txt" value="#{r['bpm:dueDate']}">
|
||||
<a:convertXMLDate type="both" pattern="#{msg.date_pattern}" />
|
||||
</h:outputText>
|
||||
</a:column>
|
||||
|
||||
<%-- Status column --%>
|
||||
<a:column id="col7" style="padding:2px;text-align:left">
|
||||
<a:column id="col6" style="padding:2px;text-align:left">
|
||||
<f:facet name="header">
|
||||
<a:sortLink id="col7-sort" label="#{msg.status}" value="bpm:status" styleClass="header"/>
|
||||
<a:sortLink id="col6-sort" label="#{msg.status}" value="bpm:status" styleClass="header"/>
|
||||
</f:facet>
|
||||
<h:outputText id="col7-txt" value="#{r['bpm:status']}" />
|
||||
<h:outputText id="col6-txt" value="#{r['bpm:status']}" />
|
||||
</a:column>
|
||||
|
||||
<%-- Priority column --%>
|
||||
<a:column id="col8" style="padding:2px;text-align:left">
|
||||
<a:column id="col7" style="padding:2px;text-align:left">
|
||||
<f:facet name="header">
|
||||
<a:sortLink id="col8-sort" label="#{msg.priority}" value="bpm:priority" styleClass="header"/>
|
||||
<a:sortLink id="col7-sort" label="#{msg.priority}" value="bpm:priority" styleClass="header"/>
|
||||
</f:facet>
|
||||
<h:outputText id="col8-txt" value="#{r['bpm:priority']}" />
|
||||
<h:outputText id="col7-txt" value="#{r['bpm:priority']}" />
|
||||
</a:column>
|
||||
|
||||
<%-- Actions column --%>
|
||||
<a:column id="col9" actions="true" style="padding:2px;text-align:left">
|
||||
<a:column id="col8" actions="true" style="padding:2px;text-align:left">
|
||||
<f:facet name="header">
|
||||
<h:outputText id="col9-txt" value="#{msg.actions}"/>
|
||||
<h:outputText id="col8-txt" value="#{msg.actions}"/>
|
||||
</f:facet>
|
||||
<r:actions id="col9-actions" value="dashlet_todo_actions" context="#{r}" showLink="false"
|
||||
<r:actions id="col8-actions" value="dashlet_todo_actions" context="#{r}" showLink="false"
|
||||
styleClass="inlineAction" />
|
||||
</a:column>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user