inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

More WCM HEAD merge fixups

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4312 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2006-11-08 11:47:39 +00:00
parent 01fe4b13ce
commit 047d9b7ede
3 changed files with 23 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

233
source/web/WEB-INF/faces-config-repo.xml
View File

@@ -1,4 +1,3 @@
<<<<<<< .working
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
"http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
@@ -229,235 +228,3 @@
</render-kit>
</faces-config>
=======
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
"http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
<faces-config>
<!-- ==================== COMPONENTS ==================== -->
<component>
<component-type>org.alfresco.faces.PropertySheet</component-type>
<component-class>org.alfresco.web.ui.repo.component.property.UIPropertySheet</component-class>
</component>
<component>
<component-type>org.alfresco.faces.Property</component-type>
<component-class>org.alfresco.web.ui.repo.component.property.UIProperty</component-class>
</component>
<component>
<component-type>org.alfresco.faces.Separator</component-type>
<component-class>org.alfresco.web.ui.repo.component.property.UISeparator</component-class>
</component>
<component>
<component-type>org.alfresco.faces.Association</component-type>
<component-class>org.alfresco.web.ui.repo.component.property.UIAssociation</component-class>
</component>
<component>
<component-type>org.alfresco.faces.AssociationEditor</component-type>
<component-class>org.alfresco.web.ui.repo.component.property.UIAssociationEditor</component-class>
</component>
<component>
<component-type>org.alfresco.faces.ChildAssociation</component-type>
<component-class>org.alfresco.web.ui.repo.component.property.UIChildAssociation</component-class>
</component>
<component>
<component-type>org.alfresco.faces.ChildAssociationEditor</component-type>
<component-class>org.alfresco.web.ui.repo.component.property.UIChildAssociationEditor</component-class>
</component>
<component>
<component-type>org.alfresco.faces.NodeDescendants</component-type>
<component-class>org.alfresco.web.ui.repo.component.UINodeDescendants</component-class>
</component>
<component>
<component-type>org.alfresco.faces.NodePath</component-type>
<component-class>org.alfresco.web.ui.repo.component.UINodePath</component-class>
</component>
<component>
<component-type>org.alfresco.faces.SpaceSelector</component-type>
<component-class>org.alfresco.web.ui.repo.component.UISpaceSelector</component-class>
</component>
<component>
<component-type>org.alfresco.faces.ContentSelector</component-type>
<component-class>org.alfresco.web.ui.repo.component.UIContentSelector</component-class>
</component>
<component>
<component-type>org.alfresco.faces.CategorySelector</component-type>
<component-class>org.alfresco.web.ui.repo.component.UICategorySelector</component-class>
</component>
<component>
<component-type>org.alfresco.faces.MimeTypeSelector</component-type>
<component-class>org.alfresco.web.ui.repo.component.UIMimeTypeSelector</component-class>
</component>
<component>
<component-type>org.alfresco.faces.SimpleSearch</component-type>
<component-class>org.alfresco.web.ui.repo.component.UISimpleSearch</component-class>
</component>
<component>
<component-type>org.alfresco.faces.AdvancedSearch</component-type>
<component-class>org.alfresco.web.ui.repo.component.UISearchCustomProperties</component-class>
</component>
<component>
<component-type>org.alfresco.faces.Shelf</component-type>
<component-class>org.alfresco.web.ui.repo.component.shelf.UIShelf</component-class>
</component>
<component>
<component-type>org.alfresco.faces.ShelfGroup</component-type>
<component-class>org.alfresco.web.ui.repo.component.shelf.UIShelfGroup</component-class>
</component>
<component>
<component-type>org.alfresco.faces.ShelfItem</component-type>
<component-class>org.alfresco.web.ui.repo.component.shelf.UIShelfItem</component-class>
</component>
<component>
<component-type>org.alfresco.faces.ClipboardShelfItem</component-type>
<component-class>org.alfresco.web.ui.repo.component.shelf.UIClipboardShelfItem</component-class>
</component>
<component>
<component-type>org.alfresco.faces.RecentSpacesShelfItem</component-type>
<component-class>org.alfresco.web.ui.repo.component.shelf.UIRecentSpacesShelfItem</component-class>
</component>
<component>
<component-type>org.alfresco.faces.ShortcutsShelfItem</component-type>
<component-class>org.alfresco.web.ui.repo.component.shelf.UIShortcutsShelfItem</component-class>
</component>
<component>
<component-type>org.alfresco.faces.LockIcon</component-type>
<component-class>org.alfresco.web.ui.repo.component.UILockIcon</component-class>
</component>
<component>
<component-type>org.alfresco.faces.Template</component-type>
<component-class>org.alfresco.web.ui.repo.component.template.UITemplate</component-class>
</component>
<component>
<component-type>org.alfresco.faces.MultiValueEditor</component-type>
<component-class>org.alfresco.web.ui.repo.component.UIMultiValueEditor</component-class>
</component>
<component>
<component-type>org.alfresco.faces.Actions</component-type>
<component-class>org.alfresco.web.ui.repo.component.UIActions</component-class>
</component>
<component>
<component-type>org.alfresco.faces.ActionInstanceEvaluator</component-type>
<component-class>org.alfresco.web.ui.repo.component.evaluator.ActionInstanceEvaluator</component-class>
</component>
<component>
<component-type>org.alfresco.faces.NodeInfo</component-type>
<component-class>org.alfresco.web.ui.repo.component.UINodeInfo</component-class>
</component>
<component>
<component-type>org.alfresco.faces.DialogButtons</component-type>
<component-class>org.alfresco.web.ui.repo.component.UIDialogButtons</component-class>
</component>
<component>
<component-type>org.alfresco.faces.UserGroupPicker</component-type>
<component-class>org.alfresco.web.ui.repo.component.UIUserGroupPicker</component-class>
</component>
<component>
<component-type>org.alfresco.faces.WorkflowSummary</component-type>
<component-class>org.alfresco.web.ui.repo.component.UIWorkflowSummary</component-class>
</component>
<component>
<component-type>org.alfresco.faces.NodeWorkflowInfo</component-type>
<component-class>org.alfresco.web.ui.repo.component.UINodeWorkflowInfo</component-class>
</component>
<!-- ==================== CONVERTERS ==================== -->
<component>
<component-type>org.alfresco.faces.PermissionEvaluator</component-type>
<component-class>org.alfresco.web.ui.repo.component.evaluator.PermissionEvaluator</component-class>
</component>
<converter>
<converter-id>org.alfresco.faces.MimeTypeConverter</converter-id>
<converter-class>org.alfresco.web.ui.repo.converter.MimeTypeConverter</converter-class>
</converter>
<converter>
<converter-id>org.alfresco.faces.DisplayPathConverter</converter-id>
<converter-class>org.alfresco.web.ui.repo.converter.DisplayPathConverter</converter-class>
</converter>
<!-- ==================== RENDERERS ==================== -->
<render-kit>
<renderer>
<component-family>org.alfresco.faces.NodeDescendants</component-family>
<renderer-type>org.alfresco.faces.NodeDescendantsLinkRenderer</renderer-type>
<renderer-class>org.alfresco.web.ui.repo.renderer.NodeDescendantsLinkRenderer</renderer-class>
</renderer>
<renderer>
<component-family>org.alfresco.faces.NodePath</component-family>
<renderer-type>org.alfresco.faces.NodePathLinkRenderer</renderer-type>
<renderer-class>org.alfresco.web.ui.repo.renderer.NodePathLinkRenderer</renderer-class>
</renderer>
<renderer>
<component-family>org.alfresco.faces.Property</component-family>
<renderer-type>org.alfresco.faces.PropertyRenderer</renderer-type>
<renderer-class>org.alfresco.web.ui.repo.renderer.property.PropertyRenderer</renderer-class>
</renderer>
<renderer>
<component-family>org.alfresco.faces.Separator</component-family>
<renderer-type>org.alfresco.faces.SeparatorRenderer</renderer-type>
<renderer-class>org.alfresco.web.ui.repo.renderer.property.SeparatorRenderer</renderer-class>
</renderer>
<renderer>
<component-family>org.alfresco.faces.Association</component-family>
<renderer-type>org.alfresco.faces.AssociationRenderer</renderer-type>
<renderer-class>org.alfresco.web.ui.repo.renderer.property.AssociationRenderer</renderer-class>
</renderer>
<renderer>
<component-family>org.alfresco.faces.ChildAssociation</component-family>
<renderer-type>org.alfresco.faces.ChildAssociationRenderer</renderer-type>
<renderer-class>org.alfresco.web.ui.repo.renderer.property.ChildAssociationRenderer</renderer-class>
</renderer>
<renderer>
<component-family>org.alfresco.faces.MultiValueEditor</component-family>
<renderer-type>org.alfresco.faces.Selector</renderer-type>
<renderer-class>org.alfresco.web.ui.repo.renderer.MultiValueSelectorRenderer</renderer-class>
</renderer>
<renderer>
<component-family>org.alfresco.faces.MultiValueEditor</component-family>
<renderer-type>org.alfresco.faces.Field</renderer-type>
<renderer-class>org.alfresco.web.ui.repo.renderer.MultiValueFieldRenderer</renderer-class>
</renderer>
</render-kit>
</faces-config>
>>>>>>> .merge-right.r4305

