mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merge V1.4 to HEAD
- Ignored Enterprise-specific changes svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3701 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3703 . svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3704 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3705 . svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3707 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3876 . svn revert root\projects\web-client\source\web\jsp\admin\admin-console.jsp git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3879 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -42,7 +42,8 @@
|
||||
titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle">
|
||||
|
||||
<r:propertySheetGrid id="task-props" value="#{WizardManager.bean.taskMetadataNode}"
|
||||
var="taskProps" columns="1" externalConfig="true" />
|
||||
var="taskProps" columns="1" externalConfig="true"
|
||||
nextButtonId="next-button" />
|
||||
</a:panel>
|
||||
|
||||
<h:outputText id="padding" styleClass="paddingRow" value=" " escape="false" />
|
||||
@@ -81,7 +82,7 @@
|
||||
<f:facet name="header">
|
||||
<a:sortLink id="col3-sort" label="#{msg.path}" value="path" styleClass="header"/>
|
||||
</f:facet>
|
||||
<r:nodePath id="col3-path" value="#{r.path}" />
|
||||
<r:nodePath id="col3-path" value="#{r.path}" disabled="true" />
|
||||
</a:column>
|
||||
|
||||
<%-- Created Date column --%>
|
||||
|
Reference in New Issue
Block a user