23
source/web/WEB-INF/web.xml
View File

@@ -16,7 +16,7 @@
<context-param>
<param-name>javax.faces.CONFIG_FILES</param-name>
<param-value>/WEB-INF/faces-config-app.xml,/WEB-INF/faces-config-beans.xml,/WEB-INF/faces-config-navigation.xml,/WEB-INF/faces-config-common.xml,/WEB-INF/faces-config-repo.xml,/WEB-INF/faces-config-wcm.xml,WEB-INF/faces-config-custom.xml,/WEB-INF/faces-config-enterprise.xml,/WEB-INF/faces-config-jbpm.xml</param-value>
<param-value>/WEB-INF/faces-config-app.xml,/WEB-INF/faces-config-beans.xml,/WEB-INF/faces-config-navigation.xml,/WEB-INF/faces-config-common.xml,/WEB-INF/faces-config-repo.xml,/WEB-INF/faces-config-wcm.xml,WEB-INF/faces-config-custom.xml,/WEB-INF/faces-config-enterprise.xml</param-value>
</context-param>
<context-param>
@@ -97,16 +97,6 @@
<filter-class>org.alfresco.web.app.servlet.AdminAuthenticationFilter</filter-class>
</filter>
<!-- Used by the JPBM console for monitoring in-flight workflows -->
<filter>
<filter-name>JbpmContextFilter</filter-name>
<filter-class>org.jbpm.webapp.filter.JbpmContextFilter</filter-class>
</filter>
<!-- -->
<!-- JBPM END -->
<!-- -->
<filter-mapping>
<filter-name>Authentication Filter</filter-name>
<url-pattern>/faces/*</url-pattern>
@@ -156,17 +146,6 @@
<url-pattern>/faces/jsp/dialog/system-info.jsp</url-pattern>
</filter-mapping>
<filter-mapping>
<filter-name>Admin Authentication Filter</filter-name>
<url-pattern>/faces/jbpm/*</url-pattern>
</filter-mapping>
<!-- Used by the JPBM console for monitoring in-flight workflows -->
<filter-mapping>
<filter-name>JbpmContextFilter</filter-name>
<url-pattern>/faces/jbpm/*</url-pattern>
</filter-mapping>
<listener>
<listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
</listener>

22
source/web/css/main.css
View File

@@ -559,3 +559,25 @@ a.topToolbarLinkHighlight, a.topToolbarLinkHighlight:link, a.topToolbarLinkHighl
{
padding-bottom: 8px;
}
.selectListTable
{
border: 1px solid #999999;
padding-top: 2px;
padding-left: 2px;
padding-right: 2px;
}
.selectListItem
{
background-color: #eeeeee;
border-bottom: 2px solid #ffffff;
}
.modifiedItemsList
{
background-color: #EEEEEE;
border-width: 1px;
border-style: dashed;
border-color: #AAAAAA;
}